Cleanup for SuSE stage3, placeholders for 10.3 support added ...

(to be checked if beta is available)


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

1 files changed, 6 insertions, 14 deletions

diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2
index c24ad571..2fee60d2 100644
--- a/initramfs/distro-specs/suse/functions-10.2
+++ b/initramfs/distro-specs/suse/functions-10.2
@@ -17,21 +17,18 @@
 preinit () {
 # fake the existence of some helper binaries/scripts (which are not of any use
 # within initialramfs)
-local shell="/bin/sh"
 local item
-if [ -x /bin/busybox ] ; then
-  shell="/bin/ash"
-else
+if [ ! -x /bin/busybox ] ; then
   for item in hwup ifup ; do
-    echo -e "#!$shell\n:" >/sbin/${item}
+    echo -e "#!/bin/sh\n:" >/sbin/${item}
   done
-  mkdir /lib/udev /usr/sbin
+  mkdir -p /lib/udev /usr/sbin
   for item in usb_id scsi_id vol_id edd_id ata_id path_id cdrom_id idedma.sh \
            mount.sh rename_netiface firmware.sh create_floppy_devices \
            trigger_firmware_loading.sh ; do
-    echo -e "#!$shell\n# do nothing here\n:" >/lib/udev/${item}
+    echo -e "#!/bin/sh\n# do nothing here\n:" >/lib/udev/${item}
   done
-  echo -e "#!$shell\n:" >/usr/sbin/alsactl
+  echo -e "#!/bin/sh\n:" >/usr/sbin/alsactl
   rm /etc/udev/rules.d/60-persistent-storage.rules 2>/dev/null
   chmod u+x /sbin/* /lib/udev/* /usr/sbin/*
   echo -e "tty:x:5:\ndisk:x:6:\nlp:x:7:\nkmem:x:9:\nuucp:x:14:\n\
@@ -39,7 +36,7 @@ dialout:x:16:\naudio:x:17:\nvideo:x:33:\nvboxusers:!:1000:" > /etc/group
   echo -e "root:x:0:0:::\nasterisk:x:106:16:::" > /etc/passwd
 fi
 }
-
+# display manager configuration
 config_kdm () {
 # first define directories for kdm
 kdmrcdir=/etc/opt/kde3/share/config/kdm
@@ -52,7 +49,6 @@ config_dm_entry yes
 # write configuration file with general config from /etc/functions
 config_kdm_template
 }
-
 # udev service - auto creation of device files
 udev_hotplug () {
 local result=0
@@ -66,7 +62,6 @@ else error "$df_errudev" nonfatal
 fi
 return $result
 }
-
 # 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 
@@ -115,7 +110,6 @@ if [ "x$start_dreshal" = "xyes" ]; then
   fi
 fi
 }
-
 # config nfsv4
 config_nfsv4 () {
 if [ "x$start_nfsv4" = "xyes" ]; then
@@ -134,7 +128,6 @@ echo -e "\t# stuff needed for nfsv4\n\tmount -t rpc_pipefs rpc_pipefs \
   rllinker "gssd" "15" "07"
 fi
 }
-
 # prepare virtual machine environment (vmware, vmplayer)
 config_vmware () {
 rllinker "vmware-prep" "18" "02"
@@ -164,7 +157,6 @@ SUBSYSTEM==\"usb\", ACTION==\"remove\", PROGRAM=\"/var/X11R6/bin/vm-udev\"" \
     >> /mnt/etc/udev/rules.d/01-udev-vm.rules
 fi
 }
-
 # set up keytable (function run in hwautocfg)
 # kbd runlevel link is in the list of initial runlevel scripts (see 
 # suse/config-10.2 file)