diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-08-30 15:17:14 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2011-08-30 15:17:14 -0400 |
| commit | 8e35de888bde8b123bf19c23cb4e8974cb75475e (patch) | |
| tree | c3a7017cffa43162029b960ca8a04dd611387319 /systemd | |
| parent | 588b435f07ef70684d7979b0472b8a0aabe44d71 (diff) | |
| download | initscripts-8e35de888bde8b123bf19c23cb4e8974cb75475e.tar initscripts-8e35de888bde8b123bf19c23cb4e8974cb75475e.tar.gz initscripts-8e35de888bde8b123bf19c23cb4e8974cb75475e.tar.bz2 initscripts-8e35de888bde8b123bf19c23cb4e8974cb75475e.tar.xz initscripts-8e35de888bde8b123bf19c23cb4e8974cb75475e.zip | |
selinuxfs moved, adjust code. (#733759)
Diffstat (limited to 'systemd')
| -rwxr-xr-x | systemd/fedora-autorelabel | 2 | ||||
| -rwxr-xr-x | systemd/fedora-readonly | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/systemd/fedora-autorelabel b/systemd/fedora-autorelabel index 70ece423..61dc5517 100755 --- a/systemd/fedora-autorelabel +++ b/systemd/fedora-autorelabel @@ -10,7 +10,7 @@ relabel_selinux() { # wrong context, so a reboot will be required after relabel AUTORELABEL= . /etc/selinux/config - echo "0" > /selinux/enforce + echo "0" > /sys/fs/selinux/enforce [ -x /bin/plymouth ] && plymouth --hide-splash if [ "$AUTORELABEL" = "0" ]; then diff --git a/systemd/fedora-readonly b/systemd/fedora-readonly index 70e57a62..4e8003a2 100755 --- a/systemd/fedora-readonly +++ b/systemd/fedora-readonly @@ -7,9 +7,9 @@ # Check SELinux status SELINUX_STATE= -if [ -e "/selinux/enforce" ] && [ "$(cat /proc/self/attr/current)" != "kernel" ]; then - if [ -r "/selinux/enforce" ] ; then - SELINUX_STATE=$(cat "/selinux/enforce") +if [ -e "/sys/fs/selinux/enforce" ] && [ "$(cat /proc/self/attr/current)" != "kernel" ]; then + if [ -r "/sys/fs/selinux/enforce" ] ; then + SELINUX_STATE=$(cat "/sys/fs/selinux/enforce") else # assume enforcing if you can't read it SELINUX_STATE=1 |