summaryrefslogtreecommitdiffstats
path: root/initramfs/initrd-stuff/init
diff options
context:
space:
mode:
authorDirk von Suchodoletz2007-12-06 01:03:03 +0100
committerDirk von Suchodoletz2007-12-06 01:03:03 +0100
commitbd2e40f5ceded5d0924c8791fe7b995f9e76bca4 (patch)
tree7f8b02f01902b8ac2d42cfd38095ff9d9ffdf09e /initramfs/initrd-stuff/init
parentIntroduced completely new approach of xorg.conf setup into stage3 ... seems to (diff)
downloadcore-bd2e40f5ceded5d0924c8791fe7b995f9e76bca4.tar.gz
core-bd2e40f5ceded5d0924c8791fe7b995f9e76bca4.tar.xz
core-bd2e40f5ceded5d0924c8791fe7b995f9e76bca4.zip
Heavy cleanup after changing xorg configuration ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1423 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/init')
-rwxr-xr-xinitramfs/initrd-stuff/init3
1 files changed, 1 insertions, 2 deletions
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index a4f48c87..f3d4ae7a 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -767,11 +767,10 @@ waitfor /tmp/hwcfg 20000 || error "$init_errhw"
>> /mnt/etc/udev/rules.d/04-scanner.rules
# move Xorg configuration to final destination depending if user or system
# generated
-#waitfor /tmp/xready 10000 || error "$init_errxorg" nonfatal
if [ -f /rootfs${D_XF86CONFFILE#/mnt} ] ; then
mv /rootfs${D_XF86CONFFILE#/mnt} /mnt/${D_XF86CONFFILE}
else
- mv /tmp/xorg.conf /mnt/${D_XF86CONFFILE}
+ mv /tmp/xorg.conf /mnt/${D_XF86CONFFILE} || error "$init_errxorg" nonfatal
fi
# wait a while for services setup to complete
waitfor /tmp/svcfg 10000 || error "$init_errsw"