Merge branch 'sudoman-mods'

diff --git a/class/50-host-classes b/class/50-host-classes
index 29b0b70938ffd33caead461147006234bf3ad971..99359e7fc9e2f2da7a0be09371846d16e24a3e1d 100755 (executable)
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -36,7 +36,7 @@ case $HOSTNAME in
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF"
         ;;
     freetop-x60*)
-       echo "FAIBASE $GRUB DHCPC XORG TRISQUEL WORKSTATION FSF FREETOP"
+       echo "FAIBASE $GRUB NW_MGR XORG TRISQUEL WORKSTATION FSF"
        ;;
     iwikiserver*)
        echo "FAIBASE IKIWIKI SYSADMIN VM"
@@ -48,10 +48,10 @@ case $HOSTNAME in
         echo "FAIBASE KVMGUEST SYSADMIN MYSQLD"
         ;;
     streamstation*)
-        echo "FAIBASE $GRUB DHCPC SYSADMIN STREAM LIBREPLANET"
+        echo "FAIBASE $GRUB SYSADMIN STREAM LIBREPLANET"
         ;;
     freetop*)
-        echo "FAIBASE $GRUB DHCPC SYSADMIN XORG TRISQUEL WORKSTATION LIBREPLANET FREETOP"
+        echo "FAIBASE $GRUB NW_MGR SYSADMIN XORG TRISQUEL WORKSTATION LIBREPLANET"
         ;;
     mwikiserver*)
        echo "FAIBASE MEDIAWIKI SYSADMIN VM"

diff --git a/files/etc/network/interfaces/FREETOP b/files/etc/network/interfaces/FREETOP
deleted file mode 100644 (file)
index 625a3a5..0000000
--- a/files/etc/network/interfaces/FREETOP
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is installed by FAI
-
-# interfaces(5) file used by ifup(8) and ifdown(8)
-auto lo
-iface lo inet loopback
-

diff --git a/scripts/FAIBASE/30-interface b/scripts/FAIBASE/30-interface
index 783867f3adaca523aa7634dfa5220f5475508bef..6668efbd965a0c1b0a01cd4324c4bcdb525b7bb5 100755 (executable)
--- a/scripts/FAIBASE/30-interface
+++ b/scripts/FAIBASE/30-interface
@@ -10,6 +10,13 @@ then
        iface lo inet loopback
        iface eth0 inet dhcp
 EOF
+elif ifclass NW_MGR && [ $FAI_ACTION != "softupdate" ]
+then
+    cat > $target/etc/network/interfaces <<-EOF
+       # generated by FAI
+       auto lo
+       iface lo inet loopback
+EOF
 elif [ $FAI_ACTION != "softupdate" ]
 then
       [ -n "$IPADDR" ] && cat > $target/etc/network/interfaces <<-EOF

diff --git a/scripts/FREETOP/00_install_etc_network_interfaces b/scripts/FREETOP/00_install_etc_network_interfaces
deleted file mode 100755 (executable)
index 7b9b67a..0000000
--- a/scripts/FREETOP/00_install_etc_network_interfaces
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-fcopy -v /etc/network/interfaces
-