projects
/
grml-live-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a77e159
)
Remove FAI files on bailout
author
Michael Prokop
<devnull@localhost>
Sun, 4 Nov 2007 10:12:24 +0000
(11:12 +0100)
committer
Michael Prokop
<devnull@localhost>
Sun, 4 Nov 2007 10:12:24 +0000
(11:12 +0100)
debian/changelog
patch
|
blob
|
history
etc/grml/fai/config/hooks/instsoft.GRMLBASE
patch
|
blob
|
history
etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
patch
|
blob
|
history
grml-live
patch
|
blob
|
history
diff --git
a/debian/changelog
b/debian/changelog
index
1c8ea1d
..
4ebbf93
100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-3,6
+3,10
@@
grml-live (0.0.8) unstable; urgency=low
* Copy /etc/resolv.conf to chroot in
/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs and
/etc/grml/fai/config/hooks/instsoft.GRMLBASE as well.
* Copy /etc/resolv.conf to chroot in
/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs and
/etc/grml/fai/config/hooks/instsoft.GRMLBASE as well.
+ * Remove /var/run/fai/fai_softupdate_is_running and
+ /var/run/fai/FAI_INSTALLATION_IN_PROGRESS if we exit grml-live.
+ (FAI's softupdate currently does not clean up when canceling
+ the process.)
-- Michael Prokop <mika@grml.org> Sun, 04 Nov 2007 01:43:06 +0100
-- Michael Prokop <mika@grml.org> Sun, 04 Nov 2007 01:43:06 +0100
diff --git
a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index
ab27f3d
..
003e16a
100755
(executable)
--- a/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@
-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.
# 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 Nov 04 11:0
1:20
CET 2007 [mika]
+# Latest change: Sun Nov 04 11:0
8:53
CET 2007 [mika]
################################################################################
set -u
################################################################################
set -u
@@
-17,8
+17,12
@@
if [ "$FAI_ACTION" = "softupdate" ] ; then
echo "Softupdate of FAI via grml-live running"
if [ -r /etc/resolv.conf ] ; then
echo "Softupdate of FAI via grml-live running"
if [ -r /etc/resolv.conf ] ; then
- cat /etc/resolv.conf >> $target/etc/resolv.conf
- fi
+ if [ -r /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
# make sure we prefer grml repository:
if [ -r /etc/grml/fai/apt/preferences ] ; then
# make sure we prefer grml repository:
if [ -r /etc/grml/fai/apt/preferences ] ; then
diff --git
a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index
5aabce6
..
01dbfd2
100755
(executable)
--- 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 <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 Nov 04
01:42:58
CET 2007 [mika]
+# Latest change: Sun Nov 04
11:08:40
CET 2007 [mika]
################################################################################
set -e
################################################################################
set -e
@@
-16,7
+16,11
@@
if ifclass RELEASE ; then
[ -n "$HOSTNAME" ] || HOSTNAME=grml
if [ -r /etc/resolv.conf ] ; then
[ -n "$HOSTNAME" ] || HOSTNAME=grml
if [ -r /etc/resolv.conf ] ; then
- cat /etc/resolv.conf >> $target/etc/resolv.conf
+ if [ -r /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 ] && \
fi
if [ -x $target/usr/sbin/apt-listbugs -a -x $target/usr/bin/apt-show-source ] && \
diff --git
a/grml-live
b/grml-live
index
5209776
..
2ebfa88
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-61,6
+61,7
@@
PN=$(basename $0)
# clean exit {{{
bailout() {
[ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
# clean exit {{{
bailout() {
[ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
+ rm -f /var/run/fai/fai_softupdate_is_running /var/run/fai/FAI_INSTALLATION_IN_PROGRESS
[ -n "$1" ] && EXIT="$1" || EXIT="1"
[ -n "$2" ] && eerror "$2">&2
log "------------------------------------------------------------------------------"
[ -n "$1" ] && EXIT="$1" || EXIT="1"
[ -n "$2" ] && eerror "$2">&2
log "------------------------------------------------------------------------------"