diff options
| author | Felix Endres | 2007-03-26 00:17:23 +0200 |
|---|---|---|
| committer | Felix Endres | 2007-03-26 00:17:23 +0200 |
| commit | 2a0a336f50a867be63eec63035d1d874cde6624b (patch) | |
| tree | 68ac365733e8313c0d7f6e4d662fee090810066b /initramfs/distro-specs | |
| parent | * fixed some minor problems with respect to meta-packager (diff) | |
| download | core-2a0a336f50a867be63eec63035d1d874cde6624b.tar.gz core-2a0a336f50a867be63eec63035d1d874cde6624b.tar.xz core-2a0a336f50a867be63eec63035d1d874cde6624b.zip | |
Rearranging start scripts
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@820 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/distro-specs')
| -rw-r--r-- | initramfs/distro-specs/ubuntu/functions-6.10 | 19 | ||||
| -rw-r--r-- | initramfs/distro-specs/ubuntu/functions-default | 5 |
2 files changed, 22 insertions, 2 deletions
diff --git a/initramfs/distro-specs/ubuntu/functions-6.10 b/initramfs/distro-specs/ubuntu/functions-6.10 index a9823410..2943e885 100644 --- a/initramfs/distro-specs/ubuntu/functions-6.10 +++ b/initramfs/distro-specs/ubuntu/functions-6.10 @@ -125,3 +125,22 @@ sed -e "s,LANGUAGE=.*,LANGUAGE=${LANG},;s,LANG=.*,LANG=${LANG}," \ -i /mnt/etc/environment rllinker "console-screen.sh" "31" "03" } + +# configure kdm as display manager +config_kdm () { +# first define directories for kdm +kdmrcdir=/etc/kde3/kdm +xdmdir=/etc/kde3/kdm + +testmkd /mnt/${kdmrcdir} + +#if [ "x$late_dm" = "xyes" ] ; then + rllinker "kdm" "03" "01" + if [ "x$start_xdmcp" = "xkdm" ]; then + echo /usr/bin/kdm > /mnt/etc/X11/default-display-manager + fi +# write configuration file +# use general config in /etc/functions +config_kdm_template +} + diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default index b07b9634..52b2c6c7 100644 --- a/initramfs/distro-specs/ubuntu/functions-default +++ b/initramfs/distro-specs/ubuntu/functions-default @@ -86,7 +86,7 @@ for i in rc2.d/K$stop$script rc3.d/K$stop$script \ break else ln -sf ../init.d/$script /mnt/etc/$i - echo "Linked $script" + [ "$DEBUGLEVEL" == 5 ] && echo "Linked $script" fi done } @@ -200,7 +200,8 @@ echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \ # acpi and powersave config_acpi () { rllinker "acpid" "10" "19" - rllinker "acpi-support" "99" "02" + #Commented out since battery checking is only useful for Notebooks + #rllinker "acpi-support" "99" "02" # nur hier weil udev_hotplug zu früh aufgerufen wird. rllinker "udev" "11" "25" |