projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'debian'
[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
892a37e
..
b2fe5ef
100644
(file)
--- a/
debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
+++ b/
debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
@@
-29,7
+29,7
@@
index d79beed..1b6926e 100755
--- a/scripts/boot/9990-toram-todisk.sh
+++ b/scripts/boot/9990-toram-todisk.sh
index d79beed..1b6926e 100755
--- a/scripts/boot/9990-toram-todisk.sh
+++ b/scripts/boot/9990-toram-todisk.sh
-@@ -
202,7 +202
,7 @@
+@@ -
10,7 +10
,7 @@
if [ -z "${MODULETORAM}" ]
then
if [ -z "${MODULETORAM}" ]
then
@@
-38,7
+38,7
@@
index d79beed..1b6926e 100755
else
MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
else
MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
-@@ -
278,8 +278
,7 @@
+@@ -
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
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