diff options
| author | Felix Endres | 2006-07-26 18:32:10 +0200 |
|---|---|---|
| committer | Felix Endres | 2006-07-26 18:32:10 +0200 |
| commit | 0798a9d4352ae5451434084322eaff7c28edd2ff (patch) | |
| tree | e954c254df0242e0ddaca28e76a55c9e24611c3d /initrd/distro-specs/ubuntu | |
| parent | Added function for URI interpretation, enabling URI notation for several (diff) | |
| download | core-0798a9d4352ae5451434084322eaff7c28edd2ff.tar.gz core-0798a9d4352ae5451434084322eaff7c28edd2ff.tar.xz core-0798a9d4352ae5451434084322eaff7c28edd2ff.zip | |
Mainly Fixes for Ubuntu 5.10
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@286 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/distro-specs/ubuntu')
| -rw-r--r-- | initrd/distro-specs/ubuntu/config-5.10 | 5 | ||||
| -rw-r--r-- | initrd/distro-specs/ubuntu/functions-5.10 | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/initrd/distro-specs/ubuntu/config-5.10 b/initrd/distro-specs/ubuntu/config-5.10 index 32a63559..551156da 100644 --- a/initrd/distro-specs/ubuntu/config-5.10 +++ b/initrd/distro-specs/ubuntu/config-5.10 @@ -1,5 +1,3 @@ -<<<<<<< .mine -======= # Description: distro specific settings for Ubuntu Hoary Hedgehog (5.10) # defaults are taken from config-default file # @@ -29,5 +27,4 @@ # D_BOOTLOCAL - script for user specified stuff which should be started # during client bootup, path and file relative to /etc -# no changes from default ->>>>>>> .r256 +# no changes from default except: diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10 index 84cc1eff..76ea7585 100644 --- a/initrd/distro-specs/ubuntu/functions-5.10 +++ b/initrd/distro-specs/ubuntu/functions-5.10 @@ -302,10 +302,11 @@ fi # configure kdm as display manager config_kdm () { - ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/K20kdm - echo -e "\t/etc/${D_INITDIR}/kdm start >${LOGFILE} 2>&1\n\ - \t( sleep 120; ln -sf /etc/${D_INITDIR}/kdm /etc/rc3.d/S01kdm \ - >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld + rllinker "kdm" "25" "01" +# ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/K20kdm +# echo -e "\t/etc/${D_INITDIR}/kdm start >${LOGFILE} 2>&1\n\ +# \t( sleep 120; ln -sf /etc/${D_INITDIR}/kdm /etc/rc3.d/S01kdm \ +# >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld } # configure hal, dbus, resmgr and services like that |