From 6e5dc0fc6f9ae85370fb3873c6d0981947cb4980 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 4 Jun 2013 17:09:21 +0200
Subject: [rootfs-stage32] include iptables

---
 remote/rootfs/rootfs-stage32/rootfs-stage32.build | 2 +-
 remote/rootfs/rootfs-stage32/rootfs-stage32.conf  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'remote')

diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index 713c0a3d..162dcdc2 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -17,7 +17,7 @@ build() {
 	pinfo "Searching binaries from config file in system..."
 	for BIN in ${REQUIRED_BINARIES}
 	do
-		BIN_LOCATION=$(which ${BIN})
+		BIN_LOCATION="$(which ${BIN})"
 		if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ];
 		then
 			get_link_chain ${BIN_LOCATION} >> "${FILELIST}"
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index 3b47d131..ccdcddce 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -1,6 +1,7 @@
 REQUIRED_MODULES="	kernel"
 REQUIRED_INSTALLED_PACKAGES="nfs-common aufs-tools squashfs-tools whois xfsprogs"
-REQUIRED_BINARIES="	bash
+REQUIRED_BINARIES="
+			bash
 			more
 			less
 			agetty
@@ -29,7 +30,9 @@ REQUIRED_BINARIES="	bash
 			xvidtune
 			bc
 			dirname
-			mkdosfs"
+			mkdosfs
+			iptables
+"
 REQUIRED_LIBRARIES="	libcap
 			libcidn
 			libcom_err
-- 
cgit v1.2.3-55-g7522


From 2a64fb191c1d460d114f23d68a59bbf198137a2f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 4 Jun 2013 17:38:37 +0200
Subject: Remove aufs-tools from stage32

---
 remote/rootfs/rootfs-stage32/rootfs-stage32.conf   |  4 +--
 .../rootfs-stage32/rootfs-stage32.conf.zypper      | 31 +---------------------
 2 files changed, 2 insertions(+), 33 deletions(-)

(limited to 'remote')

diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index ccdcddce..3436ba18 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -1,5 +1,5 @@
 REQUIRED_MODULES="	kernel"
-REQUIRED_INSTALLED_PACKAGES="nfs-common aufs-tools squashfs-tools whois xfsprogs"
+REQUIRED_INSTALLED_PACKAGES="nfs-common squashfs-tools whois xfsprogs"
 REQUIRED_BINARIES="
 			bash
 			more
@@ -15,7 +15,6 @@ REQUIRED_BINARIES="
 			umount
 			mount.nfs4
 			umount.nfs4
-			mount.aufs
 			fdisk
 			mkfs.xfs
 			rm
@@ -26,7 +25,6 @@ REQUIRED_BINARIES="
 			ssh
 			tput
 			xterm
-			ckbcomp
 			xvidtune
 			bc
 			dirname
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
index 2fd5af1a..4d44e2d6 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
@@ -1,35 +1,6 @@
-pinfo "If aufs install fails, run zypper addrepo http://jftp.inai.de/openSUSE_12.3/ j.eng-i586"
 REQUIRED_MODULES="	kernel"
-REQUIRED_INSTALLED_PACKAGES="nfs-client aufs squashfs"
+REQUIRED_INSTALLED_PACKAGES="nfs-client xfsprogs squashfs timezone"
 REQUIRED_CONTENT_PACKAGES="timezone"
-REQUIRED_BINARIES="	bash
-			agetty
-			cat
-			false
-			loadkeys
-			setfont
-			login
-			sulogin
-			mount
-			umount
-			mount.nfs4
-			umount.nfs4
-			mount.aufs
-			rm
-			ldd
-			strace
-			blkid
-			more
-			modprobe
-			rsyslogd
-			ps
-			scp
-			ssh
-			tput
-			xterm
-			xvidtune
-			bc
-			dirname"
 REQUIRED_LIBRARIES="	libcap
 			libcidn
 			libcom_err
-- 
cgit v1.2.3-55-g7522