Merge pull request #349 from aafeijoo-suse/059-bsc1226529

feat(crypt): force the inclusion of crypttab entries with x-initrd.attach (bsc#1226529)
openSUSE · Jul 2, 2024 · 20b345b · 20b345b
2 parents cf68881 + ff12ca6
commit 20b345b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
@@ -142,7 +142,7 @@ install() {
             forceentry=""
             while [ $# -gt 0 ]; do
                 case $1 in
-                    force)
+                    force | x-initrd.attach)
                         forceentry="yes"
                         break
                         ;;

diff --git a/suse/README.susemaint b/suse/README.susemaint
@@ -372,4 +372,5 @@ b5a35f9d feat(zfcp_rules): remove zfcp handling consolidated in s390-tools
 2d8fa8be refactor(ifcfg): delete code duplication using iface_get_subchannels()
 457e66e6 feat(ifcfg): minimize s390-specific network configuration aspects
 3fd43858 fix(mdraid): try to assemble the missing raid device
+61ab3386 feat(crypt): force the inclusion of crypttab entries with x-initrd.attach