projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix usage of DEBIAN_FRONTEND
[grml-debootstrap.git]
/
chroot-script
diff --git
a/chroot-script
b/chroot-script
index
29cd840
..
0dc55be
100644
(file)
--- a/
chroot-script
+++ b/
chroot-script
@@
-4,7
+4,7
@@
# 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.
# 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.
-# Latest change: Mon Apr 16 1
4:48:4
1 CEST 2007 [mika]
+# Latest change: Mon Apr 16 1
5:26:1
1 CEST 2007 [mika]
################################################################################
set -e # exit on any error
################################################################################
set -e # exit on any error
@@
-36,7
+36,7
@@
stage() {
echo "$2" > "$STAGES/$1"
return 0
elif grep -q done "$STAGES/$1" 2>/dev/null ; then
echo "$2" > "$STAGES/$1"
return 0
elif grep -q done "$STAGES/$1" 2>/dev/null ; then
- e
warn "Notice: stage $1 has been executed already, skipping execution therefore." ; eend 0
+ e
cho "Notice: stage $1 has been executed already, skipping execution therefore.">&2
return 1
fi
}
return 1
fi
}
@@
-89,7
+89,7
@@
packages() {
exit 1
else
$APTUPDATE
exit 1
else
$APTUPDATE
- $APTINSTALL $(cat /etc/debootstrap/packages) $GRMLPACKAGES
+
DEBIAN_FRONTEND=$DEBIAN_FRONTEND
$APTINSTALL $(cat /etc/debootstrap/packages) $GRMLPACKAGES
fi
fi
}
fi
fi
}
@@
-121,7
+121,7
@@
kernel() {
else
KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL"
fi
else
KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL"
fi
- $APTINSTALL $KERNELPACKAGES
+
DEBIAN_FRONTEND=$DEBIAN_FRONTEND
$APTINSTALL $KERNELPACKAGES
fi
}
# }}}
fi
}
# }}}
@@
-130,7
+130,9
@@
kernel() {
reconfigure() {
if [ -n "$RECONFIGURE" ] ; then
for package in $RECONFIGURE ; do
reconfigure() {
if [ -n "$RECONFIGURE" ] ; then
for package in $RECONFIGURE ; do
- dpkg --list $package 1>/dev/null 2>/dev/null && dpkg-reconfigure $package || echo "Warning: $package does not exist, can not reconfigure it."
+ dpkg --list $package 1>/dev/null 2>/dev/null && \
+ DEBIAN_FRONTEND=$DEBIAN_FRONTEND dpkg-reconfigure $package || \
+ echo "Warning: $package does not exist, can not reconfigure it."
done
fi
}
done
fi
}