+ added Source for pcitable (as Header)\n+ added binary Drivers definition in Cards\n+ changed runtime configuration for Gentoo\n+ added services & changed configuration for Gentoo

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1215 95ad53e4-c205-0410-b2fa-d234c58c8868

4 files changed, 11 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
diff --git a/initramfs/initrd-stuff/usr/share/hwdata/Cards b/initramfs/initrd-stuff/usr/share/hwdata/Cards
index 69ddcc40..a8657577 100644
--- a/initramfs/initrd-stuff/usr/share/hwdata/Cards
+++ b/initramfs/initrd-stuff/usr/share/hwdata/Cards
@@ -2245,6 +2245,9 @@ DRIVER radeon
 NAME ATI Radeon X800XT
 DRIVER radeon
 
+NAME ATI Radeon (fglrx)
+DRIVER fglrx
+
 #NAME ATI Radeon Xpress 200
 #DRIVER fglrx # radeon leads to  black screen ?!?
 
@@ -3234,6 +3237,7 @@ NOCLOCKPROBE
 NAME NVIDIA GeForce
 CHIPSET GeForce
 DRIVER nv
+#DRIVER nvidia
 NOCLOCKPROBE
 
 NAME ELSA VICTORY ERAZOR
diff --git a/initramfs/initrd-stuff/usr/share/hwdata/pcitable b/initramfs/initrd-stuff/usr/share/hwdata/pcitable
index 5bfeb870..ea8a43ce 100644
--- a/initramfs/initrd-stuff/usr/share/hwdata/pcitable
+++ b/initramfs/initrd-stuff/usr/share/hwdata/pcitable
@@ -1,3 +1,7 @@
+# SOURCE: 
+# mirror://gentoo/hwdata-gentoo-0.3.tar.bz2
+#    http://dev.gentoo.org/~wolf31o2/sources/hwdata-gentoo/hwdata-gentoo-0.3.tar.bz2
+#
 0x0000	0x0000	"snd-cs46xx"	"Card without SSID set"
 0x0001	0x1002	"bttv"	"ATI Technologies Inc.|TV Wonder"
 0x0001	0x1461	"bttv"	"AVerMedia|TVPhone98"