summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-03-10 11:38:26 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-03-10 11:38:26 -0800
commit6ae9c8769704b1d03689283d840a29b0a0c4788b (patch)
tree442a7e8abd0c73183dfb6e3a836c2e9f75515ddb
parent57aed8500a389206026c66b623636f68c0006f31 (diff)
downloadvyatta-cfg-system-6ae9c8769704b1d03689283d840a29b0a0c4788b.tar.gz
vyatta-cfg-system-6ae9c8769704b1d03689283d840a29b0a0c4788b.zip
Disable SELinux during password reset
-rwxr-xr-xscripts/vyatta-grub-setup7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup
index 3a38bd5f..9dc5bcc1 100755
--- a/scripts/vyatta-grub-setup
+++ b/scripts/vyatta-grub-setup
@@ -70,6 +70,9 @@ serial_console="console=tty0 console=ttyS0,9600"
# See kernel Documentation/fb/vesafb.txt for resolution constants
#VGA_LOGO="vga=785"
+# Disable SELinux when doing maintance operations
+NOSELINUX="selinux=0"
+
# get list of kernels, except Xen
kernel_versions=$(ls $ROOTFSDIR/boot/vmlinuz-* 2> /dev/null | grep -v xen | awk -F/ '{ print $5 }' | sed 's/vmlinuz//g' | sort -r)
@@ -259,13 +262,13 @@ fi
echo
echo -e "menuentry \"Lost password change $version (KVM console)\" {"
- echo -e "\tlinux $reset_boot_path/vmlinuz $GRUB_OPTIONS $vga_logo $vty_console init=$pass_reset"
+ echo -e "\tlinux $reset_boot_path/vmlinuz $GRUB_OPTIONS $NOSELINUX $vty_console init=$pass_reset"
echo -e "\tinitrd $reset_boot_path/initrd.img"
echo -e "}"
echo
echo -e "menuentry \"Lost password change $version (Serial console)\" {"
- echo -e "\tlinux $reset_boot_path/vmlinuz $GRUB_OPTIONS $serial_console init=$pass_reset"
+ echo -e "\tlinux $reset_boot_path/vmlinuz $GRUB_OPTIONS $NOSELINUX $serial_console init=$pass_reset"
echo -e "\tinitrd $reset_boot_path/initrd.img"
echo -e "}"