summaryrefslogtreecommitdiffstats
path: root/remote/rootfs
diff options
context:
space:
mode:
authorroot2013-06-03 17:34:24 +0200
committerroot2013-06-03 17:34:24 +0200
commit79938062f218767d03b713db88cdca41543f5924 (patch)
tree89d5e2f288d7736401b34f8ccd57c6acb6d4257e /remote/rootfs
parent[kernel] Fix aufs3 patching (diff)
parentMerge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff)
downloadtm-scripts-79938062f218767d03b713db88cdca41543f5924.tar.gz
tm-scripts-79938062f218767d03b713db88cdca41543f5924.tar.xz
tm-scripts-79938062f218767d03b713db88cdca41543f5924.zip
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/rootfs')
-rwxr-xr-xremote/rootfs/rootfs-stage31/data/init5
-rw-r--r--remote/rootfs/rootfs-stage32/data/etc/modprobe.d/blacklist3
-rw-r--r--remote/rootfs/rootfs-stage32/rootfs-stage32.conf3
3 files changed, 7 insertions, 4 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index 4268e6af..06be8376 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -55,6 +55,11 @@ for opts in ${KCL}; do
ip=*)
# process IP info
export IPINFO=${opts#ip=} ;;
+ nfs=*)
+ export NFS=${opts#nfs=}
+ export NFSPATH=${nfs#*:}
+ export NFSSERVER=${nfs%:/*}
+ ;;
BOOTIF=*)
export MAC="$( echo "$opts" | cut -b 11- | tr '-' ':' )" ;;
esac
diff --git a/remote/rootfs/rootfs-stage32/data/etc/modprobe.d/blacklist b/remote/rootfs/rootfs-stage32/data/etc/modprobe.d/blacklist
deleted file mode 100644
index cedabdcb..00000000
--- a/remote/rootfs/rootfs-stage32/data/etc/modprobe.d/blacklist
+++ /dev/null
@@ -1,3 +0,0 @@
-# evbug byebye
-blacklist evbug
-blacklist pcspkr
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index f5452f53..44f97fa0 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -28,7 +28,8 @@ REQUIRED_BINARIES=" bash
ckbcomp
xvidtune
bc
- dirname"
+ dirname
+ mkdosfs"
REQUIRED_LIBRARIES=" libcap
libcidn
libcom_err