projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support overriding "nodhcp" boot option via "dhcp"
[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
..
5af0b48
--- 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/live
+++ b/scripts/live
index d79beed..1b6926e 100755
--- a/scripts/live
+++ b/scripts/live
-@@ -
484,7 +484,7 @@ copy_live_to ()
+@@ -
202,7 +202,7 @@
if [ -z "${MODULETORAM}" ]
then
if [ -z "${MODULETORAM}" ]
then
@@
-38,10
+38,7
@@
index d79beed..1b6926e 100755
else
MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
else
MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
-index d79beed..57d1b41 100755
---- a/scripts/live
-+++ b/scripts/live
-@@ -553,8 +553,7 @@ copy_live_to ()
+@@ -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
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