From 1a71bfa6105e59ebb881113b978459af57957748 Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Tue, 5 Dec 2006 17:50:08 +0000
Subject: bigfix in DBSchema, floppy image renamed to fd.img

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@528 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 config-db/OpenSLX/DBSchema.pm          |   4 ++--
 initramfs/initrd-stuff/etc/vmware-prep |   6 +++---
 test                                   |   0
 vmware/fd.img                          | Bin 0 -> 1474560 bytes
 vmware/fd0.img                         | Bin 1474560 -> 0 bytes
 vmware/runvmware                       |   2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 test
 create mode 100644 vmware/fd.img
 delete mode 100644 vmware/fd0.img

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
diff --git a/vmware/fd.img b/vmware/fd.img
new file mode 100644
index 00000000..7c47c615
Binary files /dev/null and b/vmware/fd.img differ
diff --git a/vmware/fd0.img b/vmware/fd0.img
deleted file mode 100644
index 7c47c615..00000000
Binary files a/vmware/fd0.img and /dev/null 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}')
-- 
cgit v1.2.3-55-g7522