21-usersetup: check for existing /bin/zsh inside the chroot

[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 c75a141..d0baa3f 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -18,44 +18,11 @@ 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
-    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 ] && \
      [ -x $target/etc/apt/grml/listbugs ] ; then
      for severity in critical grave serious ; do
          SEVERITY=$severity $ROOTCMD /etc/apt/grml/listbugs > \
-         /var/log/fai/$HOSTNAME/last/bugs.${severity} || true # make sure it does not fail
+         $LOGDIR/bugs.${severity} || true # make sure it does not fail
      done
   fi