diff options
| author |   Chris PeBenito <pebenito@ieee.org> | 2021-03-18 16:22:05 -0400 |
|---|---|---|
| committer |   Jason Zaman <perfinion@gentoo.org> | 2021-04-02 11:54:58 -0700 |
| commit | a91edcb2b0b94034466ccfe8e5bf110f5716ea94 (patch) | |
| tree | 511ed5fb7f8e9dc7ce613f1aa9c6631b046b3473 /Rules.monolithic | |
| parent | bluetooth: Add bluetooth_socket perms (diff) | |
| download | hardened-refpolicy-a91edcb2b0b94034466ccfe8e5bf110f5716ea94.tar.gz hardened-refpolicy-a91edcb2b0b94034466ccfe8e5bf110f5716ea94.tar.bz2 hardened-refpolicy-a91edcb2b0b94034466ccfe8e5bf110f5716ea94.zip | |
Rules.modular/Rules.monolithic: Fix intdented labeling statement moves.
The secure_mode_policyload Boolean labeling statement was lost moving the
statement to the proper place in the policy.conf/base.conf.
Fix this for all other labeling statements too.
Signed-off-by: Chris PeBenito <pebenito@ieee.org>
Signed-off-by: Jason Zaman <perfinion@gentoo.org>
Diffstat (limited to 'Rules.monolithic')
| -rw-r--r-- | Rules.monolithic | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Rules.monolithic b/Rules.monolithic index 87edd2d36..e369f8f31 100644 --- a/Rules.monolithic +++ b/Rules.monolithic @@ -165,14 +165,14 @@ $(tmpdir)/all_attrs_types.conf: $(tmpdir)/all_te_files.conf $(tmpdir)/all_post.conf: $(tmpdir)/all_te_files.conf $(tmpdir)/post_te_files.conf $(verbose) cat $(tmpdir)/post_te_files.conf > $@ # these have to run individually because order matters: - $(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $@ || true - $(verbose) $(GREP) '^fs_use_(xattr|task|trans)' $(tmpdir)/all_te_files.conf >> $@ || true - $(verbose) $(GREP) ^genfscon $(tmpdir)/all_te_files.conf >> $@ || true - $(verbose) $(GREP) ^portcon $(tmpdir)/all_te_files.conf >> $@ || true - $(verbose) $(GREP) ^netifcon $(tmpdir)/all_te_files.conf >> $@ || true - $(verbose) $(GREP) ^nodecon $(tmpdir)/all_te_files.conf >> $@ || true - $(verbose) $(GREP) ^ibpkeycon $(tmpdir)/all_te_files.conf >> $@ || true - $(verbose) $(GREP) ^ibendportcon $(tmpdir)/all_te_files.conf >> $@ || true + $(verbose) $(GREP) '^[[:blank:]]*sid ' $(tmpdir)/all_te_files.conf >> $@ || true + $(verbose) $(GREP) '^[[:blank:]]*fs_use_(xattr|task|trans)' $(tmpdir)/all_te_files.conf >> $@ || true + $(verbose) $(GREP) '^[[:blank:]]*genfscon' $(tmpdir)/all_te_files.conf >> $@ || true + $(verbose) $(GREP) '^[[:blank:]]*portcon' $(tmpdir)/all_te_files.conf >> $@ || true + $(verbose) $(GREP) '^[[:blank:]]*netifcon' $(tmpdir)/all_te_files.conf >> $@ || true + $(verbose) $(GREP) '^[[:blank:]]*nodecon' $(tmpdir)/all_te_files.conf >> $@ || true + $(verbose) $(GREP) '^[[:blank:]]*ibpkeycon' $(tmpdir)/all_te_files.conf >> $@ || true + $(verbose) $(GREP) '^[[:blank:]]*ibendportcon' $(tmpdir)/all_te_files.conf >> $@ || true $(tmpdir)/only_te_rules.conf: $(tmpdir)/all_te_files.conf $(verbose) $(comment_move_decl) $^ > $@ |