Workaround debug: unbound variable

diff --git a/debian/changelog b/debian/changelog
index a20eaed..6d2b195 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ grml-live (0.9.4) unstable; urgency=low
   * GRML_SMALL:
     - several improvements to keep the ISO size as small as possible
     - use kernel 2.6.26-grml instead of 2.6.26-grml-small
+    - remove grml-small package
     - remove fuse-utils
     - remove nvi (see #490361)
     - remove ppoeconf (just too big with its dependencies)

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
index d67281f..10a7e91 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Mon Sep 29 13:15:35 CEST 2008 [mika]
+# Latest change: Mon Sep 29 13:58:14 CEST 2008 [mika]
 ################################################################################
 
 set -u
@@ -12,11 +12,17 @@ set -e
 
 ## Editor:
 # Too many people don't expect to get that, so use it only for grml-small:
+# avoid "debug: unbound variable"
+set +u
 if ifclass GRML_SMALL ; then
+set -u
    if [ -r $target/usr/bin/vim.tiny ] ; then
       $ROOTCMD update-alternatives --set editor /usr/bin/vim.tiny
       $ROOTCMD update-alternatives --set vi     /usr/bin/vim.tiny
    fi
+else
+   # avoid "debug: unbound variable" for ifclass running with 'set -u'
+   true
 fi
 
 if [ -r $target/usr/bin/vim.basic ] ; then