Merge branch 'master' of openslx:openslx-ng/tm-scripts

3 files changed, 159 insertions, 73 deletions

diff --git a/data/basic.nocopy b/data/basic.nocopy
new file mode 100644
index 00000000..ea8ce588
--- /dev/null
+++ b/data/basic.nocopy
@@ -0,0 +1,23 @@
+/var/run
+/var/log
+/dev
+/proc
+/sys
+/boot
+/export
+/home/vmuser
+/lost+found
+/media
+/mnt
+/opt/openslx
+/run
+/tmp
+/root
+/usr/src
+/lib/modules
+*tm-scripts*
+*~
+*.bak
+*.tmp
+*.pid
+
diff --git a/data/install_server.sh b/data/install_server.sh
new file mode 100755
index 00000000..ca67a6ed
--- /dev/null
+++ b/data/install_server.sh
@@ -0,0 +1,133 @@
+#!/bin/sh
+
+TOOLS="git squashfs-tools rsync lighttpd tftpd"
+
+for tool in $TOOLS; do
+	echo " ###### Installiere $tool ##########"
+	apt-get install -y $tool
+done
+
+# lighttpd konfigurieren
+# konfig: www-root = /srv/openslx/www
+
+# damit es keinen Ärger wg. noch nicht vorhandenem docroot gibt
+echo "Konfiguriere lighttpd ..."
+echo "Stoppe installierten lighttpd ..."
+/etc/init.d/lighttpd stop
+ERR=$?
+if [ "$ERR" -gt 0 ]; then
+	echo "Konnte lighttpd nicht anhalten - Abbruch!"
+	exit 1
+fi
+
+# lighttpd-Konfiguration patchen
+
+echo "Passe lighttpd-Konfiguration an ..."
+cp -p /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
+ERR=$?
+if [ "$ERR" -gt 0 ]; then
+        echo "Konnte alte lighttpd-Konfiguration nicht sichern - Abbruch!"
+        exit 1
+fi
+
+cat /etc/lighttpd/lighttpd.conf|sed 's/\/var\/www/\/srv\/openslx\/www/g'>/etc/lighttpd/lighttpd.conf.tmp
+ERR=$?
+if [ "$ERR" -gt 0 ]; then
+        echo "Konnte lighttpd-Konfiguration nicht patchen - Abbruch!"
+        exit 1
+fi
+
+mv  /etc/lighttpd/lighttpd.conf.tmp  /etc/lighttpd/lighttpd.conf
+ERR=$?
+if [ "$ERR" -gt 0 ]; then
+        echo "Konnte neue lighttpd-Konfiguration nicht speichern - Abbruch!"
+        exit 1
+fi
+
+# neues docroot (/srv/openslx/www) prüfen und ggf. erzeugen - ggf. altes docroot löschen?
+echo "Prüfe docroot für lighttpd (/srv/openslx/www) ..."
+if [ ! -d /srv/openslx/www ] ; then
+	echo "Erzeuge neues docroot für lighttpd (/srv/openslx/www) ..."
+	mkdir -p  /srv/openslx/www
+	ERR=$?
+	if [ "$ERR" -gt 0 ]; then
+        	echo "Konnte kein lighttpd-docroot-Verzeichnis erstellen - Abbruch!"
+	        exit 1
+	fi
+fi
+
+# ... und lighttpd wieder hochziehen:
+echo "Starte installierten lighttpd ..."
+/etc/init.d/lighttpd start
+ERR=$?
+if [ "$ERR" -gt 0 ]; then
+        echo "Konnte lighttpd nicht starten - Abbruch!"
+        exit 1
+fi
+
+# tftpd konfigurieren
+# tftp root = /srv/openslx/tftp
+
+echo "Konfiguriere tftpd ..."
+# neues docroot (/srv/openslx/tftp) prüfen und ggf. erzeugen - ggf. altes docroot löschen?
+echo "Prüfe docroot für tftpd (/srv/openslx/tftp) ..."
+if [ ! -d /srv/openslx/tftp ] ; then
+        echo "Erzeuge neues docroot für tftpf (/srv/openslx/tftp) ..."
+        mkdir -p  /srv/openslx/tftp
+        ERR=$?
+        if [ "$ERR" -gt 0 ]; then
+                echo "Konnte kein tftpd-docroot-Verzeichnis erstellen - Abbruch!"
+                exit 1
+        fi
+fi
+
+echo "Halte xinetd an ..."
+# Erstmal xinetd (kam mit tftpd) anhalten
+/etc/init.d/xinetd stop		# besser wäre zB service xinetd stop, aber wg. Kompatibilität
+ERR=$?
+if [ "$ERR" -gt 0 ]; then
+        echo "Konnte xinetd nicht anhalten - Abbruch!"
+        exit 1
+fi
+
+# tftpd-Konfiguration einschreiben
+cat>/etc/xinetd.d/tftp<<HEREEND		# 
+service tftp
+{
+protocol        = udp
+port            = 69
+socket_type     = dgram
+wait            = yes
+user            = nobody
+server          = /usr/sbin/in.tftpd
+server_args     = /srv/openslx/tftp
+disable         = no
+}
+HEREEND
+
+echo "starte xinetd ..."
+/etc/init.d/xinetd start
+ERR=$?
+if [ "$ERR" -gt 0 ]; then
+        echo "Konnte xinetd nicht starten - Abbruch!"
+        exit 1
+fi
+
+
+echo " ##### Klone das mltk repository ########"
+
+mkdir -p /opt/openslx
+cd /opt/openslx
+
+git clone git://git.openslx.org/openslx-ng/tm-scripts
+
+echo "....Fertig"
+echo "mltk liegt nun im Verzeichnis $(pwd)/tm-scripts"
+echo "Extrahieren und Erstellen der Basissystemdaten:"
+echo "./mltk remote stage31 -b"
+echo "./mltk remote stage32 -b"
+echo "Verpacken der Daten als initramfs:"
+echo "./mltk server local stage31 -e stage31"
+echo "./mltk server local stage32 -e stage32"
+echo "."
+
diff --git a/data/kernel.wanted.config b/data/kernel.wanted.config
index 05eb508a..80367038 100644
--- a/data/kernel.wanted.config
+++ b/data/kernel.wanted.config
@@ -1,3 +1,4 @@
+CONFIG_LOCALVERSION="-openslx"
 CONFIG_8139CP=y
 CONFIG_8139TOO=y
 CONFIG_8139TOO_8129=y
@@ -92,81 +93,8 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_EXYNOS_VIDEO=y
-#CONFIG_FB_3DFX_ACCEL=y
-#CONFIG_FB_3DFX_I2C=y
-#CONFIG_FB_3DFX=y
-#CONFIG_FB_ARC=y
-#CONFIG_FB_ARK=y
-#CONFIG_FB_ASILIANT=y
-#CONFIG_FB_ATY128_BACKLIGHT=y
-#CONFIG_FB_ATY128=y
-#CONFIG_FB_ATY_BACKLIGHT=y
-#CONFIG_FB_ATY_CT=y
-#CONFIG_FB_ATY_GX=y
-#CONFIG_FB_ATY=y
-#CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_BOOT_VESA_SUPPORT=y
-#CONFIG_FB_BROADSHEET=y
-#CONFIG_FB_CARILLO_RANCH=y
-#CONFIG_FB_CARMINE_DRAM_EVAL=y
-#CONFIG_FB_CARMINE=y
-#CONFIG_FB_CIRRUS=y
-#CONFIG_FB_CYBER2000_DDC=y
-#CONFIG_FB_CYBER2000=y
-#CONFIG_FB_DDC=y
-#CONFIG_FB_DEFERRED_IO=y
-#CONFIG_FB_GEODE_GX1=y
-#CONFIG_FB_GEODE_GX=y
-#CONFIG_FB_GEODE_LX=y
-#CONFIG_FB_GEODE=y
-#CONFIG_FB_I740=y
-#CONFIG_FB_IMSTT=y
-#CONFIG_FB_KYRO=y
-#CONFIG_FB_LE80578=y
-#CONFIG_FB_MATROX_G=y
-#CONFIG_FB_MATROX_I2C=y
-#CONFIG_FB_MATROX_MAVEN=y
-#CONFIG_FB_MATROX_MILLENIUM=y
-#CONFIG_FB_MATROX_MYSTIQUE=y
-#CONFIG_FB_MATROX=y
-#CONFIG_FB_MB862XX_I2C=y
-#CONFIG_FB_MB862XX_PCI_GDC=y
-#CONFIG_FB_MB862XX=y
-#CONFIG_FB_METRONOME=y
-#CONFIG_FB_NEOMAGIC=y
-#CONFIG_FB_NVIDIA_BACKLIGHT=y
-#CONFIG_FB_NVIDIA_I2C=y
-#CONFIG_FB_NVIDIA=y
-#CONFIG_FB_PM2_FIFO_DISCONNECT=y
-#CONFIG_FB_PM2=y
-#CONFIG_FB_PM3=y
-#CONFIG_FB_RADEON_BACKLIGHT=y
-#CONFIG_FB_RADEON_I2C=y
-#CONFIG_FB_RADEON=y
-#CONFIG_FB_RIVA_BACKLIGHT=y
-#CONFIG_FB_RIVA_I2C=y
-#CONFIG_FB_RIVA=y
-#CONFIG_FB_S3_DDC=y
-#CONFIG_FB_S3=y
-#CONFIG_FB_SAVAGE_ACCEL=y
-#CONFIG_FB_SAVAGE_I2C=y
-#CONFIG_FB_SAVAGE=y
-#CONFIG_FB_SIS_300=y
-#CONFIG_FB_SIS_315=y
-#CONFIG_FB_SIS=y
-#CONFIG_FB_SMSCUFX=y
-#CONFIG_FB_SVGALIB=y
-#CONFIG_FB_SYS_COPYAREA=y
-#CONFIG_FB_SYS_FILLRECT=y
-#CONFIG_FB_SYS_FOPS=y
-#CONFIG_FB_SYS_IMAGEBLIT=y
-#CONFIG_FB_TRIDENT=y
-#CONFIG_FB_UDL=y
 CONFIG_FB_VESA=y
-#CONFIG_FB_VIA_X_COMPATIBILITY=y
-#CONFIG_FB_VIA=y
-#CONFIG_FB_VOODOO1=y
-#CONFIG_FB_VT8623=y
 CONFIG_FEALNX=y
 CONFIG_FORCEDETH=y
 CONFIG_GENERIC_GPIO=y
@@ -176,6 +104,7 @@ CONFIG_HP100=y
 CONFIG_IGB=y
 CONFIG_IGBVF=y
 CONFIG_IP1000=y
+CONFIG_INPUT_EVBUG=n
 CONFIG_IXGB=y
 CONFIG_IXGBE=y
 CONFIG_IXGBEVF=y
@@ -239,6 +168,7 @@ CONFIG_NET_VENDOR_XIRCOM=y
 CONFIG_NIU=y
 CONFIG_NS83820=y
 CONFIG_OVERLAYFS_FS=y
+CONFIG_PACKET=y
 CONFIG_PARPORT=y
 CONFIG_PCH_GBE=y
 CONFIG_PCMCIA_XIRCOM=y