X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=rc.d%2Frc.sysinit;h=50ca08a247591fc1f33d68925bc3deb5551d8f53;hb=bae490230fe06fe970c542247a499926c51d2b1f;hp=121e48f91e7fe633369420d2603bd53978db8468;hpb=404f23ce096d6186062f68db607edac4a7068d61;p=rc-scripts.git diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 121e48f..50ca08a 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -123,9 +123,7 @@ init_selinux() { if ! grep -Fq selinuxfs /proc/filesystems; then # no support in kernel, no chance SELINUX=no - fi - - if ! is_fsmounted selinuxfs /selinux; then + elif ! is_fsmounted selinuxfs /selinux; then mount -n -o gid=17 -t selinuxfs selinuxfs /selinux fi @@ -952,7 +950,7 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then . /etc/rc.d/rc.serial fi - if [ -n "$PANIC_REBOOT_TIME" -a "$PANIC_REBOOT_TIME" -gt "0" -a -f /proc/sys/kernel/panic ]; then + if [ -n "$PANIC_REBOOT_TIME" ] && [ "$PANIC_REBOOT_TIME" -gt "0" ] && [ -f /proc/sys/kernel/panic ]; then show 'Setting %s seconds for kernel reboot after panic' "$PANIC_REBOOT_TIME"; busy # DEPRECATED: use /etc/sysctl.conf or kernel commandline instead if sysctl -q -w kernel.panic=$PANIC_REBOOT_TIME; then ok; else fail; fi