Merge branch 'sudoman-mods'

diff --git a/class/50-host-classes b/class/50-host-classes
index bfc6a80c78f7f69fe31747191beaf5bacbd7ff65..29b0b70938ffd33caead461147006234bf3ad971 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"
+       echo "FAIBASE $GRUB DHCPC XORG TRISQUEL WORKSTATION FSF FREETOP"
        ;;
     iwikiserver*)
        echo "FAIBASE IKIWIKI SYSADMIN VM"
@@ -51,7 +51,7 @@ case $HOSTNAME in
         echo "FAIBASE $GRUB DHCPC SYSADMIN STREAM LIBREPLANET"
         ;;
     freetop*)
-        echo "FAIBASE $GRUB DHCPC SYSADMIN XORG TRISQUEL WORKSTATION LIBREPLANET"
+        echo "FAIBASE $GRUB DHCPC SYSADMIN XORG TRISQUEL WORKSTATION LIBREPLANET FREETOP"
         ;;
     mwikiserver*)
        echo "FAIBASE MEDIAWIKI SYSADMIN VM"

diff --git a/files/etc/network/interfaces/FREETOP b/files/etc/network/interfaces/FREETOP
new file mode 100644 (file)
index 0000000..625a3a5
--- /dev/null
+++ b/files/etc/network/interfaces/FREETOP
@@ -0,0 +1,6 @@
+# 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/package_config/FAIBASE b/package_config/FAIBASE
index ee55b6224c0871d74e0d2887489bae3dd11417cd..9c131ae1e52932e5962aae3e411c11092cbda34f 100644 (file)
--- a/package_config/FAIBASE
+++ b/package_config/FAIBASE
@@ -36,3 +36,4 @@ guile-2.0-dev
 ntpdate
 ca-certificates
 bash-completion
+vim

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