Some fixes and cleanup of functions files for several SuSE versions ...

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

6 files changed, 26 insertions, 132 deletions

diff --git a/initramfs/distro-specs/suse/functions-10.0 b/initramfs/distro-specs/suse/functions-10.0
index 69d61887..79e1043c 100644
--- a/initramfs/distro-specs/suse/functions-10.0
+++ b/initramfs/distro-specs/suse/functions-10.0
@@ -34,3 +34,7 @@ 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
 }
+# Xorg variable settings. Lots of stuff changes for newer Xorg servers
+displayvars () {
+synapticsdrv="/usr/X11R6/lib/modules/input/synaptics_drv.o"
+}
diff --git a/initramfs/distro-specs/suse/functions-10.1 b/initramfs/distro-specs/suse/functions-10.1
index 7b32871e..424819e6 100644
--- a/initramfs/distro-specs/suse/functions-10.1
+++ b/initramfs/distro-specs/suse/functions-10.1
@@ -131,3 +131,8 @@ case "${XMODULE}" in
   ;;
 esac
 }
+
+# Xorg variable settings. Lots of stuff changes for newer Xorg servers
+displayvars () {
+synapticsdrv="/usr/X11R6/lib/modules/input/synaptics_drv.o"
+}
diff --git a/initramfs/distro-specs/suse/functions-10.3 b/initramfs/distro-specs/suse/functions-10.3
index 63523a9d..e59e1c84 100644
--- a/initramfs/distro-specs/suse/functions-10.3
+++ b/initramfs/distro-specs/suse/functions-10.3
@@ -13,67 +13,6 @@
 # defined in general SuSE base definitions ...  General changes should be done
 # there, version specific changes for the 10.3 go here.
 
-# display manager configuration
-config_kdm () {
-# first define directories for kdm
-kdmrcdir=/etc/opt/kde3/share/config/kdm
-xdmdir=/etc/X11/xdm
-# use different kdmrc than default, since 10.2 in /opt/kde/...
-echo 'XDMOPTIONS="-config /etc/opt/kde3/share/config/kdm/kdmrc"' \
-  >> /mnt/etc/sysconfig/displaymanager
-testmkd /mnt/${kdmrcdir}
-config_dm_entry yes
-# write configuration file with general config from /etc/functions
-config_kdm_template
-}
-# configure dbus (inter application communication for kde and gnome), hal
-# (hardware abstraction layer - used e.g. by powersaved), resmgr and 
-# policykitd (resource manager/policykitd - the user gets permissions to 
-# devices when loggin on)
-config_dreshal () {
-if [ "x$start_dreshal" = "xyes" ]; then
-  local start="05"
-  local stop="18"
-  if [ -f /mnt/etc/${D_INITDIR}/dbus ] ; then
-    strinfile "messagebus:" /mnt/etc/passwd || \
-      echo "messagebus:x:100:101:User for D-BUS:/var/run/dbus:/bin/false" \
-        >> /mnt/etc/passwd
-    strinfile "messagebus:" /mnt/etc/group || \
-      echo "messagebus:!:101:" >> /mnt/etc/group
-    testmkd /mnt/var/run/dbus
-    # set permissions with userid
-    echo -e "\tchown messagebus:messagebus /var/run/dbus 2>/dev/null" \
-      >>/mnt/etc/${D_INITDIR}/boot.slx
-    rllinker "dbus" "$start" "$stop"
-  fi
-  if [ -f /mnt/etc/${D_INITDIR}/resmgr ] ; then
-    testmkd /mnt/var/run/resmgr/classes
-    start="0"$(expr $start + 1)
-    stop="0"$(expr $start - 1)
-    rllinker "resmgr" "$start" "$stop"
-  fi
-  if [ -f /mnt/etc/${D_INITDIR}/policykitd ] ; then
-    testmkd /mnt/var/run/polkit
-    start="0"$(expr $start + 1)
-    stop="0"$(expr $start - 1)
-    rllinker "policykitd" "$start" "$stop"
-  fi
-  if [ -f /mnt/etc/${D_INITDIR}/haldaemon ] ; then
-    strinfile "haldaemon:" /mnt/etc/passwd || \
-      echo "haldaemon:x:105:103:User for haldaemon:/var/run/hal:/bin/false" \
-        >> /mnt/etc/passwd
-    strinfile "haldaemon:" /mnt/etc/group || \
-      echo "haldaemon:!:103:" >> /mnt/etc/group
-    testmkd /mnt/var/run/hal
-    # set permissions with userid
-    echo -e "\tchown haldaemon:haldaemon /var/run/hal 2>/dev/null" \
-      >>/mnt/etc/${D_INITDIR}/boot.slx
-    start="0"$(expr $start + 1)
-    stop="0"$(expr $start - 1)
-    rllinker "haldaemon" "$start" "$stop"
-  fi
-fi
-}
 # config nfsv4
 config_nfsv4 () {
 if [ "x$start_nfsv4" = "xyes" ]; then
@@ -88,19 +27,11 @@ echo -e "\t# stuff needed for nfsv4\n\tmount -t rpc_pipefs rpc_pipefs \
 >>/mnt/etc/${D_INITDIR}/boot.slx
   # portmap is required for any NFS
   config_portmap
-  rllinker "idmapd" "14" "08"
-  rllinker "gssd" "15" "07"
+  rllinker "idmapd" 14 8
+  rllinker "gssd" 15 7
 fi
 }
-# prepare virtual machine environment (vmware, vmplayer)
-config_vmware () {
-rllinker "vmware-prep" "18" "02"
-rllinker "vmware" "20" "02"
-sed -e "s,TARGETS =,TARGETS = vmware-prep," \
-  /mnt/etc/${D_INITDIR}/.depend.start >> /etc/.depend.start
-  echo "vmware-prep: " >> /etc/.depend.start
-  cp /etc/.depend.start /mnt/etc/${D_INITDIR}/.depend.start
-}
+
 # set up keytable (function run in hwautocfg)
 # kbd runlevel link is in the list of initial runlevel scripts (see 
 # suse/config-10.2 file)
@@ -110,7 +41,7 @@ sed -e "/wanted keytable/,/^fi$/d;/load usb drivers/,/^esac$/d" \
   -i /mnt/etc/${D_INITDIR}/kbd
 sed -e "s,KEYTABLE=.*,KEYTABLE=\"${KEYTABLE}\"," \
   -i /mnt/etc/${D_SYSCONFDIR}/keyboard
-rllinker kbd "01" "20"
+rllinker kbd 1 20
 }
 
 # consolefont and language (function run in hwautocfg)
@@ -119,62 +50,6 @@ sed -e "s,RC_LANG=.*,RC_LANG=\"${LANG}\" # added in initrd," \
     -i /mnt/etc/${D_SYSCONFDIR}/language
 }
 
-# check the glx and tvout stuff and configure it
-checkgraphix () {
-# test if unionfs
-case "${XMODULE}" in
-  radeon)
-    # IGP is not supported with fglrx driver (at least not in some versions)
-    # comment if it works properly ...
-    if ! strinfile " IGP" /tmp/hwsetup.info ; then
-      # check ${XDESC}/ hwsetup.info device string in Cards file and then
-      # for needed components
-      test -e /mnt/lib/modules/${KERNEL}/kernel/drivers/char/drm/fglrx.ko \
-        && test -e /mnt/usr/lib/xorg/modules/drivers/fglrx_drv.* && { 
-          XMODULE=fglrx
-          # it only works for UnionFS enabled systems or put it in preload
-          # but that might be not to clever :-)
-          ln -sf /usr/lib/xorg/libGL.so.1.2 \
-            /mnt/usr/lib/libGL.so.1.2 2>/dev/null || \
-          echo -e "/usr/lib/xorg/libGL.so.1.2\n/usr/lib/xorg/libGL.so.1\n\
-/usr/lib/xorg/libGL.so" >/mnt/etc/ld.so.preload
-          }
-      # check whether to enable tvout
-      if [ -n "$tvout" ] && [ "$tvout" != "no" -a "$tvout" != "NO" ] ; then
-        [ "$tvout" = "yes" ] && tvout="PAL-B"
-        TVOUT='\tOption\t\t"TVFormat" "'$tvout
-        TVOUT=$TVOUT'"\n\tOption\t\t"DesktopSetup" "horizontal"'
-      fi
-    fi
-  ;;
-  nv)
-    # check for needed components
-    test -e /mnt/lib/modules/${KERNEL}/kernel/drivers/char/drm/nvidia.ko \
-      && test -e /mnt/usr/X11R6/lib/modules/drivers/nvidia_drv.* && {
-        gllib=$(ls /mnt/usr/X11R6/lib/libGL.so.1.0.* 2>/dev/null|sed -n "1p")
-        if [ -n "$gllib" ] ; then
-          ln -sf ${gllib#/mnt} /mnt/usr/lib/libGL.so.1 2>/dev/null
-          # same for GLcore lib
-          gllib=$(ls /mnt/usr/X11R6/lib/libGLcore.so.1.0.* 2>/dev/null|\
-            sed -n "1p")
-          ln -sf ${gllib#/mnt} /mnt/usr/lib/libGLcore.so.1.0 2>/dev/null \
-            || fail=1
-          # load server modules (trick put the path before the official one)
-          testmkd /mnt/etc/X11/modules
-          ln -sf /usr/lib/xorg/modules/updates/extensions/libglx.so \
-            /mnt/etc/X11/modules/libglx.so || fail=1
-          ln -sf /usr/lib/xorg/modules/updates/drivers/nvidia_drv.so \
-            /mnt/etc/X11/modules/nvidia_drv.so || fail=1
-          [ -z $fail ] && XMODULE=nvidia
-          # ensure proper permissions for nvidia devices
-          echo -e "# nvidia stuff added by $0 in InitRamFS\nKERNEL==\"nvidia*|nvidiactl*\",\
-GROUP=\"video\",MODE=\"0666\"" > /mnt/etc/udev/rules.d/10-nvidia-devperms.rules
-       fi
-       }
-  ;;
-esac
-}
-
 # Xorg variable settings. Lots of stuff changed since 10.2
 displayvars () {
 Files='\tModulePath\t"/etc/X11/modules"\n
diff --git a/initramfs/distro-specs/suse/functions-9.3 b/initramfs/distro-specs/suse/functions-9.3
index 210fc4da..fdfc8b07 100644
--- a/initramfs/distro-specs/suse/functions-9.3
+++ b/initramfs/distro-specs/suse/functions-9.3
@@ -59,3 +59,7 @@ if [ "x$start_dreshal" = "xyes" ]; then
   fi
 fi
 }
+# Xorg variable settings. Lots of stuff has changed for newer Xorg servers
+displayvars () {
+synapticsdrv="/usr/X11R6/lib/modules/input/synaptics_drv.o"
+}
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 485bc06d..a5514975 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -513,7 +513,13 @@ rerun\n# the mkdxsinitrd script to get them applied\n\
   ;;
 esac
 }
-# Xorg variable settings. Lots of stuff changes for newer Xorg servers
+# Xorg variable settings. Lots of stuff changed since 10.2
 displayvars () {
-synapticsdrv="/usr/X11R6/lib/modules/input/synaptics_drv.o"
+Files='\tModulePath\t"/etc/X11/modules"\n
+\tModulePath\t"/usr/lib/xorg/modules"\n
+\tFontPath\t"/usr/share/fonts/misc/:unscaled"\n
+\tFontPath\t"/usr/share/fonts/75dpi/:unscaled"\n
+\tFontPath\t"/usr/share/fonts/100dpi/:unscaled"'
+synapticsdrv="/usr/lib/xorg/modules/input/synaptics_drv.so"
 }
+
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index 8940b9a7..6e8c0dda 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -77,7 +77,7 @@ while [ $len -le 30 ] ; do
   len=$(($len + 1))
 done
 echo "
-   WELCOME TO                 $space     \n (\l)
+   WELCOME TO                 $space       \n (\l)
            _____  ______  ______ __    __    _______ __     __    __
           /  _   |   _   |   ___|  |  |  |  |   ____|  |   |  |  |  |
          |  | |  |  |_|  |  |_  |   |    |  |  |___ |  |        /  /