Merge remote-tracking branch 'origin/github/pr/116'

diff --git a/etc/grml/fai/config/grml/squashfs-excludes b/etc/grml/fai/config/grml/squashfs-excludes
index 6c28c80..fed1ce9 100644 (file)
--- a/etc/grml/fai/config/grml/squashfs-excludes
+++ b/etc/grml/fai/config/grml/squashfs-excludes
@@ -1,3 +1,4 @@
 run/*
 var/run/*
 var/lock/*
+var/lib/dkms/*

diff --git a/etc/grml/fai/config/package_config/ZFS b/etc/grml/fai/config/package_config/ZFS
new file mode 100644 (file)
index 0000000..c0c2451
--- /dev/null
+++ b/etc/grml/fai/config/package_config/ZFS
@@ -0,0 +1,9 @@
+PACKAGES install
+
+build-essential
+# pahole(1), provided by the dwwarves package in older Debian releases and the pahole package in sid as of 2022-08, can be needed to build kernel modules (depending on kernel config?)
+# TODO: add a script that removes it once dkms install succeeded so that it doesn't bloat the iso
+dwarves
+zfs-dkms
+zfsutils-linux
+

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/18-timesetup b/etc/grml/fai/config/scripts/GRMLBASE/18-timesetup
index da40243..d44efb2 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/18-timesetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/18-timesetup
@@ -13,7 +13,7 @@ set -e
 # by default it's set to UTC=no
 if [ -n "$UTC" ] && [ "$UTC" = "yes" ] ; then
    echo "UTC is set to 'yes', setting hwclock parameter UTC"
-   sed -i "s/^LOCAL/UTC/" "${target}/etc/adjtime"
+   [ -e "${target}/etc/adjtime" ] && sed -i "s/^LOCAL/UTC/" "${target}/etc/adjtime"
 fi
 
 # default timezone settings