summaryrefslogtreecommitdiffstats
path: root/initramfs/initrd-stuff/etc
diff options
context:
space:
mode:
authorDirk von Suchodoletz2007-02-26 16:28:32 +0100
committerDirk von Suchodoletz2007-02-26 16:28:32 +0100
commit7fb326f12698c20ea302e4a80cc4ff755050c83f (patch)
treecbd037e5a7d6e61e7f6a0337ad8c86f0cb643a06 /initramfs/initrd-stuff/etc
parentnew exclude added for gentoo ld4-install (diff)
downloadcore-7fb326f12698c20ea302e4a80cc4ff755050c83f.tar.gz
core-7fb326f12698c20ea302e4a80cc4ff755050c83f.tar.xz
core-7fb326f12698c20ea302e4a80cc4ff755050c83f.zip
Bugfix for init/hwautocfg (waitfor), minor cleanups ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@724 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/etc')
-rw-r--r--initramfs/initrd-stuff/etc/functions1
-rw-r--r--initramfs/initrd-stuff/etc/messages1
2 files changed, 1 insertions, 1 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 4dbaf746..0d852043 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -97,7 +97,6 @@ else
echo -e "${error_msg}${e_msg}${error_shell}"
# load usb modules to have keyboard enabled - they might have to be
# copied into initramfs with mkdxsinitramfs ...
- modprobe -a usbcore uhci-hcd ohci-hcd usbhid >/dev/null 2>&1
/bin/sh
echo -n "Reboot now? [y]"
exec < /dev/console > /dev/console
diff --git a/initramfs/initrd-stuff/etc/messages b/initramfs/initrd-stuff/etc/messages
index 1658aa4d..c176cb3f 100644
--- a/initramfs/initrd-stuff/etc/messages
+++ b/initramfs/initrd-stuff/etc/messages
@@ -82,6 +82,7 @@ after this file was created on server."
init_errcfg="of this client did not finish in\n time. You might check the \
process list and list the modules loaded until\n now."
init_errhw=" For some reason the hardware autoconfig $init_errcfg"
+init_errxorg=" For some reason no xorg.conf appeared"
init_errsw=" For some reason the software configuration $init_errcfg"
init_wait=" Waited $i ticks to unmount kernel module directory ..."
init_errumnt=" Unmount of the kernel modules directory \