summaryrefslogtreecommitdiffstats
path: root/initramfs/initrd-stuff/init
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/init
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/init')
-rwxr-xr-xinitramfs/initrd-stuff/init3
1 files changed, 3 insertions, 0 deletions
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index cdd6ec79..d3881fc4 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -593,6 +593,9 @@ fi
waitfor /tmp/hwcfg 30000 || error "$init_errhw"
[ -f /tmp/scanner-udev ] && cat /tmp/scanner-udev \
>> /mnt/etc/udev/rules.d/04-scanner.rules
+# wait for completion of Xorg configuration and finalize it
+waitfor /tmp/xready 20000 || error "$init_errxorg" nonfatal
+cp /etc/xorg.conf /mnt/${D_XF86CONFFILE}
# wait a while for services setup to complete
waitfor /tmp/svcfg 20000 || error "$init_errsw"
# IP configuration is complete and should not be updated automatically