projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Releasing debian version 4.0~a7-1.
[live-boot-grml.git]
/
scripts
/
boot
/
9990-networking.sh
diff --git
a/scripts/boot/9990-networking.sh
b/scripts/boot/9990-networking.sh
index
f32ae6c
..
d9607b7
100755
(executable)
--- a/
scripts/boot/9990-networking.sh
+++ b/
scripts/boot/9990-networking.sh
@@
-111,10
+111,6
@@
do_netsetup ()
for interface in ${DEVICE}; do
ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config
for interface in ${DEVICE}; do
ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config
- # squeeze
- [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf
-
- # wheezy
[ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf
if [ "$IPV4ADDR" != "0.0.0.0" ]
[ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf
if [ "$IPV4ADDR" != "0.0.0.0" ]
@@
-129,10
+125,6
@@
do_netsetup ()
# source relevant ipconfig output
OLDHOSTNAME=${HOSTNAME}
# source relevant ipconfig output
OLDHOSTNAME=${HOSTNAME}
- # squeeze
- [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf
-
- # wheezy
[ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf
[ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME}
[ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf
[ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME}