diff options
| -rw-r--r-- | initrd/distro-specs/suse/functions-9.3 | 7 | ||||
| -rwxr-xr-x | initrd/initrd-stuff/init | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3 index bd893ae4..bef659b6 100644 --- a/initrd/distro-specs/suse/functions-9.3 +++ b/initrd/distro-specs/suse/functions-9.3 @@ -4,11 +4,11 @@ # functions file). This file is the main base for the # following SuSE distributions # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 10-05-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 20-05-2006 # # Copyright: (c) 2006 - RZ Universitaet Freiburg # -# Version: 0.2.2f +# Version: 0.2.2g # distro specific stuff to initialize preinit () { @@ -315,6 +315,9 @@ ServerCmd=/usr/X11R6/bin/X -br\n\ ServerArgsLocal=-nolisten tcp\n\ TerminateServer=true\n\ Resources=/etc/X11/xdm/Xresources\nSetup=/etc/X11/xdm/Xsetup\n\ +UserPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/var/X11R6/bin +SystemPath=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:\ +/usr/X11R6/bin:/var/X11R6/bin Startup=/etc/X11/xdm/Xstartup\nReset=/etc/X11/xdm/Xreset\n\ Session=/etc/X11/xdm/Xsession\nClientLogFile=.xsession-errors-%s\n\ AutoReLogin=false\nAllowRootLogin=true\n\ diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init index a069f61d..653fe738 100755 --- a/initrd/initrd-stuff/init +++ b/initrd/initrd-stuff/init @@ -258,6 +258,7 @@ if [ -n "${NBD}" ] ; then waitfor "${RDEV}" 30000 || error "$init_nbddev" echo "0" > /sys/block/nbd0/queue/read_ahead_kb nbd-client $nbdhost $nbdport ${RDEV} || error "$init_nbdcl" + usleep 10 # switch off unneeded block read ahead echo "0" > /sys/block/nbd0/queue/read_ahead_kb ;; @@ -278,7 +279,7 @@ if [ -n "${NBD}" ] ; then RDEV=/dev/dnbd0 ;; esac - usleep 20 + usleep 10 RWRO="ro" if [ -n "${COWLOOP}" -a -x /bin/cowdev ] ; then modprobe ${MODPRV} cowloop || { |