projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 4.0~a13-1+grml.2
[live-boot-grml.git]
/
debian
/
patches
/
42_restore_support_for_old_persistence.patch
diff --git
a/debian/patches/42_restore_support_for_old_persistence.patch
b/debian/patches/42_restore_support_for_old_persistence.patch
index
7f86dd2
..
c86ef88
100644
(file)
--- a/
debian/patches/42_restore_support_for_old_persistence.patch
+++ b/
debian/patches/42_restore_support_for_old_persistence.patch
@@
-1,11
+1,9
@@
From: Evgeni Golov <evgeni@debian.org>
Subject: restore support for old persistence media
From: Evgeni Golov <evgeni@debian.org>
Subject: restore support for old persistence media
-diff --git a/scripts/boot/9990-aaa-fixme.sh b/scripts/boot/9990-aaa-fixme.sh
-index 416d6b4..74517e8 100755
--- a/scripts/boot/9990-aaa-fixme.sh
+++ b/scripts/boot/9990-aaa-fixme.sh
--- a/scripts/boot/9990-aaa-fixme.sh
+++ b/scripts/boot/9990-aaa-fixme.sh
-@@ -40,7 +40,10 @@
else
+@@ -40,7 +40,10 @@
udevinfo='udevinfo'
fi
udevinfo='udevinfo'
fi
@@
-16,11
+14,9
@@
index 416d6b4..74517e8 100755
persistence_list="persistence.conf"
old_persistence_list="live-persistence.conf"
persistence_list="persistence.conf"
old_persistence_list="live-persistence.conf"
-diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh
-index 5c5341c..addc82a 100755
--- a/scripts/boot/9990-misc-helpers.sh
+++ b/scripts/boot/9990-misc-helpers.sh
--- a/scripts/boot/9990-misc-helpers.sh
+++ b/scripts/boot/9990-misc-helpers.sh
-@@ -15
53,6 +1553,32 @@ activate_custom_mounts ()
+@@ -15
82,6 +1582,32 @@
echo ${used_devices}
}
echo ${used_devices}
}
@@
-53,11
+49,9
@@
index 5c5341c..addc82a 100755
is_mountpoint ()
{
directory="$1"
is_mountpoint ()
{
directory="$1"
-diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh
-index c6de171..4a080bc 100755
--- a/scripts/boot/9990-overlay.sh
+++ b/scripts/boot/9990-overlay.sh
--- a/scripts/boot/9990-overlay.sh
+++ b/scripts/boot/9990-overlay.sh
-@@ -210,7 +210,7 @@
setup_unionfs ()
+@@ -210,7 +210,7 @@
if is_in_comma_sep_list overlay ${PERSISTENCE_METHOD}
then
if is_in_comma_sep_list overlay ${PERSISTENCE_METHOD}
then
@@
-66,7
+60,7
@@
index c6de171..4a080bc 100755
fi
local overlay_devices
fi
local overlay_devices
-@@ -222,10 +222,27 @@
setup_unionfs ()
+@@ -222,10 +222,27 @@
media="$(echo ${media} | tr ":" " ")"
case ${media} in
media="$(echo ${media} | tr ":" " ")"
case ${media} in