diff options
Diffstat (limited to 'initrd/distro-specs/suse/functions-9.3')
| -rw-r--r-- | initrd/distro-specs/suse/functions-9.3 | 101 |
1 files changed, 25 insertions, 76 deletions
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3 index 6bf69f2c..6aa1d4b6 100644 --- a/initrd/distro-specs/suse/functions-9.3 +++ b/initrd/distro-specs/suse/functions-9.3 @@ -102,7 +102,7 @@ if [ "x$start_syslog" = "xyes" ] ; then # logging servers might be specified in $log_servers (from e.g. dhcp) echo -e "# File modified by $0 within initial ramdisk" \ > /etc/syslog-ng.conf - sed -e "s,.*dhcp/dev.*,," -e "s,.*named/dev.*,," \ + sed -e "s,.*dhcp/dev.*,,;s,.*named/dev.*,," \ /mnt/etc/syslog-ng/syslog-ng.conf >> /etc/syslog-ng.conf cp /etc/syslog-ng.conf /mnt/etc/syslog-ng/syslog-ng.conf rllinker syslog "02" "20" @@ -132,55 +132,6 @@ if [ "x$start_snmp" = "xyes" ] ; then fi } -# x11 stuff --> obsoleted by new vmware integration concept -#descsession () { -#if [ "x$desktop_session" != "x" ] ; then -# windowmanagers="$desktop_session" -# # write script for desktop-session chooser -# if [ "x$vmware" != "xno" ] ; then -# debug="" -# [ ${DEBUGLEVEL} -gt 0 ] && debug="--debug 1" -# echo -e "#!/bin/sh\n#\n# file generated by\n#\t$0:\n#\t$date\n -#OSTYPE=\`echo \$0 | sed -e \"s,-, ,\" -e \"s,.*/,,\" | awk '{print \$1}'\` -#SPECTYPE=\`echo \$0 | sed -e \"s,-, ,\" -e \"s,.*/,,\" | awk '{print \$2}'\`\n -#OPTS=\"-o \$OSTYPE \${SPECTYPE:+\"-s \$SPECTYPE\"}\"\n -#xterm -bg black -fg white -geometry 170x30+0-0 +sb \ -#-e \"runvmware \$OPTS $debug\"\n" > /mnt/var/X11R6/bin/desktop-session -# chmod a+x /mnt/var/X11R6/bin/desktop-session -# addpath="true"; -# fi -#else -# windowmanagers="kde,gnome,icewm,failsafe" -#fi -# check if /usr/X11R6/bin is writeable, else use /var/X11R6/bin -#if [ -w /mnt/usr/X11R6/bin/WM-Session ] ; then -# sesspath="/usr/X11R6/bin" -#else -# sesspath="/var/X11R6/bin" -# addpath="true" -#fi - -# create links to desktop-session chooser -#[ -f /mnt/usr/bin/X11/wmlist ] && wmlist=`cat /mnt/usr/bin/X11/wmlist` -#testmkd /mnt/etc/X11/sessions -#for i in `echo $windowmanagers|sed -e "s/,/ /g"` ; do -# # beware!! quickhack for VMware sessions -# strinstr "$i" "$wmlist" || \ -# test -x /mnt/usr/X11R6/bin/$i || \ -# echo -e "[Desktop Entry]\nX-SuSE-translate=true\nEncoding=UTF-8\n\ -#Type=XSession\nExec=$i\nTryExec=$sesspath/$i\n\ -#Name=$i\n" > /mnt/etc/X11/sessions/$i.desktop -# # does not work correctly (add /var/X11R6/bin to path!!) -# test -x /mnt/usr/X11R6/bin/$i || \ -# ln -fs /var/X11R6/bin/desktop-session /mnt/$sesspath/$i -#done - -# add special path /var/X11R6/bin to the PATH variable -#[ "x$addpath" != "x" ] && \ -# echo -e "# added path component by $0: $date\n\ -#PATH=\"\$PATH:/var/X11R6/bin\"" >>/mnt/etc/SuSEconfig/profile -#} - # configure X display manager (/etc/sysconfig/displaymanager) config_dm_entry () { local dm="$1" @@ -362,11 +313,15 @@ local start="05" local stop="18" if [ "x$start_dreshal" = "xyes" ]; then if [ -f /mnt/etc/init.d/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/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 - chown 100:101 /mnt/var/run/dbus + # set permissions with userid + echo -e "\tchown messagebus:messagebus /var/run/dbus 2>/dev/null" \ + >>/mnt/etc/${D_INITDIR}/boot.ld rllinker "dbus" "$start" "$stop" fi if [ -f /mnt/etc/init.d/resmgr ] ; then @@ -379,8 +334,12 @@ if [ "x$start_dreshal" = "xyes" ]; 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 - chown 105:103 /mnt/var/run/hal + # set permissions with userid + echo -e "\tchown haldaemon:haldaemon /var/run/hal 2>/dev/null" \ + >>/mnt/etc/${D_INITDIR}/boot.ld start="0"`expr $start + 1` stop="0"`expr $start - 1` rllinker "hal" "$start" "$stop" @@ -433,16 +392,6 @@ rllinker "portmap" "02" "20" # start vmware config_vmware () { -echo -e "#! /bin/sh\n# /etc/${D_INITDIR}/vmware-prep\n#\n\ -# file generated by $0 within initial ramdisk\n\ -. /etc/rc.status\n. /etc/sysconfig/logfile\n\ -\ncase \"\$1\" in\n start)\ -\techo -n \"Starting preparation of vmware environment \"" \ - >> /mnt/etc/${D_INITDIR}/vmware-prep -cat /etc/vmware-prep >> /mnt/etc/${D_INITDIR}/vmware-prep -echo -e "\trc_status -v\n\t;;\nesac\nrc_exit" \ - >> /mnt/etc/${D_INITDIR}/vmware-prep -chmod u+x /mnt/etc/${D_INITDIR}/vmware-prep rllinker "vmware-prep" "18" "02" rllinker "vmware" "20" "02" # if running start scripts in parallel vmware-prep is not recognized @@ -457,24 +406,24 @@ sed -e "s,TARGETS =,TARGETS = vmware-prep," \ cp /etc/.depend.start /mnt/etc/${D_INITDIR}/.depend.start } -# initialize boot.ld - skript to be executed during early system startup +# initialize runlevel skript to be executed during system startup # (before most of the normal boot init scripts) # this script should operate like a normal runlevel script -d_mkbootld () { +d_mkrlscript () { +local switch=$1 +local name=$2 +local info=$3 case "$1" in init) - echo -e "#!/bin/sh\n# skeleton of /etc/${D_INITDIR}/boot.ld written \ -from $0" >/mnt/etc/${D_INITDIR}/boot.ld - echo -e '\n. /etc/rc.status\nrc_reset\ncase "$1" in\n start)' \ - >>/mnt/etc/${D_INITDIR}/boot.ld - echo -e '\techo -n "Running post configuration required by initrd"' \ - >>/mnt/etc/${D_INITDIR}/boot.ld - chmod u+x /mnt/etc/${D_INITDIR}/boot.ld + echo -en "#!/bin/sh\n# skeleton of /etc/${D_INITDIR}/$name written \ +from $0\n. /etc/rc.status\n. /etc/sysconfig/logfile\nrc_reset\n\ +case \"\$1\" in\n start)\n\techo -n " >>/mnt/etc/${D_INITDIR}/$name + echo "\"$info\"" >>/mnt/etc/${D_INITDIR}/$name + chmod u+x /mnt/etc/${D_INITDIR}/$name ;; close) echo -e "\trc_status -v\n\t;;\n stop)\n\t;;\nesac\nrc_exit" \ - >>/mnt/etc/${D_INITDIR}/boot.ld - + >>/mnt/etc/${D_INITDIR}/$name ;; esac } |