From 0a029f67a7e9f2328dd51773c1faf2ab416019a7 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 25 May 2019 17:59:36 +0200
Subject: [PATCH] Use dracut module dmsquash-live instead of squash-live

---
 platforms/bootcd/post.inc.sh       | 1 +
 platforms/bootusb-test/post.inc.sh | 9 +++++----
 platforms/bootusb/post.inc.sh      | 1 +
 platforms/flash-server/post.inc.sh | 9 +++++----
 platforms/installdvd/post.inc.sh   | 9 +++++----
 platforms/livecd/post.inc.sh       | 1 +
 platforms/livedvd/post.inc.sh      | 1 +
 platforms/testcd/post.inc.sh       | 1 +
 8 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/platforms/bootcd/post.inc.sh b/platforms/bootcd/post.inc.sh
index 142b6ef..49ef87e 100644
--- a/platforms/bootcd/post.inc.sh
+++ b/platforms/bootcd/post.inc.sh
@@ -10,6 +10,7 @@ chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
 # make initramfs
 
 LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \
+   -a dmsquash-live -o squash-live \
    --filesystems "autofs4 ext3 ext4 overlay squashfs isofs reiserfs" \
    --nomdadmconf --nolvmconf \
    /boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz \
diff --git a/platforms/bootusb-test/post.inc.sh b/platforms/bootusb-test/post.inc.sh
index 017243f..6206218 100644
--- a/platforms/bootusb-test/post.inc.sh
+++ b/platforms/bootusb-test/post.inc.sh
@@ -3,10 +3,11 @@
 chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
 
 LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \
-   --filesystems "autofs4 ext3 ext4 overlay squashfs isofs reiserfs" \
-   --nomdadmconf --nolvmconf \
-   /boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz \
-   ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
+     -a dmsquash-live -o squash-live \
+     --filesystems "autofs4 ext3 ext4 overlay squashfs isofs reiserfs" \
+     --nomdadmconf --nolvmconf \
+     /boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz \
+     ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
 
 # add buildinfo
 buildinfo="`cat $MOUNTDIR/etc/openmamba-release` ${PLATFORM}"
diff --git a/platforms/bootusb/post.inc.sh b/platforms/bootusb/post.inc.sh
index fa91c19..455aac0 100644
--- a/platforms/bootusb/post.inc.sh
+++ b/platforms/bootusb/post.inc.sh
@@ -2,6 +2,7 @@
 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
    chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${K}
    LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \
+      -a dmsquash-live -o squash-live \
       --filesystems "autofs4 ext3 ext4 overlay squashfs isofs reiserfs" \
       --nomdadmconf --nolvmconf \
       /boot/initramfs-${KERNEL_MAJVER}${K}.img.gz \
diff --git a/platforms/flash-server/post.inc.sh b/platforms/flash-server/post.inc.sh
index 4bc69cb..5525c29 100644
--- a/platforms/flash-server/post.inc.sh
+++ b/platforms/flash-server/post.inc.sh
@@ -6,10 +6,11 @@
 # make initramfs
 
 LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \
-   --filesystems "autofs4 ext3 ext4 overlay squashfs isofs reiserfs" \
-   --nomdadmconf --nolvmconf \
-   /boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz \
-   ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
+      -a dmsquash-live -o squash-live \
+      --filesystems "autofs4 ext3 ext4 overlay squashfs isofs reiserfs" \
+      --nomdadmconf --nolvmconf \
+      /boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz \
+      ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
 
 # configure extlinux boot loader
 cat > $MOUNTDIR/boot/extlinux.conf << _EOF
diff --git a/platforms/installdvd/post.inc.sh b/platforms/installdvd/post.inc.sh
index ab5a1d4..1e1dc49 100644
--- a/platforms/installdvd/post.inc.sh
+++ b/platforms/installdvd/post.inc.sh
@@ -10,10 +10,11 @@
 chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
 
 LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \
-   --filesystems "autofs4 ext3 ext4 overlay squashfs isofs reiserfs" \
-   --nomdadmconf --nolvmconf \
-   /boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz \
-   ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
+     -a dmsquash-live -o squash-live \
+     --filesystems "autofs4 ext3 ext4 overlay squashfs isofs reiserfs" \
+     --nomdadmconf --nolvmconf \
+     /boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz \
+     ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
 
 # Note: isolinux requires 8.3 filenames
 cp $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz \
diff --git a/platforms/livecd/post.inc.sh b/platforms/livecd/post.inc.sh
index a5c69da..e2e7ca0 100644
--- a/platforms/livecd/post.inc.sh
+++ b/platforms/livecd/post.inc.sh
@@ -11,6 +11,7 @@ ISOID=
 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
    chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${K}
    LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \
+      -a dmsquash-live -o squash-live \
       --filesystems "autofs4 ext3 ext4 overlay squashfs isofs reiserfs" \
       --nomdadmconf --nolvmconf \
       /boot/initramfs-${KERNEL_MAJVER}${K}.img.gz \
diff --git a/platforms/livedvd/post.inc.sh b/platforms/livedvd/post.inc.sh
index 3fc14b4..23080a3 100644
--- a/platforms/livedvd/post.inc.sh
+++ b/platforms/livedvd/post.inc.sh
@@ -11,6 +11,7 @@ ISOID=
 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
    chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${K}
    LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \
+      -a dmsquash-live -o squash-live \
       --filesystems "autofs4 ext3 ext4 overlay squashfs isofs reiserfs" \
       --nomdadmconf --nolvmconf \
       /boot/initramfs-${KERNEL_MAJVER}${K}.img.gz \
diff --git a/platforms/testcd/post.inc.sh b/platforms/testcd/post.inc.sh
index 5e77165..dc6d094 100644
--- a/platforms/testcd/post.inc.sh
+++ b/platforms/testcd/post.inc.sh
@@ -11,6 +11,7 @@ ISOID=
 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
    chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${K}
    LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \
+      -a dmsquash-live -o squash-live \
       --filesystems "autofs4 ext3 ext4 overlay squashfs isofs reiserfs" \
       --nomdadmconf --nolvmconf \
       /boot/initramfs-${KERNEL_MAJVER}${K}.img.gz \