Merge branch 'master' of vcs.fsf.org:fai-configs

diff --git a/class/50-host-classes b/class/50-host-classes
index f149d5f819b8242e8f3f757c056f79ff57a7fdc3..b742c5d9ce23b74a6ec4571ebaf7a47934f6fb93 100755 (executable)
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -24,7 +24,7 @@ case $HOSTNAME in
     diskstation*)
        echo "FAIBASE DISKLESS DISKTOOLS SYSADMIN FSF"
         nogrub=1 ;;
-    freestation04)
+    freestation7)
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF SYSADMIN MV"
         nogrub=1 ;;
     freestation06)

diff --git a/package_config/MV b/package_config/MV
index d77fdb371acc8f1f6800e0ccbe3609db5d4a3882..30219e03e7adcd5cef3e3cd706a2a4ada5d324b4 100644 (file)
--- a/package_config/MV
+++ b/package_config/MV
@@ -1,15 +1,8 @@
 PACKAGES aptitude MV
-openbox
-obmenu
-obconf
-wicd-gtk
-openbox-themes
 bind9
 gmrun
 tint2
-xfce4-screenshooter
 conky
 clipit
-guake
 nitrogen
-emacs-goodies-el
\ No newline at end of file
+emacs-goodies-el