projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert accidental addition of fat to grub2 core.img
[grml-live.git]
/
etc
/
grml
/
fai
/
config
/
hooks
/
updatebase.GRMLBASE
diff --git
a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index
108b1ec
..
9e0913a
100755
(executable)
--- a/
etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/
etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@
-8,14
+8,11
@@
set -u
set -e
set -u
set -e
+. "$GRML_LIVE_CONFIG"
# visualize chroot inside zsh:
echo grml_chroot > $target/etc/debian_chroot
# visualize chroot inside zsh:
echo grml_chroot > $target/etc/debian_chroot
-HOSTNAME=''
-[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
-[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
-[ -n "$HOSTNAME" ] || HOSTNAME=grml
echo "$HOSTNAME" > $target/etc/hostname
if [ -n "${APT_PROXY:-}" ] ; then
echo "$HOSTNAME" > $target/etc/hostname
if [ -n "${APT_PROXY:-}" ] ; then
@@
-27,6
+24,9
@@
fi
if [ "$FAI_ACTION" = "softupdate" ] ; then
echo "Action $FAI_ACTION of FAI (hooks/updatebase.GRMLBASE) via grml-live running"
if [ "$FAI_ACTION" = "softupdate" ] ; then
echo "Action $FAI_ACTION of FAI (hooks/updatebase.GRMLBASE) via grml-live running"
+ # otherwise we're running 'aptitude update' even on with -b option
+ skiptask updatebase
+
## based on FAI's lib/updatebase:
# some packages must access /proc even in chroot environment
if ! [ -d $FAI_ROOT/proc/1 ] ; then
## based on FAI's lib/updatebase:
# some packages must access /proc even in chroot environment
if ! [ -d $FAI_ROOT/proc/1 ] ; then