X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FDEBIAN%2F30-interface;h=4b0dcf438850ea0036fc4b790b03edfa33de7d4a;hp=bff686311d72b98a913735734c6ecb52fc49f4e8;hb=490334746631a6c956eee47947f3ab8f8a451666;hpb=7ade5e2c6113530c5f99cfc95880897fcb479f39

diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface
index bff6863..4b0dcf4 100755
--- a/fai/config/scripts/DEBIAN/30-interface
+++ b/fai/config/scripts/DEBIAN/30-interface
@@ -38,9 +38,7 @@ iface_stanza() {
     echo "iface $IFNAME inet $METHOD"
     case "$METHOD" in
       static)
-        echo "    address $IPADDR"
-        echo "    netmask $NETMASK"
-        echo "    broadcast $BROADCAST"
+        echo "    address $CIDR"
         echo "    gateway $GATEWAYS"
         ;;
     esac
@@ -53,11 +51,6 @@ newnicnames() {
 
     [ $do_init_tasks -eq 0 ] && return
     [ -z "$NIC1" ] && return
-    ver=$($ROOTCMD dpkg-query --showformat='${Version}' --show udev)
-    if dpkg --compare-versions $ver lt 220-7; then
-	return
-    fi
-
 
     fields="ID_NET_NAME_FROM_DATABASE ID_NET_NAME_ONBOARD ID_NET_NAME_SLOT ID_NET_NAME_PATH"
     for field in $fields; do
@@ -81,7 +74,7 @@ newnicnames() {
 if [ -z "$NIC1" ]; then
     echo "WARNING: \$NIC1 is not defined. Cannot add ethernet to /etc/network/interfaces."
 fi
-CIDR=$(ip -o -f inet addr show $NIC1 | awk '{print $4}')
+CIDR=$(ip --br ad sh $NIC1|awk '{print $3}')
 newnicnames
 
 case "$FAI_ACTION" in