diff options
Diffstat (limited to 'initramfs/distro-specs')
-rw-r--r-- | initramfs/distro-specs/gentoo/config-default | 2 | ||||
-rw-r--r-- | initramfs/distro-specs/gentoo/functions-default | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/initramfs/distro-specs/gentoo/config-default b/initramfs/distro-specs/gentoo/config-default index 5ff1becf..a46ad078 100644 --- a/initramfs/distro-specs/gentoo/config-default +++ b/initramfs/distro-specs/gentoo/config-default @@ -42,7 +42,7 @@ D_INITDIR="/init.d" D_INITBOOTD="/runlevels/boot" D_INITDEFAULT="3" D_RCDIRS="/runlevels/default /runlevels/single /runlevels/nonetwork" -D_INITSCRIPTS="localmount keymaps clock urandom resmgrd splash autofs dbus ivman local" +D_INITSCRIPTS="localmount keymaps clock urandom resmgrd autofs dbus ivman local portmap ntp-client syslog-ng sshd" D_XF86CONFFILE="/etc/X11/xorg.conf" D_XORGBIN=/usr/bin/Xorg D_XFONTPATH="/usr/share/fonts/*" diff --git a/initramfs/distro-specs/gentoo/functions-default b/initramfs/distro-specs/gentoo/functions-default index 317dc9fb..6e1d45e1 100644 --- a/initramfs/distro-specs/gentoo/functions-default +++ b/initramfs/distro-specs/gentoo/functions-default @@ -282,11 +282,9 @@ testmkd /mnt/${kdmrcdir} # setting the path for kdmrc-file # FIXME: hack - there is no other way in gentoo?!? -# FIXME: only if user wants kdm... -sed -e 's,\(save_options .*\)"$,\1 -- -config /var/lib/openslx/themes/displaymanager/kdmrc",g'\ +sed -e 's,\(PIDFILE:.*\)|| \\$,\1 -- -config /var/lib/openslx/themes/displaymanager/kdmrc || \\,g'\ -i /mnt/etc/init.d/xdm - # write configuration file - NOT using general config in /etc/functions ##config_kdm_template @@ -315,7 +313,7 @@ Setup=/usr/kde/3.5/share/config/kdm/Xsetup Startup=/usr/kde/3.5/share/config/kdm/Xstartup Reset=/usr/kde/3.5/share/config/kdm/Xreset Session=/usr/kde/3.5/share/config/kdm/Xsession -AllowRootLogin=false +AllowRootLogin=true AllowNullPasswd=false AllowShutdown=Root SessionsDirs=/etc/X11/sessions,/usr/share/xsessions |