From 51dc72cc32650dec94581d2270f07ee70b426f73 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 3 May 2013 19:13:06 +0200 Subject: drm not builtin anymore (fixes loading problems?), disable evbug --- data/kernel.wanted.config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/kernel.wanted.config b/data/kernel.wanted.config index 05eb508a..f670d50e 100644 --- a/data/kernel.wanted.config +++ b/data/kernel.wanted.config @@ -51,7 +51,7 @@ CONFIG_DE620=y CONFIG_DL2K=y CONFIG_DM9102=y CONFIG_DNET=y -CONFIG_DRM=y +CONFIG_DRM=m CONFIG_DRM_AST=n CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_GMA3600=y @@ -176,6 +176,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 -- cgit v1.2.3-55-g7522 From e749ef2fd50ac70affc2c4b0f435e369ea373841 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 6 May 2013 11:57:50 +0200 Subject: Make DRM builtin, we always need it --- data/kernel.wanted.config | 2 +- remote/rootfs/rootfs-stage31/data/init | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/kernel.wanted.config b/data/kernel.wanted.config index f670d50e..4cfe1db8 100644 --- a/data/kernel.wanted.config +++ b/data/kernel.wanted.config @@ -51,7 +51,7 @@ CONFIG_DE620=y CONFIG_DL2K=y CONFIG_DM9102=y CONFIG_DNET=y -CONFIG_DRM=m +CONFIG_DRM=y CONFIG_DRM_AST=n CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_GMA3600=y diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index e6ac90fc..81b045b5 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -30,7 +30,7 @@ for DRM in /lib/modules/*/kernel/drivers/gpu/drm/*.ko /lib/modules/*/kernel/driv DRM="$(basename "$DRM")" DRM="${DRM%.ko}" echo "Trying to load module $DRM" >> /mnt/modprobing - modprobe "$DRM" > /mnt/modprobing 2>> /mnt/modprobing + modprobe "$DRM" >> /mnt/modprobing 2>> /mnt/modprobing done # read kernel command line for debugging switch @@ -123,6 +123,7 @@ else fi echo "Building aufs..." +mv /mnt/modprobing /dev/shm/uniontmp #mount -t overlayfs -o lowerdir=/rorootfs,upperdir=/dev/shm/uniontmp overlayfs /mnt mount -n -t aufs -o br:/dev/shm/uniontmp:/rorootfs=ro none /mnt mkdir -p /mnt/uniontmp /mnt/tmp -- cgit v1.2.3-55-g7522 From 81a937e2f862d884c9158c1b6b1795868f10e188 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 7 May 2013 14:07:20 +0200 Subject: added '-openslx' suffix to kernel version to distinguish it from regular versions --- data/kernel.wanted.config | 1 + 1 file changed, 1 insertion(+) (limited to 'data') diff --git a/data/kernel.wanted.config b/data/kernel.wanted.config index 4cfe1db8..b202b341 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 -- cgit v1.2.3-55-g7522 From cd959f22456ae2c822b056367c29919edf9ee8bb Mon Sep 17 00:00:00 2001 From: sr Date: Tue, 7 May 2013 16:49:44 +0200 Subject: Add basic script to pull stage 4 data from remote machine --- clone_stage4 | 33 +++++++++++++++++++++++++++++++++ data/basic.nocopy | 23 +++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100755 clone_stage4 create mode 100644 data/basic.nocopy (limited to 'data') diff --git a/clone_stage4 b/clone_stage4 new file mode 100755 index 00000000..f692c9e4 --- /dev/null +++ b/clone_stage4 @@ -0,0 +1,33 @@ +#!/bin/bash + +. "helper/logging.inc" + +MLTK_PID="$$" + +qnd_exit() { + unset_quiet + kill "$MLTK_PID" + [ $# -ge 1 ] && kill "$1" +} + + +[ $# -lt 3 ] && perror "$0 " + +BASEDIR="./server/local_builds/$1" +BOOTDIR="./server/boot/$1" +[ ! -d "$BASEDIR" ] && perror "Unknown Vorlage '$1'" +BASEDIR="$BASEDIR/$2" +[ ! -d "$BASEDIR" ] && perror "Unknown Stage '$2' for Vorlage '$1'" +TARGETDIR="$3" +mkdir -p "$TARGETDIR" +mkdir -p "$BOOTDIR" +[ ! -z "$(ls "$TARGETDIR")" ] && perror "Target dir '$TARGETDIR' not empty" + +pinfo "Building rsync exclude-file for building stage 4...." +cp "data/basic.nocopy" "$BOOTDIR/exclude-stage4" +find "$BASEDIR" -type f | cut -c $[${#BASEDIR} + 1]- >> "$BOOTDIR/exclude-stage4" +pinfo "Done." + +pinfo "Cloning via rsync" +rsync -a --numeric-ids -v --exclude-from="$BOOTDIR/exclude-stage4" -e "ssh -oStrictHostKeyChecking=no" "root@$1:/" "$TARGETDIR" || perror "rsync from 'root@$1:/' to '$TARGETDIR' failed." + 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 + -- cgit v1.2.3-55-g7522 From 5a854694dedb740ca9512f1999bcaa90796f0ae5 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Wed, 8 May 2013 18:46:45 +0200 Subject: add PACKET to kernel config --- data/kernel.wanted.config | 74 +---------------------------------------------- 1 file changed, 1 insertion(+), 73 deletions(-) (limited to 'data') diff --git a/data/kernel.wanted.config b/data/kernel.wanted.config index b202b341..80367038 100644 --- a/data/kernel.wanted.config +++ b/data/kernel.wanted.config @@ -93,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 @@ -241,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 -- cgit v1.2.3-55-g7522 From 7271743d430cf4028a77fd8ead0d20c3a101082b Mon Sep 17 00:00:00 2001 From: sr Date: Fri, 10 May 2013 16:44:31 +0200 Subject: Add Server install script --- data/install_server.sh | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 data/install_server.sh (limited to 'data') diff --git a/data/install_server.sh b/data/install_server.sh new file mode 100755 index 00000000..947f1688 --- /dev/null +++ b/data/install_server.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +TOOLS="git squashfs-tools rsync" # TODO: lighttpd tftpd(?) + +for tool in $TOOLS; do + echo " ###### Installiere $tool ##########" + apt-get install -y $tool +done + +# lighttpd konfigurieren +# konfig: www-root = /srv/openslx/www + +# tftpd konfigurieren +# tftp root = /srv/openslx/tftp + + +echo " ##### Klone das mltk repository ########" + +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 "." + -- cgit v1.2.3-55-g7522 From 9172bf4a705b9ea472593a3d9dbdbc9e8fb365fd Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Mon, 13 May 2013 16:07:22 +0200 Subject: Zusätzlich: Installation und Konfiguration von lighttpd und tftpd --- data/install_server.sh | 105 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 104 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/install_server.sh b/data/install_server.sh index 947f1688..ca67a6ed 100755 --- a/data/install_server.sh +++ b/data/install_server.sh @@ -1,6 +1,6 @@ #!/bin/sh -TOOLS="git squashfs-tools rsync" # TODO: lighttpd tftpd(?) +TOOLS="git squashfs-tools rsync lighttpd tftpd" for tool in $TOOLS; do echo " ###### Installiere $tool ##########" @@ -10,12 +10,115 @@ 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<