From 06bfa233ff9d7df385e923e7ad066ed4fe0ba149 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 25 Mar 2014 15:41:21 +0100
Subject: [rootfs] forgot to rename rootfs-modules

---
 remote/rootfs/rootfs-stage31/module.build          |  74 ++++++
 remote/rootfs/rootfs-stage31/module.conf           |  79 +++++++
 remote/rootfs/rootfs-stage31/rootfs-stage31.build  |  74 ------
 remote/rootfs/rootfs-stage31/rootfs-stage31.conf   |  79 -------
 remote/rootfs/rootfs-stage32/module.build          | 140 ++++++++++++
 remote/rootfs/rootfs-stage32/module.conf           | 249 +++++++++++++++++++++
 remote/rootfs/rootfs-stage32/module.conf.debian    |  14 ++
 remote/rootfs/rootfs-stage32/module.conf.opensuse  |  22 ++
 .../rootfs-stage32/module.conf.opensuse.13.1       |  20 ++
 remote/rootfs/rootfs-stage32/module.conf.ubuntu    |  15 ++
 remote/rootfs/rootfs-stage32/rootfs-stage32.build  | 140 ------------
 remote/rootfs/rootfs-stage32/rootfs-stage32.conf   | 249 ---------------------
 .../rootfs-stage32/rootfs-stage32.conf.debian      |  14 --
 .../rootfs-stage32/rootfs-stage32.conf.opensuse    |  22 --
 .../rootfs-stage32.conf.opensuse.13.1              |  20 --
 .../rootfs-stage32/rootfs-stage32.conf.ubuntu      |  15 --
 16 files changed, 613 insertions(+), 613 deletions(-)
 create mode 100644 remote/rootfs/rootfs-stage31/module.build
 create mode 100644 remote/rootfs/rootfs-stage31/module.conf
 delete mode 100644 remote/rootfs/rootfs-stage31/rootfs-stage31.build
 delete mode 100644 remote/rootfs/rootfs-stage31/rootfs-stage31.conf
 create mode 100644 remote/rootfs/rootfs-stage32/module.build
 create mode 100644 remote/rootfs/rootfs-stage32/module.conf
 create mode 100644 remote/rootfs/rootfs-stage32/module.conf.debian
 create mode 100644 remote/rootfs/rootfs-stage32/module.conf.opensuse
 create mode 100644 remote/rootfs/rootfs-stage32/module.conf.opensuse.13.1
 create mode 100644 remote/rootfs/rootfs-stage32/module.conf.ubuntu
 delete mode 100644 remote/rootfs/rootfs-stage32/rootfs-stage32.build
 delete mode 100644 remote/rootfs/rootfs-stage32/rootfs-stage32.conf
 delete mode 100644 remote/rootfs/rootfs-stage32/rootfs-stage32.conf.debian
 delete mode 100644 remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse
 delete mode 100644 remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse.13.1
 delete mode 100644 remote/rootfs/rootfs-stage32/rootfs-stage32.conf.ubuntu

(limited to 'remote/rootfs')

diff --git a/remote/rootfs/rootfs-stage31/module.build b/remote/rootfs/rootfs-stage31/module.build
new file mode 100644
index 00000000..34d954f4
--- /dev/null
+++ b/remote/rootfs/rootfs-stage31/module.build
@@ -0,0 +1,74 @@
+#!/bin/bash
+fetch_source() {
+	:
+}
+
+build() {
+	local COPYLIST BIN_LOCATION DRM_MODULES FILE BIN MODNAME PCI_FILE ALIAS VENDOR DEVICE
+	COPYLIST="list_binaries_and_files"
+	[ -e "$COPYLIST" ] && rm -f "$COPYLIST"
+	for BIN in $REQUIRED_BINARIES; do
+		BIN_LOCATION=$(which "$BIN")
+		[ -z "$BIN_LOCATION" ] && perror "Cannot find $BIN"
+		get_link_chain "$BIN_LOCATION" >> "$COPYLIST"
+	done
+
+	mkdir -p "$MODULE_BUILD_DIR/lib"
+	find /lib /lib64 /usr/lib /usr/lib64 \( -name "libnss_dns*" -o -name "libresolv*" \) -exec cp -a {} "$MODULE_BUILD_DIR/lib/" \;
+
+	tarcopy "$(cat "$COPYLIST" | sort -u)" "$MODULE_BUILD_DIR"
+
+	# generate drm module loading database
+	pinfo "Generating PCI ID database for DRM drivers"
+	DRM_MODULES="$KERNEL_BASE_DIR/lib/modules/$SYS_UTS_RELEASE/kernel/drivers/gpu/drm"
+	PCI_FILE="$MODULE_BUILD_DIR/drm.cfg"
+	[ -d "$DRM_MODULES" ] || perror "DRM dir not found at $DRM_MODULES"
+	cp "$MODULE_DIR/templates/drm.cfg" "$PCI_FILE" || perror "Could not copy drm.cfg from templates dir"
+	echo "# -- generated from kernel $SYS_UTS_RELEASE modules:" >> "$PCI_FILE"
+	for FILE in $(find "$DRM_MODULES" -name "*.ko"); do
+		MODNAME=$(basename "$FILE")
+		MODNAME=${MODNAME%.ko}
+		[ -z "$MODNAME" ] && perror "$FILE equals empty modname"
+		echo "# $MODNAME" >> "$PCI_FILE"
+		for ALIAS in $(modinfo "$FILE" | grep '^alias:' | grep -o 'pci:v.*' | tr '[A-F]' '[a-f]'); do
+			VENDOR=$(echo $ALIAS | cut -c 10-13)
+			if [ "x$(echo $ALIAS | cut -c 15)" == "x*" ]; then
+				# device wildcard
+				grep -q -i "^${VENDOR}\s" "$PCI_FILE" && continue
+				echo "${VENDOR} $MODNAME" >> "$PCI_FILE"
+			else
+				# specific device
+				DEVICE=$(echo $ALIAS | cut -c 19-22)
+				grep -q -i "^${VENDOR}:${DEVICE}\s" "$PCI_FILE" && continue
+				echo "${VENDOR}:${DEVICE} $MODNAME" >> "$PCI_FILE"
+			fi
+		done
+	done
+}
+
+post_copy() {
+	pinfo "Generating rootfs for Stage 3.1 ..."
+	generate_rootfs
+
+	# copy kernel, modules and firmware
+	copy_kernel_modules
+	copy_firmware
+	#copy_kernel
+}
+
+#
+# helper functions to generate the base rootfs
+#
+generate_rootfs() {
+	# create basic directory structure
+	mkdir -p "${TARGET_BUILD_DIR}"/{bin,dev,proc,run,etc,mnt,sys} \
+		|| perror "Cannot create basic directory structure in '${TARGET_BUILD_DIR}'"
+
+	# copy device files from running system
+	cp -a /dev/{console,kmsg,mem,null,tty,tty0,tty1,tty9,urandom,zero} \
+		"${TARGET_BUILD_DIR}"/dev || perror "Cannot copy devices from running system"
+
+	# copy libc and ld-linux
+	tarcopy "$(list_basic_libs)" "${TARGET_BUILD_DIR}"
+}
+
diff --git a/remote/rootfs/rootfs-stage31/module.conf b/remote/rootfs/rootfs-stage31/module.conf
new file mode 100644
index 00000000..4b638678
--- /dev/null
+++ b/remote/rootfs/rootfs-stage31/module.conf
@@ -0,0 +1,79 @@
+REQUIRED_MODULES="
+	busybox
+	kernel
+"
+REQUIRED_KERNEL_MODULES="
+				kernel/drivers/video/sis/sisfb.ko
+				kernel/drivers/video/via/viafb.ko
+				kernel/drivers/acpi/video.ko
+				kernel/drivers/ssb/ssb.ko
+				kernel/drivers/acpi/button.ko
+				kernel/drivers/gpu/drm/drm*.ko
+				kernel/drivers/gpu/drm/*/*.ko
+				kernel/drivers/hid/hid-generic.ko
+				kernel/drivers/i2c/algos/i2c-algo-bit.ko
+				kernel/drivers/i2c/i2c-core.ko
+				kernel/drivers/usb/usb-common.ko
+				kernel/drivers/usb/core/usbcore.ko
+				kernel/drivers/net/netconsole.ko
+				kernel/drivers/net/ethernet/realtek/8139too.ko
+				kernel/drivers/net/ethernet/realtek/r8169.ko
+				kernel/drivers/net/ethernet/nvidia/forcedeth.ko
+				kernel/drivers/net/ethernet/via/via-rhine.ko
+				kernel/drivers/net/ethernet/amd/pcnet32.ko
+				kernel/drivers/net/ethernet/atheros/atl1e/atl1e.ko
+				kernel/drivers/net/ethernet/atheros/atl1c/atl1c.ko
+				kernel/drivers/net/ethernet/sis/sis900.ko
+				kernel/drivers/net/ethernet/broadcom/tg3.ko
+				kernel/drivers/net/ethernet/broadcom/b44.ko
+				kernel/drivers/net/ethernet/intel/e1000/e1000.ko
+				kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko
+				kernel/drivers/net/ethernet/intel/e100.ko
+				kernel/drivers/net/ethernet/marvell/skge.ko
+				kernel/drivers/net/ethernet/3com/3c59x.ko
+				kernel/drivers/net/ethernet/dec/tulip/tulip.ko
+				kernel/drivers/hid/hid.ko
+				kernel/drivers/hid/usbhid/usbhid.ko
+				kernel/drivers/platform/x86/wmi.ko
+				kernel/drivers/platform/x86/mxm-wmi.ko
+				kernel/fs/configfs/configfs.ko
+				kernel/fs/nfs_common/nfs_acl.ko
+				kernel/fs/nfs/nfs.ko
+				kernel/fs/fscache/fscache.ko
+				kernel/fs/lockd/lockd.ko
+				kernel/fs/squashfs/squashfs.ko
+				kernel/fs/xfs/xfs.ko
+				kernel/net/sunrpc/sunrpc.ko
+				kernel/net/sunrpc/auth_gss/auth_rpcgss.ko
+				kernel/net/802/stp.ko
+				kernel/net/bridge/bridge.ko
+				kernel/ubuntu/aufs/aufs.ko
+				kernel/fs/aufs/aufs.ko
+"
+REQUIRED_FIRMWARE="
+	3com/
+	e100/
+	matrox/
+	r128/
+	radeon/
+	RTL8192E/
+	RTL8192SE/
+	rtl_nic/
+	tigon/
+"
+REQUIRED_BINARIES="
+	grep
+"
+REQUIRED_LIBRARIES="
+	libnss_dns
+	libresolv
+"
+REQUIRED_SYSTEM_FILES="
+	/etc/protocols
+	/etc/services
+	/etc/localtime
+"
+REQUIRED_FILES="
+	/drm.cfg
+"
+
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.build b/remote/rootfs/rootfs-stage31/rootfs-stage31.build
deleted file mode 100644
index 34d954f4..00000000
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.build
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-fetch_source() {
-	:
-}
-
-build() {
-	local COPYLIST BIN_LOCATION DRM_MODULES FILE BIN MODNAME PCI_FILE ALIAS VENDOR DEVICE
-	COPYLIST="list_binaries_and_files"
-	[ -e "$COPYLIST" ] && rm -f "$COPYLIST"
-	for BIN in $REQUIRED_BINARIES; do
-		BIN_LOCATION=$(which "$BIN")
-		[ -z "$BIN_LOCATION" ] && perror "Cannot find $BIN"
-		get_link_chain "$BIN_LOCATION" >> "$COPYLIST"
-	done
-
-	mkdir -p "$MODULE_BUILD_DIR/lib"
-	find /lib /lib64 /usr/lib /usr/lib64 \( -name "libnss_dns*" -o -name "libresolv*" \) -exec cp -a {} "$MODULE_BUILD_DIR/lib/" \;
-
-	tarcopy "$(cat "$COPYLIST" | sort -u)" "$MODULE_BUILD_DIR"
-
-	# generate drm module loading database
-	pinfo "Generating PCI ID database for DRM drivers"
-	DRM_MODULES="$KERNEL_BASE_DIR/lib/modules/$SYS_UTS_RELEASE/kernel/drivers/gpu/drm"
-	PCI_FILE="$MODULE_BUILD_DIR/drm.cfg"
-	[ -d "$DRM_MODULES" ] || perror "DRM dir not found at $DRM_MODULES"
-	cp "$MODULE_DIR/templates/drm.cfg" "$PCI_FILE" || perror "Could not copy drm.cfg from templates dir"
-	echo "# -- generated from kernel $SYS_UTS_RELEASE modules:" >> "$PCI_FILE"
-	for FILE in $(find "$DRM_MODULES" -name "*.ko"); do
-		MODNAME=$(basename "$FILE")
-		MODNAME=${MODNAME%.ko}
-		[ -z "$MODNAME" ] && perror "$FILE equals empty modname"
-		echo "# $MODNAME" >> "$PCI_FILE"
-		for ALIAS in $(modinfo "$FILE" | grep '^alias:' | grep -o 'pci:v.*' | tr '[A-F]' '[a-f]'); do
-			VENDOR=$(echo $ALIAS | cut -c 10-13)
-			if [ "x$(echo $ALIAS | cut -c 15)" == "x*" ]; then
-				# device wildcard
-				grep -q -i "^${VENDOR}\s" "$PCI_FILE" && continue
-				echo "${VENDOR} $MODNAME" >> "$PCI_FILE"
-			else
-				# specific device
-				DEVICE=$(echo $ALIAS | cut -c 19-22)
-				grep -q -i "^${VENDOR}:${DEVICE}\s" "$PCI_FILE" && continue
-				echo "${VENDOR}:${DEVICE} $MODNAME" >> "$PCI_FILE"
-			fi
-		done
-	done
-}
-
-post_copy() {
-	pinfo "Generating rootfs for Stage 3.1 ..."
-	generate_rootfs
-
-	# copy kernel, modules and firmware
-	copy_kernel_modules
-	copy_firmware
-	#copy_kernel
-}
-
-#
-# helper functions to generate the base rootfs
-#
-generate_rootfs() {
-	# create basic directory structure
-	mkdir -p "${TARGET_BUILD_DIR}"/{bin,dev,proc,run,etc,mnt,sys} \
-		|| perror "Cannot create basic directory structure in '${TARGET_BUILD_DIR}'"
-
-	# copy device files from running system
-	cp -a /dev/{console,kmsg,mem,null,tty,tty0,tty1,tty9,urandom,zero} \
-		"${TARGET_BUILD_DIR}"/dev || perror "Cannot copy devices from running system"
-
-	# copy libc and ld-linux
-	tarcopy "$(list_basic_libs)" "${TARGET_BUILD_DIR}"
-}
-
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
deleted file mode 100644
index 4b638678..00000000
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-REQUIRED_MODULES="
-	busybox
-	kernel
-"
-REQUIRED_KERNEL_MODULES="
-				kernel/drivers/video/sis/sisfb.ko
-				kernel/drivers/video/via/viafb.ko
-				kernel/drivers/acpi/video.ko
-				kernel/drivers/ssb/ssb.ko
-				kernel/drivers/acpi/button.ko
-				kernel/drivers/gpu/drm/drm*.ko
-				kernel/drivers/gpu/drm/*/*.ko
-				kernel/drivers/hid/hid-generic.ko
-				kernel/drivers/i2c/algos/i2c-algo-bit.ko
-				kernel/drivers/i2c/i2c-core.ko
-				kernel/drivers/usb/usb-common.ko
-				kernel/drivers/usb/core/usbcore.ko
-				kernel/drivers/net/netconsole.ko
-				kernel/drivers/net/ethernet/realtek/8139too.ko
-				kernel/drivers/net/ethernet/realtek/r8169.ko
-				kernel/drivers/net/ethernet/nvidia/forcedeth.ko
-				kernel/drivers/net/ethernet/via/via-rhine.ko
-				kernel/drivers/net/ethernet/amd/pcnet32.ko
-				kernel/drivers/net/ethernet/atheros/atl1e/atl1e.ko
-				kernel/drivers/net/ethernet/atheros/atl1c/atl1c.ko
-				kernel/drivers/net/ethernet/sis/sis900.ko
-				kernel/drivers/net/ethernet/broadcom/tg3.ko
-				kernel/drivers/net/ethernet/broadcom/b44.ko
-				kernel/drivers/net/ethernet/intel/e1000/e1000.ko
-				kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko
-				kernel/drivers/net/ethernet/intel/e100.ko
-				kernel/drivers/net/ethernet/marvell/skge.ko
-				kernel/drivers/net/ethernet/3com/3c59x.ko
-				kernel/drivers/net/ethernet/dec/tulip/tulip.ko
-				kernel/drivers/hid/hid.ko
-				kernel/drivers/hid/usbhid/usbhid.ko
-				kernel/drivers/platform/x86/wmi.ko
-				kernel/drivers/platform/x86/mxm-wmi.ko
-				kernel/fs/configfs/configfs.ko
-				kernel/fs/nfs_common/nfs_acl.ko
-				kernel/fs/nfs/nfs.ko
-				kernel/fs/fscache/fscache.ko
-				kernel/fs/lockd/lockd.ko
-				kernel/fs/squashfs/squashfs.ko
-				kernel/fs/xfs/xfs.ko
-				kernel/net/sunrpc/sunrpc.ko
-				kernel/net/sunrpc/auth_gss/auth_rpcgss.ko
-				kernel/net/802/stp.ko
-				kernel/net/bridge/bridge.ko
-				kernel/ubuntu/aufs/aufs.ko
-				kernel/fs/aufs/aufs.ko
-"
-REQUIRED_FIRMWARE="
-	3com/
-	e100/
-	matrox/
-	r128/
-	radeon/
-	RTL8192E/
-	RTL8192SE/
-	rtl_nic/
-	tigon/
-"
-REQUIRED_BINARIES="
-	grep
-"
-REQUIRED_LIBRARIES="
-	libnss_dns
-	libresolv
-"
-REQUIRED_SYSTEM_FILES="
-	/etc/protocols
-	/etc/services
-	/etc/localtime
-"
-REQUIRED_FILES="
-	/drm.cfg
-"
-
diff --git a/remote/rootfs/rootfs-stage32/module.build b/remote/rootfs/rootfs-stage32/module.build
new file mode 100644
index 00000000..b12ca0a7
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/module.build
@@ -0,0 +1,140 @@
+#!/bin/bash
+fetch_source() {
+	:
+}
+
+build() {
+	if [ ! -z "$REQUIRED_CONTENT_PACKAGES" ]; then
+		COPYLIST="list_dpkg_output"
+		[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
+		list_packet_files >> "${COPYLIST}"
+		tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
+	fi
+
+	FILELIST="list_binaries_and_files"
+	[ -e "${FILELIST}" ] && rm "${FILELIST}"
+
+	# Compile rdns
+	mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin"
+	gcc -o "$MODULE_BUILD_DIR/opt/openslx/bin/rdns" "$MODULE_DIR/rdns.c" || perror "Compiling rdns failed."
+
+	pinfo "Searching binaries from config file in system..."
+	for BIN in ${REQUIRED_BINARIES}
+	do
+		[ -n "$(find "$MODULE_BUILD_DIR" -name "$BIN")" ] && continue
+		BIN_LOCATION="$(which "$BIN")"
+		if [ ! -z "$BIN_LOCATION" -a -e "$BIN_LOCATION" ]; then
+			get_link_chain "$BIN_LOCATION" >> "$FILELIST"
+		else
+			perror "${BIN} not found on the system! Please install it."
+		fi
+	done
+
+	pinfo "Searching libraries from config file in system... (could take some time)"
+	for LIB in ${REQUIRED_LIBRARIES}
+	do
+		# lib + lib64: Ugly hack, will be replaced by a better solution 
+		for LIB_LOCATION in $(find /lib/ /lib64/ -name "${LIB}.so*")
+		do
+			get_link_chain "${LIB_LOCATION}" >> "${FILELIST}"
+		done
+	done
+	
+	for FILE in ${REQUIRED_DIRECTORIES}
+	do
+		[ ! -d ${FILE} ] && perror "Missing required directory $FILE"
+		echo ${FILE} >> "${FILELIST}"
+	done
+	for FILE in ${REQUIRED_FILES}
+	do
+		[ ! -f ${FILE} ] && perror "Missing required file $FILE"
+		echo ${FILE} >> "${FILELIST}"
+	done
+
+	local NUMFILES=$(cat "${FILELIST}" | wc -l)
+	if [ "x$NUMFILES" != "x" -a "x$NUMFILES" != "x0" ]; then
+		pinfo "File list generated at ${MODULE_BUILD_DIR}/${FILELIST} ($NUMFILES entries)"
+		pinfo "If something fails here, try to clean this module first."
+		tarcopy "$(cat "${FILELIST}")" "${MODULE_BUILD_DIR}"
+	fi
+}
+
+post_copy() {
+	# symlink for more
+	if [ ! -e "$TARGET_BUILD_DIR/bin/more" ]; then
+		[ -e "$TARGET_BUILD_DIR/bin/less" ] && ln -s /bin/less "$TARGET_BUILD_DIR/bin/more"
+		[ -e "$TARGET_BUILD_DIR/usr/bin/less" ] && ln -s /usr/bin/less "$TARGET_BUILD_DIR/bin/more"
+	fi
+	# same hack for mount
+	[ ! -e "$TARGET_BUILD_DIR/bin/mount" ] && ln -s /usr/bin/mount "$TARGET_BUILD_DIR/bin/mount"
+	
+	# make basic directory structure
+	mkdir -p "$TARGET_BUILD_DIR"/{bin,dev,proc,lib,etc,mnt,run,sys,var,opt/openslx/mnt}
+	ln -s -n -f -t "$TARGET_BUILD_DIR/var" "../run/lock" "../run"
+
+	# copy devices from running system
+	cp -a /dev/{console,kmsg,mem,null,shm,tty,tty0,tty1,tty9,urandom,zero} \
+		"${TARGET_BUILD_DIR}"/dev || perror "Copying devices from running system failed."
+
+	# set /etc/environment to include /opt/openslx/bin and /opt/openslx/sbin
+	#add_env PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin"
+	add_env PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
+	# set terminal to linux as it defaults to xterm which messes up ssh sessions
+	add_env TERM "linux"
+
+	# copy static files
+	cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}" || perror "Copying static files from data/* failed."
+
+	# quick fix for /etc/fstab
+	echo "# no configuration" >> "${TARGET_BUILD_DIR}/etc/fstab"
+
+	# link /etc/mtab, needed for systemd
+	[ ! -e "${TARGET_BUILD_DIR}/etc/mtab" ] && ln -s "/proc/self/mounts" "${TARGET_BUILD_DIR}/etc/mtab"
+
+	# passwd, group, shadow
+	init_users_and_groups
+
+	# quick fix for missing group in /etc/group
+	add_group "lock"
+
+	# setup root accoun
+	USER=root add_user
+	DEMO_ID="$(USER=demo PASSWORD=demo USERHOME=/home/demo USERSHELL=/bin/bash add_user)"
+
+	mkdir -p "${TARGET_BUILD_DIR}/root"
+	mkdir -p "${TARGET_BUILD_DIR}/home/demo"
+	chown "$DEMO_ID:$DEMO_ID" "${TARGET_BUILD_DIR}/home/demo"
+	sed -i -r 's/^blacklist.*pcspkr/#&/g' "$TARGET_BUILD_DIR/etc/modprobe.d/blacklist.conf"
+
+	echo "minilinux-$(hostname)" > "${TARGET_BUILD_DIR}/etc/hostname"
+
+
+	# copy kernel, modules and firmware
+	copy_kernel_modules
+	copy_firmware
+	#copy_kernel
+
+	# Try to fetch distro logo
+	if [ ! -s "$TARGET_BUILD_DIR/etc/distro.png" ]; then
+		local DIST=$(lsb_release -si)
+		if [ -n "$DIST" ]; then
+			[ -z "$CFG_DISTLOGO_URL" ] && CFG_DISTLOGO_URL='http://mltk-services.ruf.uni-freiburg.de/distro_logo.php?distro='
+			wget -O "$TARGET_BUILD_DIR/etc/distro.png" "${CFG_DISTLOGO_URL}${DIST}"
+			if [ ! -s "$TARGET_BUILD_DIR/etc/distro.png" ]; then
+				rm -f "$TARGET_BUILD_DIR/etc/distro.png"
+				pwarning "Could not download distro-logo"
+			fi
+		else
+			pwarning "Could not determine distribution"
+		fi
+	fi
+	# Create issue.template
+	local DIST=$(lsb_release -sd)
+	local GITC=$(git rev-parse --short HEAD)
+	local DATE=$(date "+%Y-%m-%d")
+	local VERSION=$(echo "bwLehrpool/$DIST   $DATE/$GITC" | escape_replace)
+	mkdir -p "$TARGET_BUILD_DIR/opt/openslx/etc"
+	sed "s/%version%/$VERSION/g" "$MODULE_DIR/templates/issue.template" > "$TARGET_BUILD_DIR/opt/openslx/etc/issue.template" || perror "Could not create issue template"
+
+}
+
diff --git a/remote/rootfs/rootfs-stage32/module.conf b/remote/rootfs/rootfs-stage32/module.conf
new file mode 100644
index 00000000..34d3507a
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/module.conf
@@ -0,0 +1,249 @@
+REQUIRED_MODULES="
+	kernel
+"
+REQUIRED_BINARIES="
+	bash
+	dmesg
+	curl
+	less
+	agetty
+	loadkeys
+	setfont
+	login
+	sulogin
+	mount
+	umount
+	mount.nfs4
+	umount.nfs4
+	mkfs.xfs
+	mkfs.ext3
+	mkfs.ext4
+	mkfs.jfs
+	blkid
+	modprobe
+	ps
+	scp
+	ssh
+	tput
+	xterm
+	bc
+	dirname
+	mkdosfs
+	iptables
+	ntpdate
+	rdns
+	find
+	rpcbind
+	rpc.statd
+	pkill
+	getent
+"
+REQUIRED_LIBRARIES="
+	libcap
+	libcidn
+	libcom_err
+	libcrypt
+	libcrypto
+	libnsl
+	libnss_compat
+	libnss_dns
+	libnss_files
+	libnss_hesiod
+	libnss_nis
+	libnss_nisplus
+	libnss_mdns
+	libpam
+	libutil
+	libtinfo
+	libresolv
+"
+REQUIRED_FILES="
+	/etc/inputrc
+	/etc/localtime
+	/etc/login.defs
+	/etc/securetty
+	/etc/protocols
+	/etc/services
+	/etc/networks
+	/etc/netconfig
+	/etc/fonts/fonts.conf
+"
+REQUIRED_KERNEL_MODULES="
+	kernel/drivers/cpufreq
+	kernel/drivers/memstick
+	kernel/drivers/mfd
+	kernel/drivers/gpio
+	kernel/drivers/block
+	kernel/drivers/uwb
+	kernel/drivers/w1
+	kernel/drivers/regulator
+	kernel/drivers/leds
+	kernel/drivers/firmware
+	kernel/drivers/watchdog
+	kernel/drivers/media/rc
+	kernel/drivers/media/video
+	kernel/drivers/media/common
+	kernel/drivers/mmc
+	kernel/drivers/staging
+	kernel/drivers/firewire
+	kernel/drivers/bluetooth
+	kernel/drivers/power
+	kernel/drivers/video
+	kernel/drivers/uio
+	kernel/drivers/md
+	kernel/drivers/virtio
+	kernel/drivers/pci
+	kernel/drivers/acpi
+	kernel/drivers/input
+	kernel/drivers/ssb
+	kernel/drivers/spi
+	kernel/drivers/crypto
+	kernel/drivers/bcma
+	kernel/drivers/nfc
+	kernel/drivers/usb
+	kernel/drivers/char
+	kernel/drivers/vhost
+	kernel/drivers/i2c
+	kernel/drivers/ata
+	kernel/drivers/tty
+	kernel/drivers/parport
+	kernel/drivers/misc
+	kernel/drivers/scsi
+	kernel/drivers/auxdisplay
+	kernel/drivers/target
+	kernel/drivers/dca
+	kernel/drivers/dma
+	kernel/drivers/rtc
+	kernel/drivers/pps
+	kernel/drivers/hid
+	kernel/drivers/atm
+	kernel/drivers/platform
+	kernel/drivers/edac
+	kernel/drivers/hv
+	kernel/drivers/idle
+	kernel/drivers/xen
+	kernel/ubuntu/aufs
+	kernel/arch
+	kernel/lib
+	kernel/fs
+	kernel/crypto
+	kernel/net
+	kernel/sound
+	kernel/fs/autofs4/autofs4
+	kernel/drivers/net/macvtap.ko
+	kernel/drivers/net/veth.ko
+"
+REQUIRED_FIRMWARE="
+	3com
+	acenic
+	adaptec
+	advansys
+	ar3k
+	asihpi
+	av7110
+	bnx2
+	bnx2x
+	brcm
+	cis
+	cpia2
+	cxgb3
+	cxgb4
+	dabusb
+	dsp56k
+	e100
+	ea
+	edgeport
+	emi26
+	emi62
+	ene-ub6250
+	ess
+	hp
+	isci
+	kaweth
+	keyspan
+	keyspan_pda
+	korg
+	libertas
+	matrox
+	mrvl
+	mwl8k
+	ositech
+	r128
+	radeon
+	RTL8192E
+	RTL8192SE
+	rtl_nic
+	sb16
+	scripts
+	slicoss
+	sun
+	sxg
+	tehuti
+	ti-connectivity
+	tigon
+	ttusb-budget
+	ueagle-atm
+	usbdux
+	vicam
+	vxge
+	yam
+	yamaha
+	agere_ap_fw.bin
+	agere_sta_fw.bin
+	aic94xx-seq.fw
+	ath3k-1.fw
+	atmel_at76c502_3com.bin
+	atmel_at76c502.bin
+	atmel_at76c502d.bin
+	atmel_at76c502e.bin
+	atmel_at76c504_2958.bin
+	atmel_at76c504a_2958.bin
+	atmel_at76c504.bin
+	atmel_at76c506.bin
+	atmsar11.fw
+	carl9170-1.fw
+	f2255usb.bin
+	GPL-3
+	htc_7010.fw
+	htc_9271.fw
+	i2400m-fw-usb-1.4.sbcf
+	i2400m-fw-usb-1.5.sbcf
+	i6050-fw-usb-1.5.sbcf
+	intelliport2.bin
+	lbtf_usb.bin
+	lgs8g75.fw
+	mts_cdma.fw
+	mts_edge.fw
+	mts_gsm.fw
+	mts_mt9234mu.fw
+	mts_mt9234zba.fw
+	mwl8335_duplex.fw
+	NPE-B
+	NPE-C
+	phanfw.bin
+	rt2561.bin
+	rt2561s.bin
+	rt2661.bin
+	rt2860.bin
+	rt2870.bin
+	rt3070.bin
+	rt3071.bin
+	rt3090.bin
+	rt73.bin
+	s2250.fw
+	s2250_loader.fw
+	TDA7706_OM_v2.5.1_boot.txt
+	TDA7706_OM_v3.0.2_boot.txt
+	ti_3410.fw
+	ti_5052.fw
+	tlg2300_firmware.bin
+	tr_smctr.bin
+	usbduxfast_firmware.bin
+	usbdux_firmware.bin
+	usbduxsigma_firmware.bin
+	vntwusb.fw
+	WHENCE.ubuntu
+	whiteheat.fw
+	whiteheat_loader.fw
+"
+
diff --git a/remote/rootfs/rootfs-stage32/module.conf.debian b/remote/rootfs/rootfs-stage32/module.conf.debian
new file mode 100644
index 00000000..4b80623f
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/module.conf.debian
@@ -0,0 +1,14 @@
+REQUIRED_INSTALLED_PACKAGES="
+			nfs-common
+			squashfs-tools
+			whois
+			xfsprogs
+			ntpdate
+			firmware-linux-free
+"
+REQUIRED_DIRECTORIES="
+			/lib/xtables
+"
+REQUIRED_FILES+="
+			/etc/X11/app-defaults/Xvidtune
+"
diff --git a/remote/rootfs/rootfs-stage32/module.conf.opensuse b/remote/rootfs/rootfs-stage32/module.conf.opensuse
new file mode 100644
index 00000000..4b11529b
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/module.conf.opensuse
@@ -0,0 +1,22 @@
+REQUIRED_INSTALLED_PACKAGES="
+			nfs-client
+			xfsprogs
+			squashfs
+			timezone
+			libcap2
+			jfsutils
+			curl
+"
+REQUIRED_CONTENT_PACKAGES="	
+			timezone
+			libcap2
+"
+REQUIRED_DIRECTORIES="
+			/usr/$LIB64/xtables
+"
+REQUIRED_FILES+="
+			/usr/share/X11/app-defaults/Xvidtune
+"
+REQUIRED_KERNEL_MODULES+="
+			kernel/drivers/cdrom
+"
diff --git a/remote/rootfs/rootfs-stage32/module.conf.opensuse.13.1 b/remote/rootfs/rootfs-stage32/module.conf.opensuse.13.1
new file mode 100644
index 00000000..aa7f8afb
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/module.conf.opensuse.13.1
@@ -0,0 +1,20 @@
+REQUIRED_INSTALLED_PACKAGES="
+			nfs-client
+			xfsprogs
+			squashfs
+			timezone
+			libcap2
+			jfsutils
+			curl
+			xvidtune
+"
+REQUIRED_CONTENT_PACKAGES="	
+			timezone
+			libcap2
+"
+REQUIRED_DIRECTORIES="
+			/usr/$LIB64/xtables
+"
+REQUIRED_FILES+="
+			/usr/share/X11/app-defaults/Xvidtune
+"
diff --git a/remote/rootfs/rootfs-stage32/module.conf.ubuntu b/remote/rootfs/rootfs-stage32/module.conf.ubuntu
new file mode 100644
index 00000000..646c39a0
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/module.conf.ubuntu
@@ -0,0 +1,15 @@
+REQUIRED_INSTALLED_PACKAGES="
+			nfs-common
+			squashfs-tools
+			whois
+			xfsprogs
+			ntpdate
+			jfsutils
+			curl
+"
+REQUIRED_DIRECTORIES="
+			/lib/xtables
+"
+REQUIRED_FILES+="
+			/etc/X11/app-defaults/Xvidtune
+"
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
deleted file mode 100644
index b12ca0a7..00000000
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/bash
-fetch_source() {
-	:
-}
-
-build() {
-	if [ ! -z "$REQUIRED_CONTENT_PACKAGES" ]; then
-		COPYLIST="list_dpkg_output"
-		[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
-		list_packet_files >> "${COPYLIST}"
-		tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
-	fi
-
-	FILELIST="list_binaries_and_files"
-	[ -e "${FILELIST}" ] && rm "${FILELIST}"
-
-	# Compile rdns
-	mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin"
-	gcc -o "$MODULE_BUILD_DIR/opt/openslx/bin/rdns" "$MODULE_DIR/rdns.c" || perror "Compiling rdns failed."
-
-	pinfo "Searching binaries from config file in system..."
-	for BIN in ${REQUIRED_BINARIES}
-	do
-		[ -n "$(find "$MODULE_BUILD_DIR" -name "$BIN")" ] && continue
-		BIN_LOCATION="$(which "$BIN")"
-		if [ ! -z "$BIN_LOCATION" -a -e "$BIN_LOCATION" ]; then
-			get_link_chain "$BIN_LOCATION" >> "$FILELIST"
-		else
-			perror "${BIN} not found on the system! Please install it."
-		fi
-	done
-
-	pinfo "Searching libraries from config file in system... (could take some time)"
-	for LIB in ${REQUIRED_LIBRARIES}
-	do
-		# lib + lib64: Ugly hack, will be replaced by a better solution 
-		for LIB_LOCATION in $(find /lib/ /lib64/ -name "${LIB}.so*")
-		do
-			get_link_chain "${LIB_LOCATION}" >> "${FILELIST}"
-		done
-	done
-	
-	for FILE in ${REQUIRED_DIRECTORIES}
-	do
-		[ ! -d ${FILE} ] && perror "Missing required directory $FILE"
-		echo ${FILE} >> "${FILELIST}"
-	done
-	for FILE in ${REQUIRED_FILES}
-	do
-		[ ! -f ${FILE} ] && perror "Missing required file $FILE"
-		echo ${FILE} >> "${FILELIST}"
-	done
-
-	local NUMFILES=$(cat "${FILELIST}" | wc -l)
-	if [ "x$NUMFILES" != "x" -a "x$NUMFILES" != "x0" ]; then
-		pinfo "File list generated at ${MODULE_BUILD_DIR}/${FILELIST} ($NUMFILES entries)"
-		pinfo "If something fails here, try to clean this module first."
-		tarcopy "$(cat "${FILELIST}")" "${MODULE_BUILD_DIR}"
-	fi
-}
-
-post_copy() {
-	# symlink for more
-	if [ ! -e "$TARGET_BUILD_DIR/bin/more" ]; then
-		[ -e "$TARGET_BUILD_DIR/bin/less" ] && ln -s /bin/less "$TARGET_BUILD_DIR/bin/more"
-		[ -e "$TARGET_BUILD_DIR/usr/bin/less" ] && ln -s /usr/bin/less "$TARGET_BUILD_DIR/bin/more"
-	fi
-	# same hack for mount
-	[ ! -e "$TARGET_BUILD_DIR/bin/mount" ] && ln -s /usr/bin/mount "$TARGET_BUILD_DIR/bin/mount"
-	
-	# make basic directory structure
-	mkdir -p "$TARGET_BUILD_DIR"/{bin,dev,proc,lib,etc,mnt,run,sys,var,opt/openslx/mnt}
-	ln -s -n -f -t "$TARGET_BUILD_DIR/var" "../run/lock" "../run"
-
-	# copy devices from running system
-	cp -a /dev/{console,kmsg,mem,null,shm,tty,tty0,tty1,tty9,urandom,zero} \
-		"${TARGET_BUILD_DIR}"/dev || perror "Copying devices from running system failed."
-
-	# set /etc/environment to include /opt/openslx/bin and /opt/openslx/sbin
-	#add_env PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin"
-	add_env PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
-	# set terminal to linux as it defaults to xterm which messes up ssh sessions
-	add_env TERM "linux"
-
-	# copy static files
-	cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}" || perror "Copying static files from data/* failed."
-
-	# quick fix for /etc/fstab
-	echo "# no configuration" >> "${TARGET_BUILD_DIR}/etc/fstab"
-
-	# link /etc/mtab, needed for systemd
-	[ ! -e "${TARGET_BUILD_DIR}/etc/mtab" ] && ln -s "/proc/self/mounts" "${TARGET_BUILD_DIR}/etc/mtab"
-
-	# passwd, group, shadow
-	init_users_and_groups
-
-	# quick fix for missing group in /etc/group
-	add_group "lock"
-
-	# setup root accoun
-	USER=root add_user
-	DEMO_ID="$(USER=demo PASSWORD=demo USERHOME=/home/demo USERSHELL=/bin/bash add_user)"
-
-	mkdir -p "${TARGET_BUILD_DIR}/root"
-	mkdir -p "${TARGET_BUILD_DIR}/home/demo"
-	chown "$DEMO_ID:$DEMO_ID" "${TARGET_BUILD_DIR}/home/demo"
-	sed -i -r 's/^blacklist.*pcspkr/#&/g' "$TARGET_BUILD_DIR/etc/modprobe.d/blacklist.conf"
-
-	echo "minilinux-$(hostname)" > "${TARGET_BUILD_DIR}/etc/hostname"
-
-
-	# copy kernel, modules and firmware
-	copy_kernel_modules
-	copy_firmware
-	#copy_kernel
-
-	# Try to fetch distro logo
-	if [ ! -s "$TARGET_BUILD_DIR/etc/distro.png" ]; then
-		local DIST=$(lsb_release -si)
-		if [ -n "$DIST" ]; then
-			[ -z "$CFG_DISTLOGO_URL" ] && CFG_DISTLOGO_URL='http://mltk-services.ruf.uni-freiburg.de/distro_logo.php?distro='
-			wget -O "$TARGET_BUILD_DIR/etc/distro.png" "${CFG_DISTLOGO_URL}${DIST}"
-			if [ ! -s "$TARGET_BUILD_DIR/etc/distro.png" ]; then
-				rm -f "$TARGET_BUILD_DIR/etc/distro.png"
-				pwarning "Could not download distro-logo"
-			fi
-		else
-			pwarning "Could not determine distribution"
-		fi
-	fi
-	# Create issue.template
-	local DIST=$(lsb_release -sd)
-	local GITC=$(git rev-parse --short HEAD)
-	local DATE=$(date "+%Y-%m-%d")
-	local VERSION=$(echo "bwLehrpool/$DIST   $DATE/$GITC" | escape_replace)
-	mkdir -p "$TARGET_BUILD_DIR/opt/openslx/etc"
-	sed "s/%version%/$VERSION/g" "$MODULE_DIR/templates/issue.template" > "$TARGET_BUILD_DIR/opt/openslx/etc/issue.template" || perror "Could not create issue template"
-
-}
-
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
deleted file mode 100644
index 34d3507a..00000000
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ /dev/null
@@ -1,249 +0,0 @@
-REQUIRED_MODULES="
-	kernel
-"
-REQUIRED_BINARIES="
-	bash
-	dmesg
-	curl
-	less
-	agetty
-	loadkeys
-	setfont
-	login
-	sulogin
-	mount
-	umount
-	mount.nfs4
-	umount.nfs4
-	mkfs.xfs
-	mkfs.ext3
-	mkfs.ext4
-	mkfs.jfs
-	blkid
-	modprobe
-	ps
-	scp
-	ssh
-	tput
-	xterm
-	bc
-	dirname
-	mkdosfs
-	iptables
-	ntpdate
-	rdns
-	find
-	rpcbind
-	rpc.statd
-	pkill
-	getent
-"
-REQUIRED_LIBRARIES="
-	libcap
-	libcidn
-	libcom_err
-	libcrypt
-	libcrypto
-	libnsl
-	libnss_compat
-	libnss_dns
-	libnss_files
-	libnss_hesiod
-	libnss_nis
-	libnss_nisplus
-	libnss_mdns
-	libpam
-	libutil
-	libtinfo
-	libresolv
-"
-REQUIRED_FILES="
-	/etc/inputrc
-	/etc/localtime
-	/etc/login.defs
-	/etc/securetty
-	/etc/protocols
-	/etc/services
-	/etc/networks
-	/etc/netconfig
-	/etc/fonts/fonts.conf
-"
-REQUIRED_KERNEL_MODULES="
-	kernel/drivers/cpufreq
-	kernel/drivers/memstick
-	kernel/drivers/mfd
-	kernel/drivers/gpio
-	kernel/drivers/block
-	kernel/drivers/uwb
-	kernel/drivers/w1
-	kernel/drivers/regulator
-	kernel/drivers/leds
-	kernel/drivers/firmware
-	kernel/drivers/watchdog
-	kernel/drivers/media/rc
-	kernel/drivers/media/video
-	kernel/drivers/media/common
-	kernel/drivers/mmc
-	kernel/drivers/staging
-	kernel/drivers/firewire
-	kernel/drivers/bluetooth
-	kernel/drivers/power
-	kernel/drivers/video
-	kernel/drivers/uio
-	kernel/drivers/md
-	kernel/drivers/virtio
-	kernel/drivers/pci
-	kernel/drivers/acpi
-	kernel/drivers/input
-	kernel/drivers/ssb
-	kernel/drivers/spi
-	kernel/drivers/crypto
-	kernel/drivers/bcma
-	kernel/drivers/nfc
-	kernel/drivers/usb
-	kernel/drivers/char
-	kernel/drivers/vhost
-	kernel/drivers/i2c
-	kernel/drivers/ata
-	kernel/drivers/tty
-	kernel/drivers/parport
-	kernel/drivers/misc
-	kernel/drivers/scsi
-	kernel/drivers/auxdisplay
-	kernel/drivers/target
-	kernel/drivers/dca
-	kernel/drivers/dma
-	kernel/drivers/rtc
-	kernel/drivers/pps
-	kernel/drivers/hid
-	kernel/drivers/atm
-	kernel/drivers/platform
-	kernel/drivers/edac
-	kernel/drivers/hv
-	kernel/drivers/idle
-	kernel/drivers/xen
-	kernel/ubuntu/aufs
-	kernel/arch
-	kernel/lib
-	kernel/fs
-	kernel/crypto
-	kernel/net
-	kernel/sound
-	kernel/fs/autofs4/autofs4
-	kernel/drivers/net/macvtap.ko
-	kernel/drivers/net/veth.ko
-"
-REQUIRED_FIRMWARE="
-	3com
-	acenic
-	adaptec
-	advansys
-	ar3k
-	asihpi
-	av7110
-	bnx2
-	bnx2x
-	brcm
-	cis
-	cpia2
-	cxgb3
-	cxgb4
-	dabusb
-	dsp56k
-	e100
-	ea
-	edgeport
-	emi26
-	emi62
-	ene-ub6250
-	ess
-	hp
-	isci
-	kaweth
-	keyspan
-	keyspan_pda
-	korg
-	libertas
-	matrox
-	mrvl
-	mwl8k
-	ositech
-	r128
-	radeon
-	RTL8192E
-	RTL8192SE
-	rtl_nic
-	sb16
-	scripts
-	slicoss
-	sun
-	sxg
-	tehuti
-	ti-connectivity
-	tigon
-	ttusb-budget
-	ueagle-atm
-	usbdux
-	vicam
-	vxge
-	yam
-	yamaha
-	agere_ap_fw.bin
-	agere_sta_fw.bin
-	aic94xx-seq.fw
-	ath3k-1.fw
-	atmel_at76c502_3com.bin
-	atmel_at76c502.bin
-	atmel_at76c502d.bin
-	atmel_at76c502e.bin
-	atmel_at76c504_2958.bin
-	atmel_at76c504a_2958.bin
-	atmel_at76c504.bin
-	atmel_at76c506.bin
-	atmsar11.fw
-	carl9170-1.fw
-	f2255usb.bin
-	GPL-3
-	htc_7010.fw
-	htc_9271.fw
-	i2400m-fw-usb-1.4.sbcf
-	i2400m-fw-usb-1.5.sbcf
-	i6050-fw-usb-1.5.sbcf
-	intelliport2.bin
-	lbtf_usb.bin
-	lgs8g75.fw
-	mts_cdma.fw
-	mts_edge.fw
-	mts_gsm.fw
-	mts_mt9234mu.fw
-	mts_mt9234zba.fw
-	mwl8335_duplex.fw
-	NPE-B
-	NPE-C
-	phanfw.bin
-	rt2561.bin
-	rt2561s.bin
-	rt2661.bin
-	rt2860.bin
-	rt2870.bin
-	rt3070.bin
-	rt3071.bin
-	rt3090.bin
-	rt73.bin
-	s2250.fw
-	s2250_loader.fw
-	TDA7706_OM_v2.5.1_boot.txt
-	TDA7706_OM_v3.0.2_boot.txt
-	ti_3410.fw
-	ti_5052.fw
-	tlg2300_firmware.bin
-	tr_smctr.bin
-	usbduxfast_firmware.bin
-	usbdux_firmware.bin
-	usbduxsigma_firmware.bin
-	vntwusb.fw
-	WHENCE.ubuntu
-	whiteheat.fw
-	whiteheat_loader.fw
-"
-
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.debian b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.debian
deleted file mode 100644
index 4b80623f..00000000
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.debian
+++ /dev/null
@@ -1,14 +0,0 @@
-REQUIRED_INSTALLED_PACKAGES="
-			nfs-common
-			squashfs-tools
-			whois
-			xfsprogs
-			ntpdate
-			firmware-linux-free
-"
-REQUIRED_DIRECTORIES="
-			/lib/xtables
-"
-REQUIRED_FILES+="
-			/etc/X11/app-defaults/Xvidtune
-"
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse
deleted file mode 100644
index 4b11529b..00000000
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse
+++ /dev/null
@@ -1,22 +0,0 @@
-REQUIRED_INSTALLED_PACKAGES="
-			nfs-client
-			xfsprogs
-			squashfs
-			timezone
-			libcap2
-			jfsutils
-			curl
-"
-REQUIRED_CONTENT_PACKAGES="	
-			timezone
-			libcap2
-"
-REQUIRED_DIRECTORIES="
-			/usr/$LIB64/xtables
-"
-REQUIRED_FILES+="
-			/usr/share/X11/app-defaults/Xvidtune
-"
-REQUIRED_KERNEL_MODULES+="
-			kernel/drivers/cdrom
-"
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse.13.1 b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse.13.1
deleted file mode 100644
index aa7f8afb..00000000
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse.13.1
+++ /dev/null
@@ -1,20 +0,0 @@
-REQUIRED_INSTALLED_PACKAGES="
-			nfs-client
-			xfsprogs
-			squashfs
-			timezone
-			libcap2
-			jfsutils
-			curl
-			xvidtune
-"
-REQUIRED_CONTENT_PACKAGES="	
-			timezone
-			libcap2
-"
-REQUIRED_DIRECTORIES="
-			/usr/$LIB64/xtables
-"
-REQUIRED_FILES+="
-			/usr/share/X11/app-defaults/Xvidtune
-"
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.ubuntu b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.ubuntu
deleted file mode 100644
index 646c39a0..00000000
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.ubuntu
+++ /dev/null
@@ -1,15 +0,0 @@
-REQUIRED_INSTALLED_PACKAGES="
-			nfs-common
-			squashfs-tools
-			whois
-			xfsprogs
-			ntpdate
-			jfsutils
-			curl
-"
-REQUIRED_DIRECTORIES="
-			/lib/xtables
-"
-REQUIRED_FILES+="
-			/etc/X11/app-defaults/Xvidtune
-"
-- 
cgit v1.2.3-55-g7522