mkdxsinitrd Ubunutuversionserkennung angepasst.

distrospecs verschiedene Dienste zum starten gebracht.




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

1 files changed, 13 insertions, 9 deletions

diff --git a/initrd/distro-specs/ubuntu/functions-default b/initrd/distro-specs/ubuntu/functions-default
index 9b1479d4..75a94176 100644
--- a/initrd/distro-specs/ubuntu/functions-default
+++ b/initrd/distro-specs/ubuntu/functions-default
@@ -27,15 +27,12 @@ preinit () {
 #overwrite settings set by hwautocfg
 displayvars (){
 Files=' \t 	  FontPath\t\t       "/usr/share/X11/fonts/misc"\n
-\t        FontPath\t\t    "/usr/share/X11/fonts/cyrillic"\n
 \t        FontPath\t\t   "/usr/share/X11/fonts/100dpi/:unscaled"\n
 \t        FontPath\t\t    "/usr/share/X11/fonts/75dpi/:unscaled"\n
 \t        FontPath\t\t    "/usr/share/X11/fonts/Type1"\n
 \t        FontPath\t\t    "/usr/share/X11/fonts/100dpi"\n
 \t        FontPath\t\t    "/usr/share/X11/fonts/75dpi"\n
-\t        # path to defoma fonts\n
-\t        FontPath\t\t    "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"\n'
-
+'
 Module=' \t        Load\t	    "i2c"\n
 \t        Load\t	    "bitmap"\n
 \t        Load\t	    "ddc"\n
@@ -83,7 +80,6 @@ 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"
   fi
 done
 }
@@ -139,6 +135,7 @@ fi
 # syslog service
 config_syslog () {
 if [ "x$start_syslog" = "xyes" ] ; then
+  testmkd /mnt/var/log/news
   echo -e "# /etc/syslog.conf - file generated by $0" >/mnt/etc/syslogd.conf
   echo "kern.warn;*.err;authpriv.none\t/dev/tty10\n\
 #kern.warn;*.err;authpriv.none\t|/dev/xconsole\n\
@@ -184,8 +181,11 @@ echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
 }
 # acpi and powersave
 config_acpi () {
-  rllinker "acpid" "02" "19"
-  rllinker "acpi-support" "20" "02"
+  rllinker "acpid" "10" "19"
+  rllinker "acpi-support" "99" "02"
+
+  # nur hier wiel udev_hotplug zu früh aufgerufen wird.
+  rllinker "udev" "18" "25"
 }
 
 # configure gdm as display manager
@@ -201,7 +201,7 @@ config_kdm () {
 # configure hal, dbus, resmgr and services like that
 config_dreshal () {
 if [ "x$start_dreshal" = "xyes" ]; then
-  :
+  rllinker "dbus" "17" "20" 
 fi
 }
 
@@ -232,6 +232,8 @@ esac
 # fixme!! taken from SuSE10.0 untested here ...
 # prepare virtual machine environment (vmware, vmplayer)
 config_vmware () {
+if [ -f /mnt/etc/init.d/vmware-prep ] ; then
+if [ -f /mnt/etc/init.d/vmware ] ; then
 rllinker "vmware-prep" "18" "02"
 rllinker "vmware" "20" "02"
 # during vmware sessions linux should not handle usb events/devices
@@ -251,6 +253,8 @@ Suchodoletz, <dirk@goe.net>\nSUBSYSTEM==\"usb\", ACTION==\"add\", \
 PROGRAM=\"/var/X11R6/bin/vm-udev\", OPTIONS=\"ignore_device\"\n\
 SUBSYSTEM==\"usb\", ACTION==\"remove\", PROGRAM=\"/var/X11R6/bin/vm-udev\"" \
   >> /mnt/etc/udev/rules.d/01-udev-vm.rules
+fi
+fi
 }
 
 # configure automounter
@@ -284,7 +288,7 @@ fi
 
 # start portmapper (needed at least for nfs and nis services)
 config_portmap () {
-  rllinker "portmap" "02" "20"
+  rllinker "portmap" "18" "20"
 }
 
 # start NIS (fixmee - does the service is really named ypbind??)