summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-db/OpenSLX/DBSchema.pm4
-rw-r--r--initramfs/initrd-stuff/etc/vmware-prep6
-rw-r--r--test0
-rw-r--r--vmware/fd.img (renamed from vmware/fd0.img)bin1474560 -> 1474560 bytes
-rwxr-xr-xvmware/runvmware2
5 files changed, 6 insertions, 6 deletions
diff --git a/config-db/OpenSLX/DBSchema.pm b/config-db/OpenSLX/DBSchema.pm
index 467a88cd..6d5400ad 100644
--- a/config-db/OpenSLX/DBSchema.pm
+++ b/config-db/OpenSLX/DBSchema.pm
@@ -31,8 +31,8 @@ my @sharedAttributes = (
'attr_start_snmp:b',
'attr_start_x:s.64',
'attr_start_xdmcp:s.64',
- 'attr_auth_type:s.64'
- 'attr_home_type:s.64'
+ 'attr_auth_type:s.64',
+ 'attr_home_type:s.64',
'attr_tex_enable:b',
'attr_vmware:b',
);
diff --git a/initramfs/initrd-stuff/etc/vmware-prep b/initramfs/initrd-stuff/etc/vmware-prep
index 9ea2f82c..cdb47724 100644
--- a/initramfs/initrd-stuff/etc/vmware-prep
+++ b/initramfs/initrd-stuff/etc/vmware-prep
@@ -40,9 +40,9 @@ mkdir -p $loopsrc
grep "unionfs" /proc/mounts >/dev/null && \
mount -o size=1500k -t tmpfs vm-loopimg $loopsrc
mkdir -p -m a+t $loopdst
-cp ${vmdir}/templ/fd1.img /$loopsrc/fd1.img
-chmod a+rw /$loopsrc/fd1.img
-mount -n -t msdos -o loop,umask=000 /$loopsrc/fd1.img $loopdst
+cp ${vmdir}/templ/fd.img /$loopsrc/fd.img
+chmod a+rw /$loopsrc/fd.img
+mount -n -t msdos -o loop,umask=000 /$loopsrc/fd.img $loopdst
# mount usbfs needed for vmware to detect usb devices
grep "/proc/bus/usb" /proc/mounts >/dev/null || \
diff --git a/test b/test
deleted file mode 100644
index e69de29b..00000000
--- a/test
+++ /dev/null
diff --git a/vmware/fd0.img b/vmware/fd.img
index 7c47c615..7c47c615 100644
--- a/vmware/fd0.img
+++ b/vmware/fd.img
Binary files differ
diff --git a/vmware/runvmware b/vmware/runvmware
index 8bc58946..41a67037 100755
--- a/vmware/runvmware
+++ b/vmware/runvmware
@@ -179,7 +179,7 @@ cdr_2_name="/dev/cdrom1"
floppya="FALSE"
floppyb="FALSE"
# place for the virtual floppy "B:"
-floppybname="/etc/vmware/loopimg/fd1.img"
+floppybname="/etc/vmware/loopimg/fd.img"
# resolution
hostres=$(xvidtune -show 2>/dev/null| grep -ve "^$")
xres=$(echo "${hostres}" | awk '{print $3}')