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

diff --git a/class/50-host-classes b/class/50-host-classes
index b8c409020b46a4f5b97f2117abd34a7b86b02c79..9d310955fe725327f7cd3f3ec4edc4ba0277b9a5 100755 (executable)
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -24,9 +24,12 @@ 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)
+        echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF SYSADMIN JAPANESE"
+        nogrub=1 ;;
     freestation*)
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF"
         nogrub=1 ;;
@@ -46,12 +49,10 @@ case $HOSTNAME in
         nogrub=1
         ;;
     streamstation*)
-        echo "FAIBASE DHCPC SYSADMIN STREAM"
-        nogrub=1
+        echo "FAIBASE DHCPC SYSADMIN STREAM LIBREPLANET"
         ;;
     freetop*)
-        echo "FAIBASE DHCPC SYSADMIN XORG TRISQUEL WORKSTATION"
-        nogrub=1
+        echo "FAIBASE DHCPC SYSADMIN XORG TRISQUEL WORKSTATION LIBREPLANET"
         ;;
 
     *)  

diff --git a/disk_config/FAIBASE b/disk_config/FAIBASE
index 141b6deb36c6028107caa036867309a45056538b..68e0a346e4b6bce96b7fabf14046e9716165f197 100644 (file)
--- a/disk_config/FAIBASE
+++ b/disk_config/FAIBASE
@@ -4,7 +4,7 @@
 
 disk_config disk1 disklabel:msdos bootable:1 fstabkey:uuid
 
-primary /      18G        ext3  rw,noatime,errors=remount-ro
+primary /      10G        ext3  rw,noatime,errors=remount-ro
 primary /home  100-100%  ext3  rw,noatime,nosuid,nodev createopts="-L home -m 1" tuneopts="-c 0 -i 0"
 primary swap   2G swap  rw                   
 

diff --git a/files/etc/rc.local/RMS b/files/etc/rc.local/RMS
index 25bb13a791a49c0ed4df6fb9313ae7882a215902..d7ba880c382af87ac65c2be4084d2b3a43e29e25 100755 (executable)
--- a/files/etc/rc.local/RMS
+++ b/files/etc/rc.local/RMS
@@ -14,7 +14,10 @@
 (echo 'keymaps 0-127'
 echo 'keycode 58 = Control'
 echo 'keycode 29 = Control') | loadkeys -
-
+#insure portmap was not started
+/etc/init.d/portmap stop
 rfkill block all
+macchanger -A eth0
+macchanger -A wlan0
 
 exit 0

diff --git a/package_config/DISKLESS b/package_config/DISKLESS
index f4f0aeffb465070af4d5a29500eaa0f33627e149..e0571db38c7c7a3112c3beb508bd82c4e4d7a1d8 100644 (file)
--- a/package_config/DISKLESS
+++ b/package_config/DISKLESS
@@ -4,3 +4,5 @@ pwgen
 vlc
 gnupg-agent
 filezilla
+texlive-full
+gnuhtml2latex
\ No newline at end of file

diff --git a/package_config/FAIBASE b/package_config/FAIBASE
index f7819df9e0bd346bbee56a63fdd7e3c14a3661e8..28973d86f71dbc7cc8d6c31bd7dbc9575bd204f6 100644 (file)
--- a/package_config/FAIBASE
+++ b/package_config/FAIBASE
@@ -35,3 +35,4 @@ make
 guile-2.0-dev
 scribus
 scribus-template
+digikam
\ No newline at end of file

diff --git a/package_config/JAPANESE b/package_config/JAPANESE
new file mode 100644 (file)
index 0000000..e4efbc7
--- /dev/null
+++ b/package_config/JAPANESE
@@ -0,0 +1,12 @@
+PACKAGES aptitude JAPANESE
+manpages-ja
+manpages-ja-dev 
+penoffice.org-help-ja
+openoffice.org-l10n-ja 
+abrowser-locale-ja
+doc-linux-ja-text 
+doc-linux-ja-html
+jfbterm 
+fonts-ipafont 
+fonts-vlgothic 
+

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

diff --git a/package_config/SYSADMIN b/package_config/SYSADMIN
index d1b08e269ea9c282eb7af442b44878607e644566..2dd0e65c28ce4fbba354814f062c784a2eda452d 100644 (file)
--- a/package_config/SYSADMIN
+++ b/package_config/SYSADMIN
@@ -1,4 +1,4 @@
 PACKAGES aptitude SYSADMIN
 emacs23-nox
 screen
-curl
\ No newline at end of file
+curl

diff --git a/scripts/LIBREPLANET/00_adduser.sh b/scripts/LIBREPLANET/00_adduser.sh
new file mode 100755 (executable)
index 0000000..6133284
--- /dev/null
+++ b/scripts/LIBREPLANET/00_adduser.sh
@@ -0,0 +1,7 @@
+#!/bin/bash 
+# add a demo user account
+if ! $ROOTCMD getent passwd libreplanet ; then
+    $ROOTCMD adduser --gecos "LibrePlanet Conference User" libreplanet
+#    echo "demo:$ROOTPW" | $ROOTCMD chpasswd --encrypted
+    $ROOTCMD usermod -p "$ROOTPW" libreplanet
+fi