leere funktionen in distro-specs gelöscht, dummys in etc/functions hinzugefühgt

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

6 files changed, 251 insertions, 71 deletions

diff --git a/initrd/distro-specs/debian/functions-3.1 b/initrd/distro-specs/debian/functions-3.1
index 9291bafb..878df587 100644
--- a/initrd/distro-specs/debian/functions-3.1
+++ b/initrd/distro-specs/debian/functions-3.1
@@ -16,10 +16,6 @@ preinit () {
   echo "dhcp:x:101:101::/nonexistent:/bin/false" >>/etc/passwd
 }
 
-postinit () {
-  :
-}
-
 # distro specific function called from servconfig script
 config_distro () {
 # add the halt link to the 0 and 6 runlevel directories
@@ -220,16 +216,6 @@ sed -e "s,LANGUAGE=.*,LANGUAGE=\"${LANG}\" # set within initramfs," \
     -i /mnt/etc/environment
 }
 
-# acpi and powersave
-config_acpi () {
-  :
-}
-
-# configure xdm as display manager
-config_xdm () {
-  :
-} 
-
 # configure gdm as display manager
 config_gdm () {
   ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/K20gdm
@@ -246,9 +232,7 @@ config_gdm () {
 # configure kdm as display manager
 config_kdm () {
   ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/K20kdm
-  echo -e "\t/etc/${D_INITDIR}/kdm start >${LOGFILE} 2>&1\n\
-    \t( sleep 120; ln -sf /etc/${D_INITDIR}/kdm /etc/rc3.d/S01kdm \
-    >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
+  ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/S20kdm
 }
 
 # configure hal, dbus, resmgr and services like that
@@ -258,15 +242,7 @@ if [ "x$start_dreshal" = "xyes" ]; then
 fi
 }
 
-# configure automounter
-config_automount () {
-  :
-}
 
-# start name service caching daemon
-config_nscd () {
-  :
-}
 # fixme!! taken from SuSE10.0 untested here ...
 # prepare virtual machine environment (vmware, vmplayer)
 config_vmware () {
diff --git a/initrd/distro-specs/gentoo/functions-2005.1 b/initrd/distro-specs/gentoo/functions-2005.1
index f920b2f6..d1b7d3d7 100644
--- a/initrd/distro-specs/gentoo/functions-2005.1
+++ b/initrd/distro-specs/gentoo/functions-2005.1
@@ -10,11 +10,6 @@
 
 # empty functions are defined at the beginning of /etc/functions
 
-postinit () {
-# rm -rf /mnt/etc/runlevels/default/*
-  :
-}
-
 # distro specific general function called from servconfig script
 config_distro () {
 echo -e "dxs version 4.0a\ninitramfs generation date $date" \
@@ -206,13 +201,6 @@ rllinker acpid
 sed "/depend/,/}/d" -i /mnt/etc/${D_INITDIR}/acpid
 }
 
-# configure dbus (inter application communication for kde and gnome), hal
-# (hardware abstraction layer - used e.g. by powersaved) and resmgr
-# (resource manager - the user gets permissions to devices when loggin on)
-config_dreshal () {
-  :
-}
-
 # configure automounter
 config_automount () {
 if [ -f /mnt/etc/${D_INITDIR}/autofs ] ; then
diff --git a/initrd/distro-specs/suse/functions-10.0 b/initrd/distro-specs/suse/functions-10.0
index 40ac8e4a..f0d60599 100644
--- a/initrd/distro-specs/suse/functions-10.0
+++ b/initrd/distro-specs/suse/functions-10.0
@@ -10,9 +10,6 @@
 # Version:      0.2.1f
 
 # 
-postinit () {
-:
-}
 
 # udev service
 udev_hotplug () {
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3
index 65232855..a0b26fc3 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -11,10 +11,6 @@
 # Version:      0.2.2g
 
 # distro specific stuff to initialize
-preinit () {
-  # do nothing here (might be needed for other versions) 
-  :
-}
 postinit () {
   # for some reason the udev daemon does not create the needed device files
   udevstart
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index 69f693d1..314e49ef 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -21,10 +21,6 @@ preinit () {
   modprobe ${MODPRV} unix || error "$df_errumod" nonfatal
 }
 
-postinit () {
-  :
-}
-
 # distro specific function called from servconfig script
 config_distro () {
 # add the halt link to the 0 and 6 runlevel directories
@@ -104,6 +100,9 @@ fi
 # function for atd
 config_atd () {
 if [ "x$start_atd" = "xyes" ]; then
+  # testmkd /mnt/var/spool/atjobs
+  # testmkd /mnt/var/spool/atspool
+  # chown 1:1 /mnt/var/spool/atjobs /mnt/var/spool/atspool
   rllinker "atd" "14" "04"
 fi
 }
@@ -128,7 +127,17 @@ fi
 # syslog service
 config_syslog () {
 if [ "x$start_syslog" = "xyes" ] ; then
-  echo >/dev/null
+  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\
+#*.emerg\n\n*.=warn;*.=err\t\t\t-/var/log/warn\n\
+#*.crit\t\t\t\t/var/log/warn\n*.*;mail.none;news.none\t\t\
+#-/var/log/messages" >> /mnt/etc/syslogd.conf
+#  test -n "$log_servers" && \
+#  for logserver in $log_servers; do
+#       echo -e "*.*;*.*;*.*;*kern.!*\t@$logserver" >>/mnt/etc/syslog.conf
+#  done
+  rllinker "sysklogd" "02" "18"
 fi
 }
 
@@ -136,7 +145,10 @@ fi
 config_sshd () {
 if [ "x$start_sshd" = "xyes" ] ; then
   if [ -f /mnt/etc/init.d/ssh ] ; then
+    #testmkd /mnt/var/run/sshd
     rllinker "ssh" "12" "10"
+  else
+    error "$df_errsshd" nonfatal
   fi
 fi
 }
@@ -158,17 +170,13 @@ consolefont () {
 echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
   >>/mnt/etc/${D_INITDIR}/boot.ld
 }
-
+"20" "02"
 # acpi and powersave
 config_acpi () {
-  :
+  rllinker "acpid" "02" "19"
+  rllinker "acpi-support" "20" "02"
 }
 
-# configure xdm as display manager
-config_xdm () {
-  :
-} 
-
 # configure gdm as display manager
 config_gdm () {
   # start the display manager as early as possible, but avoid that is
@@ -181,6 +189,115 @@ config_gdm () {
   # append gdm user
   echo "gdm:x:113:">>/etc/group
   echo "gdm:x:106:113:Gnome Display Manager:/var/lib/gdm:/bin/false" >>/etc/passwd
+
+echo -e "# /etc/gdm/gdm.conf - file generated by $0\n\
+
+[daemon]
+AutomaticLoginEnable=false
+AutomaticLogin=
+TimedLoginEnable=false
+TimedLogin=
+TimedLoginDelay=30
+Greeter=/usr/lib/gdm/gdmgreeter
+DefaultPath=/usr/local/bin:/usr/local/sbin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/games
+RootPath=/usr/local/bin:/usr/local/sbin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/games
+User=gdm
+Group=gdm
+LogDir=/var/log/gdm
+PidFile=/var/run/gdm.pid
+PostLoginScriptDir=/etc/gdm/PostLogin/
+PreSessionScriptDir=/etc/gdm/PreSession/
+PostSessionScriptDir=/etc/gdm/PostSession/
+DisplayInitDir=/etc/gdm/Init
+XKeepsCrashing=/etc/gdm/XKeepsCrashing
+RebootCommand=/sbin/shutdown -r now \"Rebooted from gdm menu.\"
+HaltCommand=/sbin/shutdown -h now \"Halted from gdm menu.\"
+SuspendCommand=/usr/sbin/pmi action sleep
+HibernateCommand=/usr/sbin/pmi action hibernate
+ServAuthDir=/var/lib/gdm
+BaseXsession=/etc/gdm/Xsession
+SessionDesktopDir=/etc/X11/sessions/:/etc/dm/Sessions/:/usr/share/gdm/BuiltInSessions/:/usr/share/xsessions/
+DefaultSession=default.desktop
+UserAuthDir=
+UserAuthFBDir=/tmp
+UserAuthFile=.Xauthority
+StandardXServer=/usr/X11R6/bin/X
+Xnest=/usr/X11R6/bin/Xnest -br -audit 0 -name Xnest
+FirstVT=7
+VTAllocation=true
+SoundProgram=/usr/lib/gdmplay
+[security]
+AllowRoot=false
+AllowRemoteRoot=false
+AllowRemoteAutoLogin=false
+RelaxPermissions=0
+CheckDirOwner=true
+DisallowTCP=true
+[xdmcp]
+Enable=false
+[gui]
+GtkTheme=Human
+AllowGtkThemeChange=true
+GtkThemesToAllow=Human,HighContrast,HighContrastInverse,LowContrast
+[greeter]
+ConfigAvailable=false
+Browser=true
+MinimalUID=1000
+Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
+IncludeAll=true
+LocaleFile=/etc/gdm/locale.conf
+SystemMenu=true
+SecureSystemMenu=false
+DefaultWelcome=true
+DefaultRemoteWelcome=true
+BackgroundColor=#523921
+UseCirclesInEntry=true
+GraphicalTheme=Human
+GraphicalThemeDir=/usr/share/gdm/themes/
+GraphicalThemeRand=false
+SoundOnLogin=true
+SoundOnLoginFile=/usr/share/sounds/question.wav
+[chooser]
+HostImageDir=/usr/share/hosts/
+Hosts=
+Broadcast=true
+Multicast=false
+[debug]
+Enable=false
+[servers]
+0=Standard
+[server-Standard]
+name=Standard server
+command=/usr/X11R6/bin/X -br -audit 0 
+flexible=true
+[server-Terminal]
+name=Terminal server
+command=/usr/X11R6/bin/X -br -audit 0 -terminate
+flexible=false
+handled=false
+[server-Chooser]
+name=Chooser server
+command=/usr/X11R6/bin/X -br -audit 0
+flexible=false
+chooser=true
+
+
+
+[debug]
+Enable=$debug" >/mnt/etc/gdm/gdm.conf
+
+if [ "x$start_x" = "xindirect" ] ; then
+  # when X server consumes to much mem set X -terminate
+  echo -e "\n[servers]\n0=Terminal -audit 0 -indirect \
+$host_name\n\n\
+[server-Terminal]\nname=Terminal server\ncommand=/usr/X11R6/bin/X \
+-audit 0\n\
+flexible=true\nhandled=true\nchooser=true" >>/mnt/etc/opt/gnome/gdm/gdm.conf
+else
+  echo -e "\n[servers]\n0=Standard\n\n\
+[server-Standard]\nname=Standard server\ncommand=/usr/X11R6/bin/X\n\
+flexible=true\nhandled=true" >>/mnt/etc/opt/gnome/gdm/gdm.conf
+fi
 }
 
 # configure kdm as display manager
@@ -198,16 +315,6 @@ if [ "x$start_dreshal" = "xyes" ]; then
 fi
 }
 
-# configure automounter
-config_automount () {
-:
-}
-
-# configure bluetooth services
-config_bt () {
-:
-}
-
 # initialize boot.ld - skript to be executed during early system startup
 # (before most of the normal boot init scripts)
 # this script should operate like a normal runlevel script (fixme!!)
@@ -232,11 +339,6 @@ rerun\n# the mkdxsinitrd script to get them applied" \
 esac
 }
 
-# start name service caching daemon
-config_nscd () {
-:
-}
-
 # fixme!! taken from SuSE10.0 untested here ...
 # prepare virtual machine environment (vmware, vmplayer)
 config_vmware () {
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index b240ce4b..508fd35e 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -694,3 +694,124 @@ case "$country" in
   ;;
 esac
 }
+
+######################### dummy functions
+
+preinit () {
+  :
+}
+
+postinit () {
+  :
+}
+
+# distro specific function called from servconfig script
+config_distro () {
+ : 
+}
+
+# AUS SuSE-9.3
+# udev/hotplug - auto device discovery service
+udev_hotplug () {
+ : 
+}
+
+# linking runlevel scripts
+rllinker () {
+ : 
+}
+
+# group of functions for the normal runlevels - first parameter is start
+# second stop
+# function for ntp configuration
+config_ntp () {
+ : 
+}
+
+# function for atd
+config_atd () {
+ : 
+}
+
+# function for configuration of cron services
+config_cron () {
+ : 
+}
+
+# syslog service
+config_syslog () {
+ : 
+}
+
+# secure shell service
+config_sshd () {
+ :
+}
+
+# snmp agent for remote monitoring
+config_snmp () {
+ : 
+}
+
+# consolefont
+consolefont () {
+ : 
+}
+# acpi and powersave
+config_acpi () {
+ : 
+}
+
+# configure xdm as display manager
+config_xdm () {
+  :
+} 
+
+# configure gdm as display manager
+config_gdm () {
+ : 
+}
+
+# configure hal, dbus, resmgr and services like that
+config_dreshal () {
+  :
+}
+
+# configure automounter
+config_automount () {
+:
+}
+
+# configure bluetooth services
+config_bt () {
+:
+}
+
+d_mkrlscript () {
+ : 
+}
+
+# start name service caching daemon
+config_nscd () {
+:
+}
+
+# prepare virtual machine environment (vmware, vmplayer)
+config_vmware () {
+ : 
+}
+
+# configure automounter
+config_automount () {
+ : 
+}
+
+# start portmapper (needed at least for nfs and nis services)
+config_portmap () {
+:
+}
+
+# start NIS (fixmee - does the service is really named ypbind??)
+config_nis () {
+ :
+}