[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. debian/0.9-9-g0b3fb47

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 0b3fb47dac2d0ac4af03da0f5223daeca834bbd8
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sat Apr 20 17:50:34 2013 +0200

    Add acpi-support-base package and little cleanup.
    
    The acpi-support-base package improves handling ACPI events.  Thanks
    to Andreas Schockenhoff for the suggestion.
    
    Nicer coding in 'rc.local'.

diff --git a/fai/config/files/etc/rc.local/FAISERVER b/fai/config/files/etc/rc.local/FAISERVER
index 6ec021e..dcb78a6 100755
--- a/fai/config/files/etc/rc.local/FAISERVER
+++ b/fai/config/files/etc/rc.local/FAISERVER
@@ -140,17 +140,13 @@ If unanswered, this script will exit after $TIMEOUT seconds.
 
 EOF
     read -e -t $TIMEOUT -n 1 -p "Install the nfsroot for FAI now? [y|N]: " inp
-    inp=${inp:-N}
-    case $inp in
-	y)
-	    check_network
-	    setup_nfsroot
-	    setup_PXEinstaller
-	    ;;
-	*)
-	    exit 0
-	    ;;
-    esac
+    if [ "$inp" = "y" ] ; then
+	check_network
+	setup_nfsroot
+	setup_PXEinstaller
+    else
+	exit 0
+    fi
 fi
 
 ## The following code is activated if diskless machines
@@ -169,15 +165,11 @@ If unanswered, this script will exit after $TIMEOUT seconds.
 
 EOF
     read -e -t $TIMEOUT -n 1 -p "Install the chroot for diskless clients now? [y|N]: " inp
-    inp=${inp:-N}
-    case $inp in
-	y)
-	    check_network
-	    setup_diskless
-	    setup_PXEinstaller
-	    ;;
-	*)
-	    exit 0
-	    ;;
-    esac
+    if [ "$inp" = "y" ] ; then
+	check_network
+	setup_diskless
+	setup_PXEinstaller
+    else
+	exit 0
+    fi
 fi
diff --git a/fai/config/package_config/DISKLESS_CLIENT b/fai/config/package_config/DISKLESS_CLIENT
index 8fdcccd..ba3c06d 100644
--- a/fai/config/package_config/DISKLESS_CLIENT
+++ b/fai/config/package_config/DISKLESS_CLIENT
@@ -58,3 +58,4 @@ console-common
 pciutils usbutils
 #heirloom-mailx
 mutt
+acpi-support-base
diff --git a/fai/config/package_config/FAIBASE b/fai/config/package_config/FAIBASE
index c226b2d..b36c733 100644
--- a/fai/config/package_config/FAIBASE
+++ b/fai/config/package_config/FAIBASE
@@ -23,3 +23,4 @@ nscd
 #heirloom-mailx
 mutt
 cfengine2
+acpi-support-base

-- 
Debian-LAN development and packaging