diff options
| author | Root | 2007-01-12 16:02:53 +0100 |
|---|---|---|
| committer | Root | 2007-01-12 16:02:53 +0100 |
| commit | 800af873b919b56de53499f7c55be34c4f88f704 (patch) | |
| tree | c8322da0b72a65e1bec8adba47e2f819eb8a4506 /initramfs | |
| parent | No longer use SLX_SYSTEM_VARIANTNAME in this prototype code. (diff) | |
| download | core-800af873b919b56de53499f7c55be34c4f88f704.tar.gz core-800af873b919b56de53499f7c55be34c4f88f704.tar.xz core-800af873b919b56de53499f7c55be34c4f88f704.zip | |
Fix in hwautocfg (wait for device to appear) and small compatibility
hack for vmware-prep ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@617 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rw-r--r-- | initramfs/distro-specs/suse/functions-default | 6 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/bin/hwautocfg | 4 | ||||
| -rw-r--r-- | initramfs/initrd-stuff/etc/vmware-prep | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default index 4b281f42..cf23e8f4 100644 --- a/initramfs/distro-specs/suse/functions-default +++ b/initramfs/distro-specs/suse/functions-default @@ -530,9 +530,9 @@ if [ -f /mnt/etc/${D_SYSCONFDIR}/vmware ] ; then cp /etc/.depend.start /mnt/etc/${D_INITDIR}/.depend.start # this line should be added to /etc/hotplug.d/usb/50-usb.hotplug # to block linux from handling usb events during vmware sessions - sed -e '/USB-specific/{;i\' \ - -e 'ps aux |grep -i vmware| grep -v "grep" &>/dev/null && exit 0' \ - -e ' }' -i /mnt/etc/hotplug.d/usb/50-usb.hotplug + #sed -e '/USB-specific/{;i\' \ + # -e 'ps aux |grep -i vmware| grep -v "grep" >/dev/null 2>&1 && exit 0' \ + # -e ' }' -i /mnt/etc/hotplug.d/usb/50-usb.hotplug else error "df_errvmw" nonfatal fi diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg index de275307..eeea00d7 100755 --- a/initramfs/initrd-stuff/bin/hwautocfg +++ b/initramfs/initrd-stuff/bin/hwautocfg @@ -379,8 +379,8 @@ if strinfile "SCSI" /tmp/hwsetup.info ; then strinfile "CDROM" /tmp/hwsetup.info && { modprobe ${MODPRV} sr_mod; modprobe ${MODPRV} sg; # just for compatibility to hwsetup (which generates links to scd*) - test -b /dev/sr0 && { for i in /dev/sr* ; do - ln -s $i /dev/scd${i#/dev/sr} ; done; } + ( waitfor /dev/sr0 1000 && for i in /dev/sr* ; do + ln -s $i /dev/scd${i#/dev/sr} ; done; ) & } strinfile "HD" /tmp/hwsetup.info && modprobe ${MODPRV} sd_mod # check if a (scsi) scanner was detected diff --git a/initramfs/initrd-stuff/etc/vmware-prep b/initramfs/initrd-stuff/etc/vmware-prep index cdb47724..c7d4d9da 100644 --- a/initramfs/initrd-stuff/etc/vmware-prep +++ b/initramfs/initrd-stuff/etc/vmware-prep @@ -41,6 +41,8 @@ grep "unionfs" /proc/mounts >/dev/null && \ mount -o size=1500k -t tmpfs vm-loopimg $loopsrc mkdir -p -m a+t $loopdst cp ${vmdir}/templ/fd.img /$loopsrc/fd.img +# compatibility hack +ln -s /$loopsrc/fd.img /$loopsrc/fd1.img chmod a+rw /$loopsrc/fd.img mount -n -t msdos -o loop,umask=000 /$loopsrc/fd.img $loopdst |