merge systemuser back in to users

refpolicy/Changelog

@@ -1,3 +1,5 @@
+- Merge systemuser back in to users, as these files
+  do not need to be split.
 - Add check for duplicate interface/template definitions.
 - Move domain, files, and corecommands modules to kernel
   layer to resolve some layering inconsistencies.

refpolicy/Makefile

@@ -139,7 +139,7 @@ APPCONF := config/appconfig-$(TYPE)
 APPDIR := $(CONTEXTPATH)
 APPFILES := $(addprefix $(APPDIR)/,default_contexts default_type initrc_context failsafe_context userhelper_context removable_context dbus_contexts) $(CONTEXTPATH)/files/media
 CONTEXTFILES += $(wildcard $(APPCONF)/*_context*) $(APPCONF)/media
-USER_FILES := $(POLDIR)/systemuser $(POLDIR)/users
+USER_FILES := $(POLDIR)/users
 
 ALL_LAYERS := $(filter-out $(MODDIR)/CVS,$(shell find $(wildcard $(MODDIR)/*) -maxdepth 0 -type d))
 

refpolicy/policy/systemuser

@@ -1,19 +0,0 @@
-##################################
-#
-# System User configuration.
-#
-
-#
-# gen_user(username, role_set, mls_defaultlevel, mls_range, [mcs_categories])
-#
-
-#
-# system_u is the user identity for system processes and objects.
-# There should be no corresponding Unix user identity for system,
-# and a user process should never be assigned the system user
-# identity.
-#
-gen_user(system_u, system_r, s0, s0 - s15:c0.c255, c0.c255)
-
-# Normal users should not be added to this file,
-# but instead added to the users file.

refpolicy/policy/users

@@ -8,6 +8,14 @@
 # gen_user(username, role_set, mls_defaultlevel, mls_range, [mcs_catetories])
 #
 
+#
+# system_u is the user identity for system processes and objects.
+# There should be no corresponding Unix user identity for system,
+# and a user process should never be assigned the system user
+# identity.
+#
+gen_user(system_u, system_r, s0, s0 - s15:c0.c255, c0.c255)
+
 #
 # user_u is a generic user identity for Linux users who have no
 # SELinux user identity defined.  The modified daemons will use