Blame 0005-dmsquash-live-dmsquash-live-root.sh-SQUASHED-can-be-.patch

Harald Hoyer 4226e2
From ce9a398771d6e8503d767b450282db52b7a4b482 Mon Sep 17 00:00:00 2001
Harald Hoyer 4226e2
From: Harald Hoyer <harald@redhat.com>
Harald Hoyer 4226e2
Date: Tue, 1 Dec 2015 08:52:00 +0100
Harald Hoyer 4226e2
Subject: [PATCH] dmsquash-live/dmsquash-live-root.sh: SQUASHED can be set
Harald Hoyer 4226e2
 earlier
Harald Hoyer 4226e2
Harald Hoyer 4226e2
8b5ee88ff667693b2d8da85a8552ad8f5ab95127 removed the check for SQUASHED,
Harald Hoyer 4226e2
assuming, that the if clause above was the only place, where SQUASHED is
Harald Hoyer 4226e2
set.
Harald Hoyer 4226e2
Harald Hoyer 4226e2
This patch reverts to the old logic, because SQUASHED can be set
Harald Hoyer 4226e2
earlier.
Harald Hoyer 4226e2
---
Harald Hoyer 4226e2
 modules.d/90dmsquash-live/dmsquash-live-root.sh | 3 +++
Harald Hoyer 4226e2
 1 file changed, 3 insertions(+)
Harald Hoyer 4226e2
Harald Hoyer 4226e2
diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
Harald Hoyer 4226e2
index fa44a03..68d076c 100755
Harald Hoyer 4226e2
--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
Harald Hoyer 4226e2
+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
Harald Hoyer 4226e2
@@ -203,6 +203,9 @@ fi
Harald Hoyer 4226e2
 # we might have an embedded fs image on squashfs (compressed live)
Harald Hoyer 4226e2
 if [ -e /run/initramfs/live/${live_dir}/${squash_image} ]; then
Harald Hoyer 4226e2
     SQUASHED="/run/initramfs/live/${live_dir}/${squash_image}"
Harald Hoyer 4226e2
+fi
Harald Hoyer 4226e2
+
Harald Hoyer 4226e2
+if [ -e "$SQUASHED" ] ; then
Harald Hoyer 4226e2
     if [ -n "$live_ram" ]; then
Harald Hoyer 4226e2
         echo "Copying live image to RAM..."
Harald Hoyer 4226e2
         echo "(this may take a few minutes)"