From d338d0cc0f1a78f85e40e2fdf91476b780fa13ff Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 27 Nov 2011 02:24:37 +0100 Subject: [PATCH] rework resolvconf handling When building host with resolvconf and /run: | # ls -la /etc/resolv.conf | lrwxrwxrwx 1 root root 31 Sep 10 13:15 /etc/resolv.conf -> /etc/resolvconf/run/resolv.conf | # readlink -f /etc/resolvconf/run/resolv.conf | /run/resolvconf/resolv.conf ... then test -L and test -d will result both in the same result for testing /etc/resolvconf/run. So instead let's try to identify the type using readlink. --- etc/grml/fai/config/hooks/instsoft.GRMLBASE | 47 ++++++++++++---------- .../fai/config/scripts/GRMLBASE/96-apt-listbugs | 47 ++++++++++++---------- 2 files changed, 50 insertions(+), 44 deletions(-) diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index 4b36e51..c6760a5 100755 --- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE +++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE @@ -21,28 +21,31 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then echo "Action $FAI_ACTION of FAI (hooks/instsoft.GRMLBASE) via grml-live running" 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 [ -r $target/etc/policy-rc.d.conf ] ; then diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs index c5095de..c75a141 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs +++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs @@ -24,28 +24,31 @@ set -u [ -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 ] && \ -- 2.1.4