From: Michael Prokop <mika@grml.org>
Date: Mon, 8 Aug 2022 13:07:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/github/pr/116'
X-Git-Tag: v0.41.0~3
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=5638b81b06c2bd6dba13f9d79a416ebf89e66d4c;hp=2ce5b242753999d6ff2684f85e33d4468143cbf5

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
--- 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
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
--- 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