update our patches on top of Debian's 4.0~alpha19

[live-boot-grml.git] / debian / patches / 19_revert_toram_bootoption_to_expected_behaviour.patch

diff --git a/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch b/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
old mode 100755 (executable)
new mode 100644 (file)
index 9c53cd6..5f3f3ff
--- a/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
+++ b/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
@@ -27,21 +27,9 @@
 @DPATCH@
 
 index d79beed..1b6926e 100755
---- a/scripts/live
-+++ b/scripts/live
-@@ -484,7 +484,7 @@ copy_live_to ()
- 
-       if [ -z "${MODULETORAM}" ]
-       then
--              size=$(fs_size "" ${copyfrom}/${LIVE_MEDIA_PATH} "used")
-+              size=$(fs_size "" ${copyfrom}/ "used")
-       else
-               MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
- 
-index d79beed..57d1b41 100755
---- a/scripts/live
-+++ b/scripts/live
-@@ -553,8 +553,7 @@ copy_live_to ()
+--- a/components/9990-toram-todisk.sh
++++ b/components/9990-toram-todisk.sh
+@@ -86,8 +86,7 @@
                                echo " * Copying whole medium to RAM" 1>/dev/console
                                rsync -a --progress ${copyfrom}/* ${copyto} 1>/dev/console  # "cp -a" from busybox also copies hidden files
                        else