From 94bec0b4083fa1f3655df2d2e8c9d826b0918d0f Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 6 May 2022 12:05:12 +0200 Subject: [PATCH 01/10] SW: add sqlite3 to GRML_FULL sqlite3 - Command line interface for SQLite 3 Acked-by: Darshaka Pathirana --- etc/grml/fai/config/package_config/GRML_FULL | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL index a074cde..a2be00a 100644 --- a/etc/grml/fai/config/package_config/GRML_FULL +++ b/etc/grml/fai/config/package_config/GRML_FULL @@ -125,6 +125,7 @@ mtools # generic tools cpp +sqlite3 whois xorriso -- 2.1.4 From 1d02eb2837779d6d290fb38b423326dd1156104c Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 3 Jun 2022 12:43:13 +0200 Subject: [PATCH 02/10] Disable man-db settings to speed up package installation The man-db process tends to be time consuming. By disabling the auto-update + build-database settings, we can speed up the build process and also package installation on the live system. If someone really has needs for apropos(1) usage, manual invocation of `mandb` should be all what's needed. Thanks: Thorsten Glaser for the suggestion Closes: https://github.com/grml/grml-live/issues/112 --- etc/grml/fai/config/debconf/GRMLBASE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/grml/fai/config/debconf/GRMLBASE b/etc/grml/fai/config/debconf/GRMLBASE index 3a43fc9..89b3503 100644 --- a/etc/grml/fai/config/debconf/GRMLBASE +++ b/etc/grml/fai/config/debconf/GRMLBASE @@ -1,5 +1,7 @@ locales locales/default_environment_locale select en_US.UTF-8 locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8 +man-db man-db/auto-update boolean false +man-db man-db/build-database boolean false openssh-server openssh-server/permit-root-login boolean true passwd passwd/shadow boolean true portmap portmap/loopback boolean false -- 2.1.4 From fbb6bf9401cbd232c812ece217367b57d1afa38d Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 3 Jun 2022 14:34:20 +0200 Subject: [PATCH 03/10] Release new version 0.40.2 --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2686b7f..0b0548f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +grml-live (0.40.2) unstable; urgency=medium + + * [1d02eb2] Disable man-db settings to speed up package installation. + Thanks to Thorsten Glaser for the suggestion + * Software related changes: + - [63e3a60] add stenc to GRML_FULL + - [0989e6c] add mbuffer to GRML_FULL + - [94bec0b] add sqlite3 to GRML_FULL + + -- Michael Prokop Fri, 03 Jun 2022 14:33:53 +0200 + grml-live (0.40.1) unstable; urgency=medium * Software related changes: -- 2.1.4 From 482cb8d334a5aa4242816d5ab973555cfb46bc96 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 4 Jul 2022 18:18:48 +0200 Subject: [PATCH 04/10] GRMLBASE/50-lvm: also clear /lib/udev/rules.d/69-lvm.rules We don't want automatic lvm_scan, new udev upstream release 2.03.15 includes a new file /lib/udev/rules.d/69-lvm.rules, so let's check for presence of /lib/udev/rules.d/69-lvm.rules and /lib/udev/rules.d/69-lvm-metad.rules and clear any possibly existing files then. Related to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014314 --- etc/grml/fai/config/scripts/GRMLBASE/50-lvm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/etc/grml/fai/config/scripts/GRMLBASE/50-lvm b/etc/grml/fai/config/scripts/GRMLBASE/50-lvm index 9ec8199..1f65279 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/50-lvm +++ b/etc/grml/fai/config/scripts/GRMLBASE/50-lvm @@ -9,8 +9,15 @@ set -u set -e -echo "Clearing /lib/udev/rules.d/69-lvm-metad.rules to avoid automatic LVM scanning" -echo '# this file was generated by grml-live script GRMLBASE/50-lvm' > "${target}/lib/udev/rules.d/69-lvm-metad.rules" +if [ -f "${target}/lib/udev/rules.d/69-lvm.rules" ] ; then # lvm2 >=2.03.15 + echo "Clearing /lib/udev/rules.d/69-lvm.rules to avoid automatic LVM scanning" + echo '# this file was generated by grml-live script GRMLBASE/50-lvm' > "${target}/lib/udev/rules.d/69-lvm.rules" +fi + +if [ -f "${target}/lib/udev/rules.d/69-lvm-metad.rules" ] ; then # lvm2 <= 2.03.11 + echo "Clearing /lib/udev/rules.d/69-lvm-metad.rules to avoid automatic LVM scanning" + echo '# this file was generated by grml-live script GRMLBASE/50-lvm' > "${target}/lib/udev/rules.d/69-lvm-metad.rules" +fi ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2 -- 2.1.4 From f131526449838a2a8044069ce66e0cb806cbe0fd Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 28 Jul 2022 10:54:18 +0200 Subject: [PATCH 05/10] GRMLBASE/21-usersetup: use adduser for adding user to group adduser >=3.122 no longer supports adding a user to a group via its addgroup binary (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664869), so let's invoke adduser instead. Closes: https://github.com/grml/grml-live/issues/115 --- etc/grml/fai/config/scripts/GRMLBASE/21-usersetup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup index bc09c1f..50d43e6 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup @@ -26,7 +26,7 @@ fi add_user_to_group() { [ -n "$1" ] || return 1 if grep -q $1 $target/etc/group ; then - grep "$1:x:.*$USERNAME" $target/etc/group || $ROOTCMD addgroup $USERNAME $1 + grep "$1:x:.*$USERNAME" $target/etc/group || $ROOTCMD adduser $USERNAME $1 fi } -- 2.1.4 From 2ce5b242753999d6ff2684f85e33d4468143cbf5 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 28 Jul 2022 10:59:05 +0200 Subject: [PATCH 06/10] Release new version 0.40.3 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0b0548f..b3c5645 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-live (0.40.3) unstable; urgency=medium + + * [482cb8d] GRMLBASE/50-lvm: also clear /lib/udev/rules.d/69-lvm.rules + * [f131526] GRMLBASE/21-usersetup: use adduser for adding user to group + + -- Michael Prokop Thu, 28 Jul 2022 10:58:44 +0200 + grml-live (0.40.2) unstable; urgency=medium * [1d02eb2] Disable man-db settings to speed up package installation. -- 2.1.4 From 7e7a352dcfc40e5ab46c1916a30b979d4393f72f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A1s=20Korn?= Date: Thu, 4 Aug 2022 13:03:39 +0200 Subject: [PATCH 07/10] Exclude /var/lib/dkms/* from squashfs These files and directories are created by dkms while it builds modules on demand and are only relevant during the module build/installation process. The .ko files are then installed in /lib/modules; shipping /var/lib/dkms/* inside the squashfs only takes up space without providing a tangible benefit. --- etc/grml/fai/config/grml/squashfs-excludes | 1 + 1 file changed, 1 insertion(+) 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/* -- 2.1.4 From 6e5c0af87af40660307c4159ca6fabdb0fb71df9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A1s=20Korn?= Date: Thu, 4 Aug 2022 13:27:13 +0200 Subject: [PATCH 08/10] Avoid build error if etc/adjtime doesn't exist in chroot In scripts/GRMLBASE/18-timesetup, we assume etc/adjtime will definitely exist and error out if not. Make it so the lack of a /etc/adjtime file no longer prevents the grml build from completing. --- etc/grml/fai/config/scripts/GRMLBASE/18-timesetup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.1.4 From 8459108e76715db12818219e23762ae1446b8e6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A1s=20Korn?= Date: Thu, 4 Aug 2022 13:40:22 +0200 Subject: [PATCH 09/10] Add ZFS fai class This will install zfs-dkms and zfsutils and result in binary zfs kernel modules being included in the generated iso. --- etc/grml/fai/config/package_config/ZFS | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 etc/grml/fai/config/package_config/ZFS diff --git a/etc/grml/fai/config/package_config/ZFS b/etc/grml/fai/config/package_config/ZFS new file mode 100644 index 0000000..0a918b0 --- /dev/null +++ b/etc/grml/fai/config/package_config/ZFS @@ -0,0 +1,7 @@ +PACKAGES install + +build-essential +zfs-dkms +zfsutils-linux +dwarves + -- 2.1.4 From c289d2f4e07ded3e3e1ddaaaca08467fbf91025f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A1s=20Korn?= Date: Mon, 8 Aug 2022 12:12:37 +0200 Subject: [PATCH 10/10] Add comment about dwarves (can be needed to build kernel modules) Also, alphabetically sort list of packages in etc/grml/fai/config/package_config/ZFS --- etc/grml/fai/config/package_config/ZFS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/grml/fai/config/package_config/ZFS b/etc/grml/fai/config/package_config/ZFS index 0a918b0..c0c2451 100644 --- a/etc/grml/fai/config/package_config/ZFS +++ b/etc/grml/fai/config/package_config/ZFS @@ -1,7 +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 -dwarves -- 2.1.4