X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F23networking;h=353cda5ddd85e6790a961b41b55bd86b24bb04c1;hb=526a7c2e15a71dbaef918007637973c3b61986fa;hp=988206ecbbaa8e4710588c5cf6e930af7625fb27;hpb=d70b77f919f85511936645abb95d710b80c10c74;p=live-boot-grml.git

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 988206e..353cda5 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -1,25 +1,32 @@
-#! /bin/sh
+#!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Preconfiguring networking..."
-IFFILE="/root/etc/network/interfaces"
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Preconfiguring networking..."
+
+# live-initramfs script
+
+IFFILE="/root/etc/network/interfaces"
 
 if [ "${STATICIP}" = "frommedia" -a -e  "$IFFILE" ] ; then
     # will use existent /etc/network/interfaces
@@ -85,7 +92,7 @@ EOF
         fi
         cat > /root/etc/resolv.conf <<EOF
 # /etc/resolv.conf
-# Autogenerated by casper
+# Autogenerated by live-initramfs
 search ${rc_search}
 domain ${rc_search}
 ${rc_server0}
@@ -95,13 +102,13 @@ EOF
     fi
 fi
 
-for i in eth0 eth1 eth2 ath0 wlan0; do
-    grep -q "iface $i" $IFFILE && continue
-    cat >> "$IFFILE" <<EOF
-auto $i
-iface $i inet dhcp
-
-EOF
-done
+#for i in eth0 eth1 eth2 ath0 wlan0; do
+#    grep -q "iface $i" $IFFILE && continue
+#    cat >> "$IFFILE" <<EOF
+#auto $i
+#iface $i inet dhcp
+#
+#EOF
+#done
 
 log_end_msg