summaryrefslogtreecommitdiffstats
path: root/initramfs
diff options
context:
space:
mode:
authorDirk von Suchodoletz2007-05-11 14:34:32 +0200
committerDirk von Suchodoletz2007-05-11 14:34:32 +0200
commita7595cbb33c8655624f3d352527dacf51a5f1144 (patch)
tree4564bd7a64a04e775633fd1482a43f5a65ff25fe /initramfs
parentUpdate of pci.ids, adapted usleep time in hwautocfg (for busybox usleep) (diff)
downloadcore-a7595cbb33c8655624f3d352527dacf51a5f1144.tar.gz
core-a7595cbb33c8655624f3d352527dacf51a5f1144.tar.xz
core-a7595cbb33c8655624f3d352527dacf51a5f1144.zip
Increased usleep further on (because of micro rather than milli seconds
:-)) git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1044 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
-rw-r--r--initramfs/distro-specs/suse/functions-default4
-rwxr-xr-xinitramfs/initrd-stuff/bin/hwautocfg8
2 files changed, 6 insertions, 6 deletions
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 165b1634..a9529373 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -233,9 +233,9 @@ if [ "x$late_dm" = "xyes" ] ; then
ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITDIR}/rc5.d/K18xdm
sed -e "s,xdm: .*,xdm:," -i /mnt/etc/${D_INITDIR}/.depend.start
else
- ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITBOOTD}/S02boot.xdm
+ ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITBOOTD}/S12boot.xdm
echo -e "\t(sleep 60; ln -sf ../xdm /etc/${D_INITDIR}/rc5.d/S01xdm; \
- rm /etc/${D_INITBOOTD}/S02boot.xdm) &\n" >>/mnt/etc/${D_INITDIR}/boot.slx
+ rm /etc/${D_INITBOOTD}/S12boot.xdm) &\n" >>/mnt/etc/${D_INITDIR}/boot.slx
fi
}
# configure X display manager (runlevel links and kind of manager)
diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg
index e60fbcb8..edf79d64 100755
--- a/initramfs/initrd-stuff/bin/hwautocfg
+++ b/initramfs/initrd-stuff/bin/hwautocfg
@@ -231,7 +231,7 @@ done
( hwsetup -n -v > /tmp/hwsetup.info && echo "hwsetup" > /tmp/hwrun1 ) &
( for mod in usbcore uhci-hcd ohci-hcd usbhid; do
modprobe -q $mod 2>/dev/null
- usleep 500
+ usleep 5000
done; ) &
return 0
}
@@ -243,7 +243,7 @@ nwmod () {
echo "** loading all defined network adaptor modules at $(sysup)"
for mod in ${NWMODULES}; do
modprobe ${MODPRV} $mod || error "$init_errnwad"
- usleep 500
+ usleep 5000
done
return 0
}
@@ -280,7 +280,7 @@ if [ -n "${SLOWHWSETUP}" ] ; then
modwaittime=${SLOWHWSETUP}
[ $DEBUGLEVEL -eq 21 ] && echo "** set modwaittime to ${SLOWHWSETUP}ms"
else
- modwaittime=500
+ modwaittime=5000
fi
[ $DEBUGLEVEL -eq 21 ] && echo "** 1st hwdetection finished at $(sysup)"
# load ide drivers first, takes a while to initialize
@@ -390,7 +390,7 @@ cat /tmp/hwsetup.info| while read line ; do
if ! strinstr " ${driver} " "${driverlist}"; then
strinstr "Card:" "${driver}" || strinstr "ps/2" "${driver}" || {
modprobe ${MODPRV} ${driver} &
- usleep 500; }
+ usleep 5000; }
driverlist="${driverlist} ${driver}"
fi
fi