summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2020-02-29 21:53:09 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2020-02-29 22:01:10 +0000
commit8fe19c7840073f412fd6298bc3033dc28df4484b (patch)
treee958a379cb3bea63bd946a1222095ca0f449614e
parent3a982005944a8e2b904b9d83f9bd1ba443b6e07c (diff)
Update examples to support encrypted persistent partition.
-rw-r--r--NEWS2
-rw-r--r--examples/gui/files/dracut-live.conf2
-rw-r--r--examples/minimal/config/build.cfg2
-rw-r--r--examples/minimal/files/dracut-live.conf2
-rw-r--r--examples/xfce/files/dracut-live.conf2
5 files changed, 6 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index f58701b..171338f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- update examples to support encrypted persistent partition
+
1.11
- fix ownership of dummy root directory (mga#24501)
diff --git a/examples/gui/files/dracut-live.conf b/examples/gui/files/dracut-live.conf
index 42b3e24..21a357c 100644
--- a/examples/gui/files/dracut-live.conf
+++ b/examples/gui/files/dracut-live.conf
@@ -3,7 +3,7 @@ hostonly="no"
# load mga livecd support
add_dracutmodules+=" mgalive "
# block some dracut modules we dont want / use
-omit_dracutmodules+=" caps crypt dm dmraid mdraid lvm nfs i18n resume modsign "
+omit_dracutmodules+=" caps dmraid mdraid lvm nfs i18n resume modsign "
# compress initrd with xz
compress_l="xz"
# whitelist only the filesystems needed by live CDs and live USB
diff --git a/examples/minimal/config/build.cfg b/examples/minimal/config/build.cfg
index b767371..d8ded65 100644
--- a/examples/minimal/config/build.cfg
+++ b/examples/minimal/config/build.cfg
@@ -51,7 +51,7 @@ my $config = {
'drakiso-null-bootloader',
# Some extra admin tools.
- 'bind-utils', 'btrfs-progs', 'dmraid', 'hdparm', 'mdadm',
+ 'bind-utils', 'btrfs-progs', 'cryptsetup', 'dmraid', 'hdparm', 'mdadm',
# Allow patching during customisation.
'patch',
diff --git a/examples/minimal/files/dracut-live.conf b/examples/minimal/files/dracut-live.conf
index 42b3e24..21a357c 100644
--- a/examples/minimal/files/dracut-live.conf
+++ b/examples/minimal/files/dracut-live.conf
@@ -3,7 +3,7 @@ hostonly="no"
# load mga livecd support
add_dracutmodules+=" mgalive "
# block some dracut modules we dont want / use
-omit_dracutmodules+=" caps crypt dm dmraid mdraid lvm nfs i18n resume modsign "
+omit_dracutmodules+=" caps dmraid mdraid lvm nfs i18n resume modsign "
# compress initrd with xz
compress_l="xz"
# whitelist only the filesystems needed by live CDs and live USB
diff --git a/examples/xfce/files/dracut-live.conf b/examples/xfce/files/dracut-live.conf
index 42b3e24..21a357c 100644
--- a/examples/xfce/files/dracut-live.conf
+++ b/examples/xfce/files/dracut-live.conf
@@ -3,7 +3,7 @@ hostonly="no"
# load mga livecd support
add_dracutmodules+=" mgalive "
# block some dracut modules we dont want / use
-omit_dracutmodules+=" caps crypt dm dmraid mdraid lvm nfs i18n resume modsign "
+omit_dracutmodules+=" caps dmraid mdraid lvm nfs i18n resume modsign "
# compress initrd with xz
compress_l="xz"
# whitelist only the filesystems needed by live CDs and live USB