refresh patches against Debian's 3.0~b6-1

[live-boot-grml.git] / debian / patches / 39_persistence_with_forensic.patch

diff --git a/debian/patches/39_persistence_with_forensic.patch b/debian/patches/39_persistence_with_forensic.patch
index 16a67b0..e8cb701 100644 (file)
--- a/debian/patches/39_persistence_with_forensic.patch
+++ b/debian/patches/39_persistence_with_forensic.patch
@@ -1,12 +1,12 @@
---- a/scripts/live-premount/readonly
-+++ b/scripts/live-premount/readonly
-@@ -32,4 +32,21 @@
-                       blockdev --setro $device && printf "done [ execute \"blockdev --setrw %-9s\" to unlock]\n" $device >/dev/console || printf "failed\n" >/dev/console
-               fi
+--- a/scripts/boot/0120-read-only
++++ b/scripts/boot/0120-read-only
+@@ -53,4 +53,20 @@
+                               ;;
+               esac
        done
 +
 +      if grep -qe persistence /proc/cmdline
-+        then
++              then
 +              printf " * Persistence mode enabled, searching for persistency related devices to unlock\n" >/dev/console
 +
 +              for label in custom-ov home-rw home-sn live-rw live-sn
@@ -14,11 +14,10 @@
 +                      if blkid -t LABEL="$label" | grep -q '.'
 +                      then
 +                              device=$(blkid -t LABEL="$label" | awk -F: '{print $1}')
-+                                printf "   - Setting device %-9s with label '%s' to write mode for persistence mode: " "$device" "$label" >/dev/console
++                              printf "   - Setting device %-9s with label '%s' to write mode for persistence mode: " "$device" "$label" >/dev/console
 +                              blockdev --setrw $device && printf "done\n" >/dev/console || printf "failed\n" >/dev/console
 +                      fi
-+
 +              done
 +      fi
 +
- fi
+ }