trying to fix userfiledebugging

1 files changed, 16 insertions, 13 deletions

diff --git a/src/file/homefile/userhomefile.cil b/src/file/homefile/userhomefile.cil
index de8a882..5b2b755 100644
--- a/src/file/homefile/userhomefile.cil
+++ b/src/file/homefile/userhomefile.cil
@@ -1,5 +1,5 @@
 (in file.unconfined
-    (call .user.home.home_file_type_transition_file (typeattr dir "*")))
+    (call .userhome.home_file_type_transition_file (typeattr dir "*")))
 
 (in file.home
     (block user
@@ -8,8 +8,8 @@
 
         (typeattribute typeattr)
 
-        (call file.home.type (typeattr))
-        (call file.user.type (typeattr))
+        (call .file.home.type (typeattr))
+        (call .file.user.type (typeattr))
 
         (block base_template
             (blockabstract base_template)
@@ -18,13 +18,16 @@
 
         (block template
             (blockabstract template)
-            (blockinherit .file.user.template))))
-
-(in user
-    (block home
-        (macro home_file_type_transition_file ((type ARG1) (class ARG2) (name ARG3))
-            (call .home.file_type_transition (ARG1 file ARG2 ARG3)))
-        
-        (blockinherit file.home.user.template)
-        (filecon "HOME_DIR" dir file_context)
-        (filecon "HOME_DIR/.*" any file_context)))
+            (blockinherit .file.home.user.base_template)
+            (blockinherit .file.macro_template_files)
+            (blockinherit .file.macro_template_dirs))))
+
+
+(block userhome
+    (macro home_file_type_transition_file ((type ARG1) (class ARG2) (name ARG3))
+        (call .home.file_type_transition (ARG1 file ARG2 ARG3)))
+
+    (blockinherit .file.home.user.template)
+    
+    (filecon "HOME_DIR" dir file_context)
+    (filecon "HOME_DIR/.*" any file_context))