From bd2e40f5ceded5d0924c8791fe7b995f9e76bca4 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 6 Dec 2007 00:03:03 +0000
Subject: Heavy cleanup after changing xorg configuration ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1423 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/init | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'initramfs/initrd-stuff/init')

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"
-- 
cgit v1.2.3-55-g7522