projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master'
[live-boot-grml.git]
/
components
/
9990-netbase.sh
diff --git
a/components/9990-netbase.sh
b/components/9990-netbase.sh
index
bae858a
..
550a2b8
100755
(executable)
--- a/
components/9990-netbase.sh
+++ b/
components/9990-netbase.sh
@@
-45,7
+45,6
@@
EOF
ifaddress="$(echo ${ifline} | cut -f2 -d ':')"
ifnetmask="$(echo ${ifline} | cut -f3 -d ':')"
ifgateway="$(echo ${ifline} | cut -f4 -d ':')"
ifaddress="$(echo ${ifline} | cut -f2 -d ':')"
ifnetmask="$(echo ${ifline} | cut -f3 -d ':')"
ifgateway="$(echo ${ifline} | cut -f4 -d ':')"
- nameserver="$(echo ${ifline} | cut -f5 -d ':')"
cat >> "${IFFILE}" << EOF
allow-hotplug ${ifname}
cat >> "${IFFILE}" << EOF
allow-hotplug ${ifname}
@@
-63,17
+62,6
@@
cat >> "${IFFILE}" << EOF
EOF
fi
EOF
fi
-
- if [ -n "${nameserver}" ]
- then
- if [ -e "${DNSFILE}" ]
- then
- grep -v ^nameserver "${DNSFILE}" > "${DNSFILE}.tmp"
- mv "${DNSFILE}.tmp" "${DNSFILE}"
- fi
-
- echo "nameserver ${nameserver}" >> "${DNSFILE}"
- fi
done
else
if [ -n "${NODHCP}" ]
done
else
if [ -n "${NODHCP}" ]