projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade via aptitude [safe-]upgrade
[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
5d72887
..
5143318
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@
-4,11
+4,10
@@
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2 or any later version.
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2 or any later version.
-# Latest change: Sun
Oct 14 11:48:35 CES
T 2007 [mika]
+# Latest change: Sun
Nov 04 11:08:40 CE
T 2007 [mika]
################################################################################
set -e
################################################################################
set -e
-set -u
if ifclass RELEASE ; then
if ifclass RELEASE ; then
@@
-16,6
+15,14
@@
if ifclass RELEASE ; then
[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
[ -n "$HOSTNAME" ] || HOSTNAME=grml
[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
[ -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
+ else
+ cat /etc/resolv.conf >> $target/etc/resolv.conf
+ fi
+ 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
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