Move role declarations to the top of base.conf

system_r is required by the policy_module macro, which however will
be expanded as empty if the module is built into base.pp. system_r
is defined in the kernel.te, its definition should be moved to the
top of base.conf so that other modules copied earlier into base.conf
than kernel.te could reference system_r in their unconditional block
properly.

Signed-off-by: Harry Ciao <qingtao.cao@windriver.com>
This commit is contained in:
Harry Ciao 2012-02-29 16:16:47 +08:00 committed by Chris PeBenito
parent ee8210c690
commit 46acfdd455
2 changed files with 7 additions and 1 deletions

View File

@ -10,5 +10,6 @@
/^[[:blank:]]*fs_use_(xattr|task|trans) /s/^/# this line was moved by the build process: &/
/^[[:blank:]]*sid /s/^/# this line was moved by the build process: &/
/^[[:blank:]]*bool /s/^/# this line was moved by the build process: &/
/^[[:blank:]]*role[[:blank:]]+[a-zA-Z_]+[[:blank:]]*;/s/^/# this line was moved by the build process: &/
:nextline

View File

@ -1,5 +1,5 @@
#n
# print out type and attribute declarations that
# print out type, role and attribute declarations that
# are not inside require and optional blocks.
/require \{/,/} # end require/b nextline
@ -10,4 +10,9 @@
p
}
/^[[:blank:]]*role[[:blank:]]+[a-zA-Z_]+[[:blank:]]*;/{
s/^[[:blank:]]+//
p
}
:nextline