summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-09-05 12:45:37 +0200
committerDirk von Suchodoletz2006-09-05 12:45:37 +0200
commit880dd5534fabd659792ef4c509c7b52ec20d673c (patch)
tree04a27d0467d9a0fe9210cc33772c732bb718eaa8
parentSmall improvement in vmware-prep (no need to read config any more), (diff)
downloadcore-880dd5534fabd659792ef4c509c7b52ec20d673c.tar.gz
core-880dd5534fabd659792ef4c509c7b52ec20d673c.tar.xz
core-880dd5534fabd659792ef4c509c7b52ec20d673c.zip
Added hint to machine-setup template, moved floppy loopback image for
VMware config stuff (consistent naming) git-svn-id: http://svn.openslx.org/svn/openslx/trunk@354 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--initrd/initrd-stuff/etc/vmware-prep3
-rw-r--r--installer/default_files/machine-setup.default7
-rw-r--r--vmware/fd1.img (renamed from vmware/fd0.img)bin1474560 -> 1474560 bytes
3 files changed, 8 insertions, 2 deletions
diff --git a/initrd/initrd-stuff/etc/vmware-prep b/initrd/initrd-stuff/etc/vmware-prep
index 7e748471..4229d10b 100644
--- a/initrd/initrd-stuff/etc/vmware-prep
+++ b/initrd/initrd-stuff/etc/vmware-prep
@@ -40,11 +40,10 @@ mkdir -p $loopsrc
grep "unionfs" /proc/mounts >/dev/null && \
mount -o size=1500k -t tmpfs vm-loopimg $loopsrc
mkdir -p $loopdst
-cp ${vmdir}/templ/fd0.img /$loopsrc/fd1.img
+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
# mount usbfs needed for vmware to detect usb devices
grep "/proc/bus/usb" /proc/mounts >/dev/null || \
mount -t usbfs usbfs /proc/bus/usb
-
diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default
index c2991f4a..b5dc0faa 100644
--- a/installer/default_files/machine-setup.default
+++ b/installer/default_files/machine-setup.default
@@ -1,4 +1,11 @@
# machine-setup
+#
+#### default file, please modify, rename it to machine-setup and copy it
+#### to a proper location, like /var/lib/openslx/config/default/initramfs
+#### several of the settings could be passed via DHCP too (vendorspecific
+#### options, see dhcpd.conf example) - some settings could be done only
+#### within this file (no DHCP variable definition available)
+#
# universal (distro independent) configuration file for slx linux diskless
# client. It defines default values for several configuration variables.
# These settings might be overwritten through various processes in initial
diff --git a/vmware/fd0.img b/vmware/fd1.img
index 7c47c615..7c47c615 100644
--- a/vmware/fd0.img
+++ b/vmware/fd1.img
Binary files differ