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

diff --git a/debian/changelog b/debian/changelog
index 2686b7f..0b0548f 100644 (file)
--- 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 <mika@grml.org>  Fri, 03 Jun 2022 14:33:53 +0200
+
 grml-live (0.40.1) unstable; urgency=medium
 
   * Software related changes:

diff --git a/etc/grml/fai/config/debconf/GRMLBASE b/etc/grml/fai/config/debconf/GRMLBASE
index 3a43fc9..89b3503 100644 (file)
--- 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

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index a074cde..a2be00a 100644 (file)
--- 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
 

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/50-lvm b/etc/grml/fai/config/scripts/GRMLBASE/50-lvm
index 9ec8199..1f65279 100755 (executable)
--- 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