From 4a4e155db0e3c21790c6c5073f076a5e9ceaf33b Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 29 Mar 2007 11:31:50 +0200 Subject: [PATCH] grml-autoconfig script: make sure CONFIG_FSTAB matches only CONFIG_FSTAB --- debian/changelog | 8 ++++++++ sbin/grml-autoconfig | 18 +++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 49d907f..ffd84be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +grml-autoconfig (0.6.27) unstable; urgency=low + + * grml-autoconfig script: make sure CONFIG_FSTAB matches only + CONFIG_FSTAB and not CONFIG_FSTABUSER & CO. Thanks for the hint, + gebi! + + -- Michael Prokop Thu, 29 Mar 2007 11:31:20 +0200 + grml-autoconfig (0.6.26) unstable; urgency=low * Reintroduce /usr/bin/cpufreq-detect.sh code, otherwise diff --git a/sbin/grml-autoconfig b/sbin/grml-autoconfig index 57e7601..1bf1dae 100755 --- a/sbin/grml-autoconfig +++ b/sbin/grml-autoconfig @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Don Nov 16 20:24:16 CET 2006 [mika] +# Latest change: Don Mär 29 11:30:33 CEST 2007 [mika] ################################################################################ if [ "$UID" != 0 ]; then @@ -23,12 +23,12 @@ grep -q small /etc/grml_version 2>/dev/null && AUTOCONFIG=/etc/grml/autoconfig.s # helper functions activate_value() { - sed -i "s/$1.*/$1='yes'/" $AUTOCONFIG + sed -i "s/$1.*/$1'yes'/" $AUTOCONFIG } deactivate_value() { - sed -i "s/$1.*/$1='no'/" $AUTOCONFIG + sed -i "s/$1.*/$1'no'/" $AUTOCONFIG } check_setting() @@ -70,12 +70,12 @@ gpm "start GPM (mouse on console)" $GPMSTATUS \ set_values() { - check_setting dhcp && activate_value CONFIG_DHCP || deactivate_value CONFIG_DHCP - check_setting fstab && activate_value CONFIG_FSTAB || deactivate_value CONFIG_FSTAB - check_setting cpufreq && activate_value CONFIG_CPU || deactivate_value CONFIG_CPU - check_setting acpi_apm && activate_value CONFIG_ACPI_APM || deactivate_value CONFIG_ACPI_APM - check_setting syslog && activate_value CONFIG_SYSLOG || deactivate_value CONFIG_SYSLOG - check_setting gpm && activate_value CONFIG_GPM || deactivate_value CONFIG_GPM + check_setting dhcp && activate_value CONFIG_DHCP= || deactivate_value CONFIG_DHCP= + check_setting fstab && activate_value CONFIG_FSTAB= || deactivate_value CONFIG_FSTAB= + check_setting cpufreq && activate_value CONFIG_CPU= || deactivate_value CONFIG_CPU= + check_setting acpi_apm && activate_value CONFIG_ACPI_APM= || deactivate_value CONFIG_ACPI_APM= + check_setting syslog && activate_value CONFIG_SYSLOG= || deactivate_value CONFIG_SYSLOG= + check_setting gpm && activate_value CONFIG_GPM= || deactivate_value CONFIG_GPM= } # and now run it: -- 2.1.4