move reverts/restores of old upstream behaviour to an own subdir

[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
deleted file mode 100644 (file)
index 5f3f3ff..0000000
--- a/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 19_revert_toram_bootoption_to_expected_behaviour.dpatch by Michael Prokop <mika@grml.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Revert toram bootoption to expected behaviour.
-## DP:
-## DP: In commit 36bb11382c81d5bce4b69f6d3d618dfd1c38dffb
-## DP: of live-initramfs-grml (when merging Debian's version 1.157.4-1)
-## DP: the behaviour of toram bootoption was modified, see
-## DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=534878
-## DP:
-## DP: On Grml we want to have the option to load the whole medium
-## DP: into RAM to e.g. have additional directories like /deb,
-## DP: /scripts or whatever. This is possible using the toram bootoption
-## DP: without any additional arguments.
-## DP:
-## DP: If you do NOT want to load the whole medium to RAM just
-## DP: boot using toram=grml.squashfs (or whatever it's named,
-## DP: there's a ready-to-use bootoption in Grml's bootsplash
-## DP: menu available) instead.
-## DP:
-## DP: Ammusingly the requested behaviour is available in Debian's
-## DP: live-boot if rsync is not available, so this patch
-## DP: actually just unifies the code paths and reverts the
-## DP: behaviour change back to what the log message says.
-
-@DPATCH@
-
-index d79beed..1b6926e 100755
---- 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
--                              mkdir -p ${copyto}/${LIVE_MEDIA_PATH}
--                              cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/* ${copyto}/${LIVE_MEDIA_PATH}
-+                              cp -a ${copyfrom}/* ${copyto}/
-                               if [ -e ${copyfrom}/${LIVE_MEDIA_PATH}/.disk ]
-                               then
-                                       cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/.disk ${copyto}