Make sure to not leak any mdadm configurations from the build system

[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 7a79cbe..e1633b3 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
+. "$GRML_LIVE_CONFIG"
 
 # visualize chroot inside zsh:
 echo grml_chroot > $target/etc/debian_chroot
 
-HOSTNAME=''
-[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
-[ -n "$HOSTNAME" ] || HOSTNAME=grml
 echo "$HOSTNAME" > $target/etc/hostname
 
 if [ -n "${APT_PROXY:-}" ] ; then
@@ -44,6 +41,11 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
       mount --bind /dev $FAI_ROOT/dev || true
    fi
 
+   if [ -d $FAI_ROOT/run ] ; then
+      mount -t tmpfs tmpfs $FAI_ROOT/run
+      mkdir $FAI_ROOT/run/lock
+   fi
+
    mount -t devpts devpts $FAI_ROOT/dev/pts || true
 
    # skip the task if we want to build a new ISO only,