projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update resolv.conf handling to properly support /run (see issue984).
[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
bbe6117
..
65a1f53
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@
-22,22
+22,26
@@
if ifclass RELEASE ; then
[ -n "$HOSTNAME" ] || HOSTNAME=grml
if [ -r /etc/resolv.conf ] ; then
[ -n "$HOSTNAME" ] || HOSTNAME=grml
if [ -r /etc/resolv.conf ] ; then
- if [ -d $target/etc/resolvconf/run ] ; then # resolvconf
+ 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
# 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
+ cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
else
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
+ 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
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
else # no resolvconf installed in chroot
if ! [ -L $target/etc/resolv.conf ] ; then
-
cat /etc/resolv.conf >> $target/etc/resolv.conf
+ cat /etc/resolv.conf >> $target/etc/resolv.conf
else
else
-
echo "Error: /etc/resolv.conf in chroot should not be a symlink (resolvconf not installed)." >&2
-
exit 1
+ echo "Error: /etc/resolv.conf in chroot should not be a symlink (resolvconf not installed)." >&2
+ exit 1
fi
fi
fi
fi
fi
fi