X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F42_restore_support_for_old_persistence.patch;h=c86ef88fab8c468870b38c98afb561f61bb62919;hb=7d773fad4a9f232eea97a5968519fee1f626d25d;hp=7f86dd2ca1bdc0ba17a72994802de763073e3b94;hpb=2130827a370a3721ca59331bfe2341696e909e8f;p=live-boot-grml.git

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
--- 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
 
-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
-@@ -40,7 +40,10 @@ else
+@@ -40,7 +40,10 @@
  	udevinfo='udevinfo'
  fi
  
@@ -16,11 +14,9 @@ index 416d6b4..74517e8 100755
  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
-@@ -1553,6 +1553,32 @@ activate_custom_mounts ()
+@@ -1582,6 +1582,32 @@
  	echo ${used_devices}
  }
  
@@ -53,11 +49,9 @@ index 5c5341c..addc82a 100755
  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
-@@ -210,7 +210,7 @@ setup_unionfs ()
+@@ -210,7 +210,7 @@
  
  		if is_in_comma_sep_list overlay ${PERSISTENCE_METHOD}
  		then
@@ -66,7 +60,7 @@ index c6de171..4a080bc 100755
  		fi
  
  		local overlay_devices
-@@ -222,10 +222,27 @@ setup_unionfs ()
+@@ -222,10 +222,27 @@
  				media="$(echo ${media} | tr ":" " ")"
  
  				case ${media} in