diff options
| author | Simon Rettberg | 2013-06-05 18:12:35 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-06-05 18:12:35 +0200 |
| commit | e93829b2c375bee2e8c4492684ee45d00243c1fa (patch) | |
| tree | 269d6a97b48511bbca9c6fb496327930a911a1be /remote | |
| parent | Fix Network setup when using bridge (diff) | |
| parent | add iptables modules, vmware udhcpd works now (diff) | |
| download | tm-scripts-e93829b2c375bee2e8c4492684ee45d00243c1fa.tar.gz tm-scripts-e93829b2c375bee2e8c4492684ee45d00243c1fa.tar.xz tm-scripts-e93829b2c375bee2e8c4492684ee45d00243c1fa.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
4 files changed, 3 insertions, 10 deletions
diff --git a/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser-env b/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser-env index c4d99d6d..4bdf63c3 100755 --- a/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser-env +++ b/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser-env @@ -16,14 +16,6 @@ VMCHOOSER_CONF_DIR=/etc/openslx/vmchooser mkdir -p ${VMCHOOSER_CONF_DIR}/loopimg mkdir -p ${VMCHOOSER_CONF_DIR}/fd-loop -m 1777 -# setup all generic virtualization / starting stuff like the floppy image -# loop file for exchanging information between linux and vm guest -if modprobe loop; then - mdev -s -else - : #|| error "" nonfatal -fi - # mount a clean tempfs (bug in UnionFS prevents loopmount to work) grep -qE "unionfs |aufs " /proc/mounts && \ mount -n -o size=1500k -t tmpfs vm-loopimg ${VMCHOOSER_CONF_DIR}/loopimg diff --git a/remote/modules/vmplayer/data/etc/a.out b/remote/modules/vmplayer/data/etc/a.out new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/remote/modules/vmplayer/data/etc/a.out diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env index f1f52040..d35e7635 100755 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env @@ -27,7 +27,7 @@ vm_dhcpd() { [ -n "${wpad}" ] && wpad_config="option wpad ${wpad}" # configuring dhcpd stub for virtual networks - cat > ${VMWARE_CONF_DIR}/udhcpd.conf << EOF +cat > ${VMWARE_CONF_DIR}/udhcpd.conf << EOF # general udhcpd configuration file for virtual machines written by $0 # start and end of the IP lease block @@ -235,6 +235,7 @@ vmblock () { case "$1" in start) #start: defines start function for initscript + vm_dhcpd setup_network # adapt_tmpfs # hack to access the first serial/parallel port diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf index c8d47639..27421166 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf @@ -49,7 +49,7 @@ REQUIRED_LIBRARIES=" libcap libtinfo libresolv libau" -REQUIRED_DIRECTORIES="" +REQUIRED_DIRECTORIES="/lib/xtables" REQUIRED_FILES=" /etc/environment /etc/issue /etc/inputrc |