From 420ee6f5cfe4c8614901fa3e6b55beefc75ca4bd Mon Sep 17 00:00:00 2001 From: Andrew Engelbrecht Date: Fri, 14 Aug 2015 23:24:13 -0400 Subject: [PATCH] revert freetop changes, unset DHCPC class unsetting the DHCPC class for freetop*, freetop-x60* and streamstation* is the correct way to go about disabling dhcpcd on the eth0 interface. --- class/50-host-classes | 6 +++--- files/etc/network/interfaces/FREETOP | 6 ------ scripts/FREETOP/00_install_etc_network_interfaces | 4 ---- 3 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 files/etc/network/interfaces/FREETOP delete mode 100755 scripts/FREETOP/00_install_etc_network_interfaces diff --git a/class/50-host-classes b/class/50-host-classes index 29b0b70..76b1c56 100755 --- 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 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 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 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/FREETOP/00_install_etc_network_interfaces b/scripts/FREETOP/00_install_etc_network_interfaces deleted file mode 100755 index 7b9b67a..0000000 --- a/scripts/FREETOP/00_install_etc_network_interfaces +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -fcopy -v /etc/network/interfaces - -- 2.25.1