X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F96-apt-listbugs;h=bbe6117309e4e15b547cb61c1a7b221fec8c3a8a;hp=f1083d3e3010ebbeb84579ad4ae7c42009503810;hb=16a29e1;hpb=2017df2408d7a815e4594d93501e3253b8d799ca diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs index f1083d3..bbe6117 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs +++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs @@ -22,11 +22,24 @@ if ifclass RELEASE ; then [ -n "$HOSTNAME" ] || HOSTNAME=grml if [ -r /etc/resolv.conf ] ; then - if [ -d $target/etc/resolvconf/run ] ; then + if [ -d $target/etc/resolvconf/run ] ; then # resolvconf + # 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 - elif [ ! -L $target/etc/resolv.conf ] ; then + 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 + else # no resolvconf installed in chroot + if ! [ -L $target/etc/resolv.conf ] ; then cat /etc/resolv.conf >> $target/etc/resolv.conf - fi + else + echo "Error: /etc/resolv.conf in chroot should not be a symlink (resolvconf not installed)." >&2 + exit 1 + fi + fi fi if [ -x $target/usr/sbin/apt-listbugs -a -x $target/usr/bin/apt-show-source ] && \