Merge branch 'debian': Imported 3.0~b8-1 from Debian Live

[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
index 2f78fb2..892a37e 100644 (file)
--- a/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
+++ b/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
@@ -27,11 +27,9 @@
 @DPATCH@
 
 index d79beed..1b6926e 100755
-Index: live-boot-grml/scripts/live
-===================================================================
---- live-boot-grml.orig/scripts/live   2011-12-06 22:10:34.000000000 +0100
-+++ live-boot-grml/scripts/live        2011-12-06 22:10:34.000000000 +0100
-@@ -619,7 +619,7 @@
+--- a/scripts/boot/9990-toram-todisk.sh
++++ b/scripts/boot/9990-toram-todisk.sh
+@@ -202,7 +202,7 @@
  
        if [ -z "${MODULETORAM}" ]
        then
@@ -40,7 +38,7 @@ Index: live-boot-grml/scripts/live
        else
                MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
  
-@@ -695,8 +695,7 @@
+@@ -278,8 +278,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