projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust 15_networking_grml.patch + 27_support_static_ip.patch for klibc's ipconfig...
[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
627f709
..
5af0b48
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
@DPATCH@
index d79beed..1b6926e 100755
-Index: b/scripts/live
-===================================================================
---- a/scripts/live 2011-07-24 22:08:09.000000000 +0200
-+++ b/scripts/live 2011-07-24 22:08:10.000000000 +0200
-@@ -563,7 +563,7 @@
+--- a/scripts/live
++++ b/scripts/live
+@@ -202,7 +202,7 @@
if [ -z "${MODULETORAM}" ]
then
if [ -z "${MODULETORAM}" ]
then
@@
-40,7
+38,7
@@
Index: b/scripts/live
else
MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
else
MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
-@@ -
639,8 +639
,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
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