projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not "exit" if boot option nonetworking is set but "return" instead
[live-boot-grml.git]
/
debian
/
patches
/
15_networking_grml.patch
diff --git
a/debian/patches/15_networking_grml.patch
b/debian/patches/15_networking_grml.patch
index
bb36204
..
f8aef45
100644
(file)
--- a/
debian/patches/15_networking_grml.patch
+++ b/
debian/patches/15_networking_grml.patch
@@
-10,32
+10,16
@@
diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_grml
--- /dev/null
diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_grml
--- /dev/null
-+++ b/scripts/
live-bottom/23networking_grml
-@@ -0,0 +1,
107
@@
++++ b/scripts/
boot/9990-grml-networking.sh
+@@ -0,0 +1,
93
@@
+#!/bin/sh
+
+#set -e
+
+#!/bin/sh
+
+#set -e
+
-+# initramfs-tools header
-+
-+PREREQ=""
-+
-+prereqs()
-+{
-+ echo "${PREREQ}"
-+}
-+
-+case "${1}" in
-+ prereqs)
-+ prereqs
-+ exit 0
-+ ;;
-+esac
-+
-+. /scripts/live-functions
++Grml_Networking () {
+
+if [ -n "${NONETWORKING}" ]; then
+
+if [ -n "${NONETWORKING}" ]; then
-+
exit
0
++
return
0
+fi
+
+modprobe af_packet # req'd for DHCP
+fi
+
+modprobe af_packet # req'd for DHCP
@@
-79,7
+63,7
@@
diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_
+
+ # NODHCP or a previously run ipconfig mean that ifupdown should never
+ # touch this interface (IP-stack wise).
+
+ # NODHCP or a previously run ipconfig mean that ifupdown should never
+ # touch this interface (IP-stack wise).
-+ netconfig=/
tmp
/net-${interface}.conf
++ netconfig=/
run
/net-${interface}.conf
+ if [ -n "$NODHCP" ] || [ -e "${netconfig}" ]; then
+ method="manual"
+ fi
+ if [ -n "$NODHCP" ] || [ -e "${netconfig}" ]; then
+ method="manual"
+ fi
@@
-119,3
+103,16
@@
diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_
+
+ echo>> $IFFILE
+done
+
+ echo>> $IFFILE
+done
++
++}
+--- a/scripts/boot/9990-main.sh
++++ b/scripts/boot/9990-main.sh
+@@ -197,6 +197,8 @@
+
+ Swap
+
++ Grml_Networking
++
+ case "${UNIONFS}" in
+ unionfs-fuse)
+ umount "${rootmnt}/dev"