Merge pull request #173 from grml/build_only-docker

Fix BUILD_ONLY mode inside Docker
grml · Nov 23, 2024 · 6b8da86 · 6b8da86
2 parents ec0a767 + 971bd57
commit 6b8da86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -13,7 +13,8 @@ set -e
 # and can't skip instsoft.GRMLBASE we have to make sure
 # we exit here as well
 if [ -n "$BUILD_ONLY" ] ; then
-   "Exiting hooks/instsoft.GRMLBASE as BUILD_ONLY environment is set."
+   echo "Exiting hooks/instsoft.GRMLBASE as BUILD_ONLY environment is set."
+   echo "W: This place was reached because updatebase.GRMLBASE failed."
    exit 0
 fi
 

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -34,15 +34,15 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
    fi
    # some packages must access /sys even in chroot environment
    if ! [ -d $FAI_ROOT/sys/kernel ] ; then
-      mount -t sysfs sysfs $FAI_ROOT/sys
+      mount -t sysfs sysfs $FAI_ROOT/sys || true
    fi
    # if we are using udev, also mount it into $FAI_ROOT
    if [ -f /etc/init.d/udev ] ; then
       mount --bind /dev $FAI_ROOT/dev || true
    fi
 
    if [ -d $FAI_ROOT/run ] ; then
-      mount -t tmpfs tmpfs $FAI_ROOT/run
+      mount -t tmpfs tmpfs $FAI_ROOT/run || true
       mkdir $FAI_ROOT/run/lock
    fi