From d19c2c3da15c2b8550146e66031fb51938cd125f Mon Sep 17 00:00:00 2001 From: Dinko Korunic Date: Tue, 2 Jun 2009 16:56:05 +0200 Subject: [PATCH] - manji fixup za sysctl -e -w.. vs. sysctl -w -e --- debian/postinst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/postinst b/debian/postinst index e279cfb..a4b7577 100755 --- a/debian/postinst +++ b/debian/postinst @@ -143,7 +143,7 @@ echo -n " grub3" # workaround execshield SHIELD=$(sysctl -e -n kernel.exec-shield) if [ ! -z "$SHIELD" ]; then - sysctl -w -e kernel.exec-shield=0 >/dev/null 2>&1 + sysctl -e -w kernel.exec-shield=0 >/dev/null 2>&1 echo -n " execshield1" fi @@ -210,6 +210,8 @@ fi echo -n " grub6" # fix possible wrong params in menu.lst +root_device=/dev/sda6 +grub_root_device=$(convert_default "$root_device") cp_check_and_sed '^# groot=' \ "s;^# groot=.*;# groot=$grub_root_device;g" \ "$menu_file" || true @@ -246,7 +248,7 @@ echo -n " grub8" # restore execshield state if [ ! -z "$SHIELD" ]; then - sysctl -w -e "kernel.exec-shield=$SHIELD" >/dev/null 2>&1 + sysctl -e -w "kernel.exec-shield=$SHIELD" >/dev/null 2>&1 echo -n " execshield2" fi -- 1.7.10.4