From 85bddc0c0199930b9d6a76d21a47d38a0613b32a Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 20 Sep 2013 16:38:28 +0200 Subject: [PATCH] Refresh debian/patches/ --- debian/patches/29_support_dns_in_initramfs.patch | 8 +++----- debian/patches/34_ignore_unknown_filesystems.patch | 2 +- .../patches/42_restore_support_for_old_persistence.patch | 14 ++++---------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/debian/patches/29_support_dns_in_initramfs.patch b/debian/patches/29_support_dns_in_initramfs.patch index 3ac0141..ca3c12a 100644 --- a/debian/patches/29_support_dns_in_initramfs.patch +++ b/debian/patches/29_support_dns_in_initramfs.patch @@ -6,11 +6,9 @@ Date: Fri Mar 25 23:02:38 2011 +0100 Thanks to Ulrich Dangel for discovering this. [Closes: issue848] -Index: live-boot-grml/backends/initramfs-tools/live.hook -=================================================================== ---- live-boot-grml.orig/backends/initramfs-tools/live.hook 2012-12-17 21:01:56.339847815 +0100 -+++ live-boot-grml/backends/initramfs-tools/live.hook 2012-12-17 21:02:16.468142747 +0100 -@@ -227,23 +227,19 @@ +--- a/backends/initramfs-tools/live.hook ++++ b/backends/initramfs-tools/live.hook +@@ -225,23 +225,19 @@ # Some experimental stuff diff --git a/debian/patches/34_ignore_unknown_filesystems.patch b/debian/patches/34_ignore_unknown_filesystems.patch index 786f70a..2e55d7f 100644 --- a/debian/patches/34_ignore_unknown_filesystems.patch +++ b/debian/patches/34_ignore_unknown_filesystems.patch @@ -1,6 +1,6 @@ --- a/scripts/boot/9990-misc-helpers.sh +++ b/scripts/boot/9990-misc-helpers.sh -@@ -491,6 +491,12 @@ +@@ -463,6 +463,12 @@ return 1 fi 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 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 -- 2.1.4