Fix config_debs() and make sure config_debnet() does not globally set options

diff --git a/autoconfig.functions b/autoconfig.functions
index 0e1ca3b..7fff972 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -2031,6 +2031,7 @@ fi
 # {{{ /cdrom/.*-options
 config_debs(){
 if checkbootparam 'debs' ; then
 # {{{ /cdrom/.*-options
 config_debs(){
 if checkbootparam 'debs' ; then

+   iszsh && setopt localoptions shwordsplit

    DEBS="$(getbootparam 'debs' 2>>$DEBUG)"
    if ! echo $DEBS | grep -q '/'; then
      # backwards compatibility: if no path is given get debs from debs/
    DEBS="$(getbootparam 'debs' 2>>$DEBUG)"
    if ! echo $DEBS | grep -q '/'; then
      # backwards compatibility: if no path is given get debs from debs/


@@ -2428,7 +2429,7 @@ config_lvm(){
 # {{{ debnet: setup network based on an existing one found on a partition
 config_debnet(){
 if checkbootparam 'debnet' ; then
 # {{{ debnet: setup network based on an existing one found on a partition
 config_debnet(){
 if checkbootparam 'debnet' ; then

- iszsh && setopt shwordsplit
+ iszsh && setopt localoptions shwordsplit

  DEVICES="$(< /proc/partitions tail -n +3 | awk '{print "/dev/"$4}' | tr "\n" " ")"
  DEVICES="$DEVICES $(ls /dev/mapper/*)"
  FOUND_DEBNET=""
  DEVICES="$(< /proc/partitions tail -n +3 | awk '{print "/dev/"$4}' | tr "\n" " ")"
  DEVICES="$DEVICES $(ls /dev/mapper/*)"
  FOUND_DEBNET=""

diff --git a/debian/changelog b/debian/changelog
index 251bd18..9dacc5e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.9.14) unstable; urgency=low
+
+  * Fix config_debs() and make sure config_debnet() doesn't globally
+    set options.
+
+ -- Frank Terbeck <ft@grml.org>  Sun, 08 Aug 2010 21:42:21 +0200
+

 grml-autoconfig (0.9.13) unstable; urgency=low
 
   [ Ulrich Dangel ]
 grml-autoconfig (0.9.13) unstable; urgency=low
 
   [ Ulrich Dangel ]