Warning!

Notice: the grml team is migrating from Mercurial to Git.
Please visit git.grml.org instead!

Support setting /etc/debian_chroot
authorMichael Prokop <mika@grml.org>
Mon Oct 29 23:36:33 2007 +0100 (13 months ago)
changeset 233e29530020afb
manifeste29530020afb
parent 232f3094cf2b107
child 234a4aa6ab69604
Support setting /etc/debian_chroot
debian/changelog
etc/grml/fai/config/hooks/instsoft.GRMLBASE
etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
--- a/debian/changelog Mon Oct 29 00:47:11 2007 +0100
+++ b/debian/changelog Mon Oct 29 23:36:33 2007 +0100
@@ -15,6 +15,9 @@ grml-live (0.0.7) unstable; urgency=low
during grml-live execution
- do not re-execute grml-live is the target ISO exists already
* Set /etc/grml_version of live-system to the according value.
+ [Closes: issue322]
+ * Support setting /etc/debian_chroot inside chroot (useful if
+ building fails and manual interaction is needed).
* Log to /var/log/grml-live.log by default now and support
$ZERO_LOGFILE for cleaning up logs.
* Added new grml-repository named grml-live which is intented
@@ -31,7 +34,7 @@ grml-live (0.0.7) unstable; urgency=low
with /etc/grml/fai/apt/preferences so grml-live repository
can be used and configured at a single place.
* Use apt-pinning via /etc/grml/fai/config/hooks/instsoft.GRMLBASE
- already and remove it from /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+ and drop it from /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
* Display version number of grml-live.
* Log executed grml-live command line.
* Set FAI_DEBOOTSTRAP_OPTS="--exclude=dhcp-client,info"
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE Mon Oct 29 00:47:11 2007 +0100
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE Mon Oct 29 23:36:33 2007 +0100
@@ -4,11 +4,14 @@
# 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: Sat Oct 27 02:15:35 CEST 2007 [mika]
+# Latest change: Mon Okt 29 23:35:34 CET 2007 [mika]
################################################################################
set -u
set -e
+
+# visualize chroot inside zsh:
+echo grml_chroot > $target/etc/debian_chroot
if [ "$FAI_ACTION" = "softupdate" ] ; then
echo "Softupdate"
--- a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build Mon Oct 29 00:47:11 2007 +0100
+++ b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build Mon Oct 29 23:36:33 2007 +0100
@@ -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 or any later version.
-# Latest change: Mon Oct 15 19:12:13 CEST 2007 [mika]
+# Latest change: Mon Okt 29 10:46:02 CET 2007 [mika]
################################################################################
set -u
@@ -16,6 +16,11 @@ if [ -r $target/etc/apt/apt.conf ] ; the
sed -i "s#Acquire::http::Pipeline-Depth.*#// &#" $target/etc/apt/apt.conf
fi
+# remove an existing /etc/debian_chroot file:
+if [ -r $target/etc/debian_chroot ] ; then
+ rm -f $target/etc/debian_chroot
+fi
+
# /etc/grml_cd makes the live system recognizable as a live system
touch $target/etc/grml_cd