diff options
| author | Christian Rößler | 2013-06-04 17:59:33 +0200 |
|---|---|---|
| committer | Christian Rößler | 2013-06-04 17:59:33 +0200 |
| commit | 5c09783650c61baa24b422a9bb753c2edf4e0a7a (patch) | |
| tree | 22175a851523a93f18675b6d68eb13608c6f2694 /remote | |
| parent | Changed: hardcoded /lib-paths changed to variable (diff) | |
| parent | Remove aufs-tools from stage32 (diff) | |
| download | tm-scripts-5c09783650c61baa24b422a9bb753c2edf4e0a7a.tar.gz tm-scripts-5c09783650c61baa24b422a9bb753c2edf4e0a7a.tar.xz tm-scripts-5c09783650c61baa24b422a9bb753c2edf4e0a7a.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.build | 2 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.conf | 11 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper | 31 |
3 files changed, 8 insertions, 36 deletions
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..3436ba18 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_INSTALLED_PACKAGES="nfs-common squashfs-tools whois xfsprogs" +REQUIRED_BINARIES=" + bash more less agetty @@ -14,7 +15,6 @@ REQUIRED_BINARIES=" bash umount mount.nfs4 umount.nfs4 - mount.aufs fdisk mkfs.xfs rm @@ -25,11 +25,12 @@ REQUIRED_BINARIES=" bash ssh tput xterm - ckbcomp xvidtune bc dirname - mkdosfs" + mkdosfs + iptables +" REQUIRED_LIBRARIES=" libcap libcidn libcom_err 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 |