diff options
| author | Dirk von Suchodoletz | 2006-02-05 20:44:41 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-02-05 20:44:41 +0100 |
| commit | 9ea2524ae864bf1b919c3fd81098ef8ff61408d4 (patch) | |
| tree | ef9562c1e2dc349398bf33f3182fedeb50dba2c9 /initrd | |
| parent | Small bug in init prevented system to start with NFS root filesystem. (diff) | |
| download | core-9ea2524ae864bf1b919c3fd81098ef8ff61408d4.tar.gz core-9ea2524ae864bf1b919c3fd81098ef8ff61408d4.tar.xz core-9ea2524ae864bf1b919c3fd81098ef8ff61408d4.zip | |
Small hack to handle start of display manager in a better way - avoid
double starts during bootup of client.
git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@61 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd')
| -rw-r--r-- | initrd/distro-specs/suse/functions-9.3 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3 index 2184f8f6..44d28ce5 100644 --- a/initrd/distro-specs/suse/functions-9.3 +++ b/initrd/distro-specs/suse/functions-9.3 @@ -4,7 +4,7 @@ # functions file). This file is the main base for the # following SuSE distributions # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 03-02-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 05-02-2006 # Blabla # Blub # @@ -173,11 +173,13 @@ sed -e "s,DISPLAYMANAGER=.*,DISPLAYMANAGER=\"$start_xdmcp\"," \ -e "s,.*_XSERVER.*,DISPLAYMANAGER_STARTS_XSERVER=\"$dm\"," \ /mnt/etc/sysconfig/displaymanager > /etc/displaymanager cp /etc/displaymanager /mnt/etc/sysconfig/displaymanager -# start the display manager as early as possible -ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITDIR}/rc5.d/S01xdm +# start the display manager as early as possible, but avoid that is +# started twice during bootup - quickhack ... +#ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITDIR}/rc5.d/S01xdm ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITDIR}/rc5.d/K20xdm -echo -e "\t/etc/init.d/xdm start >${LOGFILE} 2>&1\n" \ - >>/mnt/etc/${D_INITDIR}/boot.ld +echo -e "\t/etc/init.d/xdm start >${LOGFILE} 2>&1\n\t( sleep 60; \ +ln -sf /etc/${D_INITDIR}/xdm /etc/${D_INITDIR}/rc5.d/S01xdm \ +>${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld } # configure X display manager (runlevel links and kind of manager) |