Clean up, indenting, screen dir in var for debian distro-specific.

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

1 files changed, 85 insertions, 92 deletions

diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default
index 5edd231f..56c7cb36 100644
--- a/initramfs/distro-specs/debian/functions-default
+++ b/initramfs/distro-specs/debian/functions-default
@@ -59,155 +59,148 @@ config_distro () {
  
   # set default runlevel
   sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
+
+  # create needed auxiliary directories in (/mnt)/var,/etc,...
+  testmkd /mnt/var/run/screens root:utmp 0755
 }
 
 # initial (boot time) runlevel scripts
 initial_boot () {
-local count=10
-# boot.slx is a special runlevel script generated within initialramfs which
-# should be executed before the normal runlevel scripts. Proper shutdown is
-# not needed!?
-for i in boot.slx mountkernfs.sh mountvirtfs udev procps.sh bootlogd \
-    $D_SPLASHY keymap.sh hwclock.sh sudo dbus-1; do
-  count=$(($count + 1))
-  [ $DEBUGLEVEL -ge 2 ] && echo "boot-runlevelscript $i"
-  ln -sf /etc/init.d/$i /mnt/etc/rcS.d/S${count}$i
-done
+  local count=10
+  # boot.slx is a special runlevel script generated within initialramfs which
+  # should be executed before the normal runlevel scripts. Proper shutdown is
+  # not needed!?
+  for i in boot.slx mountkernfs.sh mountvirtfs udev procps.sh bootlogd \
+      $D_SPLASHY keymap.sh hwclock.sh sudo dbus-1; do
+    count=$(($count + 1))
+    [ $DEBUGLEVEL -ge 2 ] && echo "boot-runlevelscript $i"
+    ln -sf /etc/init.d/$i /mnt/etc/rcS.d/S${count}$i
+  done
 }
 
 # linking runlevel scripts
 rllinker () {
-local script="$1"
-local start="$2"
-local stop="$3"
-# empty runlevel links - decision on running certain services is
-# passed via configuration
-for i in rc2.d/K$stop$script rc3.d/K$stop$script \
+  local script="$1"
+  local start="$2"
+  local stop="$3"
+  # empty runlevel links - decision on running certain services is passed via 
+  # configuration or enabled through plugins
+  for i in rc2.d/K$stop$script rc3.d/K$stop$script \
          rc2.d/S$start$script rc3.d/S$start$script ; do
-  if ! [ -f /mnt/etc/init.d/$script ]; then
-    echo "Target `pwd`../$script does not exist. Skipping links"
-    break
-  else 
-    ln -sf ../init.d/$script /mnt/etc/$i
-    echo "Linked $script"
-  fi
-done
+    if ! [ -f /mnt/etc/init.d/$script ]; then
+      echo "Target `pwd`../$script does not exist. Skipping links"
+      break
+    else 
+      ln -sf ../init.d/$script /mnt/etc/$i
+      echo "Linked $script"
+    fi
+  done
 }
 
 # make a runlevel script
 d_mkrlscript () {
-local switch=$1
-local name=$2
-local info=$3
-case "$1" in
-  init)
-    echo -e "#!/bin/sh\n# skeleton of /etc/init.d/$name created \
+  local switch=$1
+  local name=$2
+  local info=$3
+  case "$1" in
+    init)
+      echo -e "#!/bin/sh\n# skeleton of /etc/init.d/$name created \
 by $0\n# after you applied changes to the creation scripts you have to \
 rerun\n# the mkdxsinitrd script to get them applied\n\
 . /lib/lsb/init-functions\ncase \"\$1\" in\n    start)\n\
 \tlog_begin_msg \"$info\"" >>/mnt/etc/init.d/$name
-    chmod u+x /mnt/etc/init.d/$name
-  ;;
-  close)
-    echo -e "\tlog_end_msg \$?\n\t;;\n    stop)\n\tlog_end_msg \$?\n\t;;\
-      \nesac\nexit 0" >>/mnt/etc/init.d/$name
-  ;;
-esac
+      chmod u+x /mnt/etc/init.d/$name
+    ;;
+    close)
+      echo -e "\tlog_end_msg \$?\n\t;;\n    stop)\n\tlog_end_msg \$?\n\t;;\
+        \nesac\nexit 0" >>/mnt/etc/init.d/$name
+    ;;
+  esac
 }
 
 # group of functions for the normal runlevels - first parameter is start
 # second stop
 # function for ntp configuration
 config_ntp () {
-if [ -f /mnt/etc/init.d/ntp -a "x$start_ntp" != "xno" ] ; then
-  echo -e "ntp:x:74:65534:NTP daemon:/var/lib/ntp:/bin/false" \
-    >>/mnt/etc/passwd
-  testmkd /mnt/var/lib/ntp/var/run/ntp
-  rllinker "ntp" "07" "14"
-fi
+  if [ -f /mnt/etc/init.d/ntp -a "x$start_ntp" != "xno" ] ; then
+    echo -e "ntp:x:74:65534:NTP daemon:/var/lib/ntp:/bin/false" \
+      >>/mnt/etc/passwd
+    testmkd /mnt/var/lib/ntp/var/run/ntp
+    rllinker "ntp" "07" "14"
+  fi
 }
 
 # function for atd
 config_atd () {
-if [ "x$start_atd" = "xyes" ]; then
-  # fixme!! needed? Fix permissions
-  #testmkd /mnt/var/spool/cron/atjobs
-  #testmkd /mnt/var/spool/cron/atspool
-  #chown /mnt/var/spool/cron/atjobs /mnt/var/spool/cron/atspool
-  rllinker "atd" "89" "01"
+  if [ "x$start_atd" = "xyes" ]; then
+    # fixme!! needed? Fix permissions
+    #testmkd /mnt/var/spool/cron/atjobs daemon:daemon
+    #testmkd /mnt/var/spool/cron/atspool daemon:daemon
+    rllinker "atd" "89" "01"
 fi
 }
 
 # function for configuration of cron services
 config_cron () {
-if [ "x$start_cron" = "xyes" ] ; then
-  if [ -f /mnt/etc/init.d/cron ] ; then
-    rllinker "cron" "89" "01"
-    testmkd /mnt/var/spool/cron/crontabs
-    echo -e "# /etc/crontab - file generated by $0:\n\
+  if [ "x$start_cron" = "xyes" ] ; then
+    if [ -f /mnt/etc/init.d/cron ] ; then
+      rllinker "cron" "89" "01"
+      testmkd /mnt/var/spool/cron/crontabs root:crontab
+      echo -e "# /etc/crontab - file generated by $0:\n\
 #\t$date\nSHELL=/bin/sh\nPATH=/usr/bin:/usr/sbin:/sbin:/bin:/usr/lib/news/bin\
 \nMAILTO=\n-*/15 * * * *\troot\ttest -x /usr/lib/cron/run-crons && \
 /usr/lib/cron/run-crons >/dev/null 2>&1\n" >/mnt/etc/crontab
-  else
-    error "$df_errcron" nonfatal
-  fi 
-fi
+    else
+      error "$df_errcron" nonfatal
+    fi 
+  fi
 }
 
 # syslog service
 config_syslog () {
-if [ "x$start_syslog" != "xno" ] ; then
-  : # fixme: Evtl. Verzweigung fuer syslog/-ng Varianten, siehe Ubuntu
-    # bzw. SuSE
-fi
+  if [ "x$start_syslog" != "xno" ] ; then
+  : # fixme: handled by plugin in the future!
+  fi
 }
 
 # secure shell service
 config_sshd () {
-if [ "x$start_sshd" = "xyes" ] ; then
-  if [ -f /mnt/etc/init.d/ssh ] ; then
-    rllinker "ssh" "20" "02"
+  if [ "x$start_sshd" = "xyes" ] ; then
+    if [ -f /mnt/etc/init.d/ssh ] ; then
+      rllinker "ssh" "20" "02"
+    fi
   fi
-fi
 }
 
 # snmp agent for remote monitoring
 config_snmp () {
-if [ "x$start_snmp" = "xyes" ] ; then
-  if [ -f /mnt/etc/init.d/snmpd ] ; then
-    rllinker "snmpd" "30" "03"
-    testmkd /mnt/var/lib/net-snmp >/dev/null 2>&1
-  fi
-    # fixme!!
-    # write service monitor depending on services started
+  if [ "x$start_snmp" = "xyes" ] ; then
+    if [ -f /mnt/etc/init.d/snmpd ] ; then
+      rllinker "snmpd" "30" "03"
+      testmkd /mnt/var/lib/net-snmp >/dev/null 2>&1
+    fi
+      # fixme!!
+      # write service monitor depending on services started
   fi
 }
 
-# add special path /var/X11R6/bin to the PATH variable
-# fixme!! add path directly to /etc/profile!?
-#[ "x$addpath" != "x" ] && \
-#  echo -e "# added path component by $0: $date\n\
-#PATH=\"\$PATH:/var/X11R6/bin\"" >>/mnt/etc/profile
-}
-
 # localization like consolefont and language
 dlocale () {
-# console font setting program not available in Debian 4!?
-echo -e "\t#setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
-  >>/mnt/etc/init.d/boot.slx
-chmod 744 /mnt/etc/init.d/boot.slx
-# fixme!! check for proper operation
-# sed -e "s,LANGUAGE=.*,LANGUAGE=\"${LANG}\" # set within initramfs," \
-#     -e "s,LANG=.*,LANG=\"${LANG}\" # set within initramfs," \
-#     -i /mnt/etc/environment
-sed -e "s,LANG=.*,LANG=\"${LANG}\," # set within initramfs," \
+  # console font setting program not available in Debian 4!?
+  echo -e "\t#setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
+    >>/mnt/etc/init.d/boot.slx
+  # fixme!! check for proper operation
+  # sed -e "s,LANGUAGE=.*,LANGUAGE=\"${LANG}\" # set within initramfs," \
+  #     -e "s,LANG=.*,LANG=\"${LANG}\" # set within initramfs," \
+  #     -i /mnt/etc/environment
+  sed -e "s,LANG=.*,LANG=\"${LANG}\," # set within initramfs," \
     -i /mnt/etc/default/locale
 }
 
 # configure hal, dbus, resmgr and services like that
 config_dreshal () {
-if [ "x$start_dreshal" = "xyes" ]; then
-  :
-fi
+  if [ "x$start_dreshal" = "xyes" ]; then
+    :
+  fi
 }