diff options
| author | Dirk von Suchodoletz | 2007-12-05 23:55:25 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-12-05 23:55:25 +0100 |
| commit | 710f6b4b6da9af46e94e386ca4e39dad6cfee45e (patch) | |
| tree | 3047336f83745a1e90cd6cd8e8089af287becaf5 /initramfs/initrd-stuff/init | |
| parent | Starting new configuration line for Xorg setup ... (diff) | |
| download | core-710f6b4b6da9af46e94e386ca4e39dad6cfee45e.tar.gz core-710f6b4b6da9af46e94e386ca4e39dad6cfee45e.tar.xz core-710f6b4b6da9af46e94e386ca4e39dad6cfee45e.zip | |
Introduced completely new approach of xorg.conf setup into stage3 ... seems to
work for me, but to be checked and reported :)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1422 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/init')
| -rwxr-xr-x | initramfs/initrd-stuff/init | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index b126a744..a4f48c87 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -765,9 +765,14 @@ fi waitfor /tmp/hwcfg 20000 || 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 10000 || error "$init_errxorg" nonfatal -mv /etc/xorg.conf /mnt/${D_XF86CONFFILE} +# 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} +fi # wait a while for services setup to complete waitfor /tmp/svcfg 10000 || error "$init_errsw" # IP configuration is complete and should not be updated automatically |