From: Michael Prokop Date: Sun, 16 Dec 2007 15:43:01 +0000 (+0100) Subject: Improve /etc/resolv.conf handling in 96-apt-listbugs X-Git-Tag: 0.0.13~15 X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=6606325e0ddec8ec74336cbe11e9bdc5b4477429 Improve /etc/resolv.conf handling in 96-apt-listbugs --- diff --git a/debian/changelog b/debian/changelog index 4b01ce5..5598818 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ grml-live (0.0.13) unstable; urgency=low * Store package list in /usr/share/doc/grml-docs/packages/dpkg_list * Document grml2ram bootoption in grml-cheatcodes.txt * Use -no-progress for Squashfs build process. + * Improve /etc/resolv.conf handling in + /etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs * Remove hwtools from GRML_FULL, see #397723 * Add new packages to GRML_MEDIUM: - truecrypt-2.6.23-grml diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs index ec8e758..c984611 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs +++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Mon Nov 19 12:49:27 CET 2007 [mika] +# Latest change: Sun Dec 16 16:42:37 CET 2007 [mika] ################################################################################ set -e @@ -34,10 +34,10 @@ if ifclass RELEASE ; then [ -n "$HOSTNAME" ] || HOSTNAME=grml if [ -r /etc/resolv.conf ] ; then - if [ -r $target/etc/resolvconf/run/resolv.conf ] ; then - cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf + if [ -d $target/etc/resolvconf/run ] ; then + cat /etc/resolv.conf > $target/etc/resolvconf/run/resolv.conf else - cat /etc/resolv.conf >> $target/etc/resolv.conf + cat /etc/resolv.conf > $target/etc/resolv.conf fi fi