Automatically refresh patches that need it
[live-boot-grml.git] / debian / patches / 19_revert_toram_bootoption_to_expected_behaviour.patch
old mode 100755 (executable)
new mode 100644 (file)
index 9c53cd6..2f78fb2
 @DPATCH@
 
 index d79beed..1b6926e 100755
---- a/scripts/live
-+++ b/scripts/live
-@@ -484,7 +484,7 @@ copy_live_to ()
+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 @@
  
        if [ -z "${MODULETORAM}" ]
        then
@@ -38,10 +40,7 @@ index d79beed..1b6926e 100755
        else
                MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
  
-index d79beed..57d1b41 100755
---- a/scripts/live
-+++ b/scripts/live
-@@ -553,8 +553,7 @@ copy_live_to ()
+@@ -695,8 +695,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