initial UEFI support, using isohybrid as default now

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 96-apt-listbugs

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index 65a1f53..c75a141 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -1,49 +1,54 @@
 #!/bin/bash
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/96-apt-listbugs
 # Purpose:       retreive list of bugreports of installed packages inside chroot
 # 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.
 ################################################################################
 
+set -u
 set -e
 
 if [ -r $target/etc/apt/apt.conf.d/10apt-listbugs ] ; then
-   if [ -x $target/usr/sbin/apt-listbugs ] ; then
-      sed -i 's#//DPkg::#DPkg::#' $target/etc/apt/apt.conf.d/10apt-listbugs
-   fi
+  if [ -x $target/usr/sbin/apt-listbugs ] ; then
+    sed -i 's#//DPkg::#DPkg::#' $target/etc/apt/apt.conf.d/10apt-listbugs
+  fi
 fi
 
+set +u
 if ifclass RELEASE ; then
-
+set -u
   HOSTNAME=''
   [ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
   [ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
   [ -n "$HOSTNAME" ] || HOSTNAME=grml
 
   if [ -r /etc/resolv.conf ] ; then
-    if [ -d $target/etc/resolvconf/run ] ; then # resolvconf without /run
-      # sanity check to avoid "input file is output file",
-      # see http://bts.grml.org/grml/issue984
-      if ! [ -L $target/etc/resolvconf/run/resolv.conf ] ; then
-       cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
-      else
-       echo "Error: /etc/resolvconf/run/resolv.conf in chroot should not be a symlink." >&2
-       echo "       Looks like something is wrong, please fix manually." >&2
-       exit 1
-      fi
-    elif [ -L $target/etc/resolvconf/run ] ; then # resolvconf with /run
-      # /etc/resolvconf/run symlinks to /run/resolvconf
-      mkdir -p $target/run/resolvconf
-      cat /etc/resolv.conf >> $target/run/resolvconf/resolv.conf
-    else # no resolvconf installed in chroot
-      if ! [ -L $target/etc/resolv.conf ] ; then
-       cat /etc/resolv.conf >> $target/etc/resolv.conf
-      else
-       echo "Error: /etc/resolv.conf in chroot should not be a symlink (resolvconf not installed)." >&2
-       exit 1
-      fi
-    fi
+    case "$(readlink -f ${target}/etc/resolv.conf)" in
+      /run/*) # resolvconf with /run
+        mkdir -p $target/run/resolvconf
+        cat /etc/resolv.conf >> $target/run/resolvconf/resolv.conf
+        ;;
+      /lib/*) # resolvconf without /run
+        # sanity check to avoid "input file is output file",
+        # see http://bts.grml.org/grml/issue984
+        if ! [ -L $target/etc/resolvconf/run/resolv.conf ] ; then
+          cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
+        else
+          echo "Error: /etc/resolvconf/run/resolv.conf in chroot should not be a symlink." >&2
+          echo "       Looks like something is wrong, please fix manually." >&2
+          exit 1
+        fi
+        ;;
+      *) # no resolvconf
+        if ! [ -L $target/etc/resolv.conf ] ; then
+          cat /etc/resolv.conf >> $target/etc/resolv.conf
+        else
+          echo "Error: /etc/resolv.conf in chroot should not be a symlink (resolvconf not installed)." >&2
+          exit 1
+        fi
+        ;;
+    esac
   fi
 
   if [ -x $target/usr/sbin/apt-listbugs -a -x $target/usr/bin/apt-show-source ] && \
@@ -57,3 +62,4 @@ if ifclass RELEASE ; then
 fi
 
 ## END OF FILE #################################################################
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2