diff options
| author | Dirk von Suchodoletz | 2006-05-10 18:46:18 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-05-10 18:46:18 +0200 |
| commit | 5e67dfbd6717a9de7bf5027d53ee4df11461c5bd (patch) | |
| tree | 4b3fa3a1e3e588259983745988a4cfcb2b62a50a /initrd/initrd-stuff | |
| parent | defaultwm: start defaultwm in kdm when no wm or vmimage chosen, lists (diff) | |
| download | core-5e67dfbd6717a9de7bf5027d53ee4df11461c5bd.tar.gz core-5e67dfbd6717a9de7bf5027d53ee4df11461c5bd.tar.xz core-5e67dfbd6717a9de7bf5027d53ee4df11461c5bd.zip | |
fix for debuglevel in ld4-inst, kdmrc in functions-9.3, ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@209 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff')
| -rw-r--r-- | initrd/initrd-stuff/etc/vmware-prep | 17 | ||||
| -rwxr-xr-x | initrd/initrd-stuff/init | 10 |
2 files changed, 9 insertions, 18 deletions
diff --git a/initrd/initrd-stuff/etc/vmware-prep b/initrd/initrd-stuff/etc/vmware-prep index d3a377ee..effcb056 100644 --- a/initrd/initrd-stuff/etc/vmware-prep +++ b/initrd/initrd-stuff/etc/vmware-prep @@ -6,10 +6,10 @@ # initial ramdisk # # Author(s): Michael Janczyk <mj0@uni-freiburg.de>, 04-04-2006 -# Dirk von Suchodoletz <dirk@goe.net>, 28-04-2006 +# Dirk von Suchodoletz <dirk@goe.net>, 10-05-2006 # Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg # -# Version: 0.2a +# Version: 0.2b ################################################################################ @@ -101,19 +101,6 @@ vmsession2desktop_session () { fi } -# no-usb-rule as udev vmware rule -vm_udev () { -echo -e "#!/bin/sh\n# script for blocking linux usb action during vmware \ -sessions\n# written from $0 script during runlevel\n# add any usb modules \ -here, which you would like to disable in linux for \n# getting them in \ -vmware guest os\n# Dirk von Suchodoletz <dirk@goe.net>\nRETURN=1\n\ -ps aux |grep -i vmware| grep -v "grep" &>/dev/null && {\n RET=0\n \ -rmmod usb-storage & >/dev/null\n}\nexit $RET" > /var/X11R6/bin/vm-udev -chmod u+x /var/X11R6/bin/vm-udev -echo -e '# special rule for ignoring usb events during vmware sessions\n\ -BUS=="usb", ACTION=="add", PROGRAM="/var/X11R6/bin/vm-udev", \ -OPTIONS="ignore_device"' > /etc/udev/rules/01-udev-vm.rules -} ### START SCRIPT ############################################################### diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init index fabda00f..874792f7 100755 --- a/initrd/initrd-stuff/init +++ b/initrd/initrd-stuff/init @@ -2,7 +2,7 @@ # Description: main script for new type of initial ramdisk for # linux diskless clients version 4 # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 01-05-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 10-05-2006 # # Copyright: (c) 2006 - RZ Universitaet Freiburg # @@ -425,8 +425,12 @@ proc\t\t/proc\t\tproc\t\tdefaults\t 0 0\ninitramdevs\t/dev\t\ttmpfs\ \t\trw\t\t 0 0\ndevpts\t\t/dev/pts\tdevpts\t\tmode=0620,gid=5\t 0 0\n\ usbfs\t\t/proc/bus/usb\tusbfs\t\tnoauto\t\t 0 0" >>/mnt/etc/fstab || \ error "$init_fstab" -echo -e "rootfs / rootfs rw 0 0" > /mnt/etc/mtab - +echo -e "rootfs / rootfs rw 0 0\ninitramdevs /dev tmpfs rw\ + 0 0" > /mnt/etc/mtab +[ -z "$UNIONFS" ] && echo -e "ramfs /tmp tmpfs rw 0 0\nramfs /root\ +tmpfs rw 0 0\nramfs /media tmpfs rw 0 0 \nramfs /home tmpfs rw 0 0" \ + > /mnt/etc/mtab + # copy library cache if generated if [ -z "${NOLDSC}" ] ; then if waitfor /tmp/ldcfg 50000 ; then |