projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removing pre-wheezy dpkg trigger for update-initramfs.
[live-boot-grml.git]
/
scripts
/
boot
/
netbase.sh
diff --git
a/scripts/boot/netbase.sh
b/scripts/boot/netbase.sh
index
0528817
..
3f5f7af
100755
(executable)
--- a/
scripts/boot/netbase.sh
+++ b/
scripts/boot/netbase.sh
@@
-17,7
+17,7
@@
Netbase ()
IFFILE="/root/etc/network/interfaces"
IFFILE="/root/etc/network/interfaces"
- if [ "${STATICIP}" = "frommedia"
-a -e
"${IFFILE}" ]
+ if [ "${STATICIP}" = "frommedia"
] && [ -e
"${IFFILE}" ]
then
# will use existent /etc/network/interfaces
log_end_msg
then
# will use existent /etc/network/interfaces
log_end_msg
@@
-33,9
+33,9
@@
EOF
udevadm trigger
udevadm settle
udevadm trigger
udevadm settle
- if [ -z "${NETBOOT}"
-a -n "${STATICIP}" -a
"${STATICIP}" != "frommedia" ]
+ if [ -z "${NETBOOT}"
] && [ -n "${STATICIP}" ] && [
"${STATICIP}" != "frommedia" ]
then
then
- parsed=$(echo "${STATICIP}" | sed -e 's
/,/ /
g')
+ parsed=$(echo "${STATICIP}" | sed -e 's
|,| |
g')
for ifline in ${parsed}
do
for ifline in ${parsed}
do