* merged branch 'initramfs-ng' back intro trunk - requires careful testing ...

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

1 files changed, 0 insertions, 425 deletions

diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
deleted file mode 100755
index 824f9870..00000000
--- a/initramfs/initrd-stuff/bin/servconfig
+++ /dev/null
@@ -1,425 +0,0 @@
-# Copyright (c) 2003 - 2006 - RZ Uni Freiburg
-# Copyright (c) 2006, 2007 - OpenSLX GmbH
-#
-# This program is free software distributed under the GPL version 2.
-# See http://openslx.org/COPYING
-#
-# If you have any feedback please consult http://openslx.org/feedback and
-# send your feedback to feedback@openslx.org
-#
-# General information about OpenSLX can be found under http://openslx.org
-#
-# universal (distro independent) configuration script for OpenSLX linux
-# diskless clients (executed in stage3 within initial ramfs). The file-
-# system setup is completed when servconfig starts
-
-#############################################################################
-# check for configuration files to source
-
-# functions common for all distros, messages contains all error and
-# info output
-. /etc/messages
-. /etc/functions
-# load distro specific configuration variables and functions. distro
-# specific functions may overwrite functions defined in /etc/functions
-. /etc/sysconfig/config
-. /etc/distro-functions
-. /etc/sysconfig/slxsystem.conf
-# get location of logfile definition
-. /mnt/etc/${D_SYSCONFDIR}/logfile
-
-# script run timer
-[ $DEBUGLEVEL -eq 8 ] && echo "** SW setup started at $(sysup)"
-
-# heavy debugging output in level 3 and below 8 ...
-[ $DEBUGLEVEL -gt 3 -a $DEBUGLEVEL -lt 8 -o $DEBUGLEVEL -eq 12 ] && \
-  set -x
-
-#############################################################################
-# copy distro specific scripts, programs, libraries and configs
-cp -a /etc/sysconfig/files/* /mnt 2>/dev/null &
-# boot.local file (different for several distros)
-[ -f "/etc/boot.local" -a -n "${D_BOOTLOCAL}" ] && {
-  echo "# added by $0 (initramfs from $date)" >> /mnt/etc/${D_BOOTLOCAL}
-  cat /etc/boot.local >> /mnt/etc/${D_BOOTLOCAL}
-}
-
-#############################################################################
-# read and unify configuration options - default configuration file, from
-# dhcp, ldap ...
-# wait for the appearance of configuration from several sources
-cfgcomplete
-. /etc/machine-setup
-[ $DEBUGLEVEL -eq 8 ] && echo "** Config info is complete at $(sysup)"
-
-# copy additional configuration and var files and directories
-# admins can place there files in /var/lib/openslx/config/...
-# to be packed during stage2 into (/srv/dxs)/tftpboot/client-config...)
-# ... in the near future ...
-cp -a /rootfs/* /mnt 2>/dev/null
-
-# set greeting and add information on booted system
-len=$(expr length ${SLXVERSION}${SYSTEM_NAME})
-if [ $len -le 28 ] ; then
-  vdstr="Stateless Workstation (V${SLXVERSION}/${SYSTEM_NAME})"
-  smax=28
-else
-  vdstr="V${SLXVERSION}/${SYSTEM_NAME}"
-  smax=52
-fi
-while [ $len -le $smax ] ; do
-  vdstr="$vdstr "
-  len=$(($len + 1))
-done
-len=$(expr length $host_name)
-while [ $len -le 30 ] ; do
-  space="$space "
-  len=$(($len + 1))
-done
-echo "
-   WELCOME TO                 $space        \n (\l)
-           _____  ______  ______ __    __    _______ __     __    __
-          /  _   |   _   |   ___|  |  |  |  |   ____|  |   |  |  |  |
-         |  | |  |  |_|  |  |_  |   |    |  |  |___ |  |        /  /
-         |  | |  |   ___/|   _|      |   |   ____   |  |     |    |
-         |  |_|  |  |    |  |___|  |  |  |   ____|  |  |___ /  /
-           _____/|__|    |______|__|  |__|  |_______|______|__|  |__|
-
-   $vdstr (c) <OpenSLX.ORG>
-">/mnt/etc/issue
-
-#############################################################################
-# set localization and add entries to initialize keytable and consolefont to
-# boot.slx
-DEFKEYTABLE="de-latin1-nodeadkeys"
-if [ -z "$country" ] ; then
-  error "$scfg_country" nonfatal
-  country="${D_DEFAULTCOUNTRY}"
-fi
-localization "${country}"
-if [ -z "${KEYTABLE}" ] ; then
-  error "$hcfg_keyb" nonfatal
-  KEYTABLE=${DEFKEYTABLE}
-fi
-echo -e "\t# entries added by $0: $date" >> /mnt/etc/${D_INITDIR}/boot.slx
-[ -n "${KEYTABLE}" ] && keytable
-[ -n "${CONSOLE_FONT}" ] && consolefont
-
-#############################################################################
-# setup passwd and shadow for local system users like root, bin, daemon and
-# nobody if no user/admin provided passwd exists ...
-# the root password provided by machine-setup is used only if no passwd file
-# is provided (default case)
-if [ ! -f /rootfs/etc/passwd ] ; then
-  basepasswd
-fi
-
-#############################################################################
-# dns and ip configuration
-# hostname of the machine
-echo "$host_name" >/proc/sys/kernel/hostname
-echo -e "# /etc/hosts - file generated by\n#\t$0:\n#\t$date\
-\n#\n# IP-Address  Full-Qualified-Hostname  Short-Hostname\n#\n\
-127.0.0.1\tlocalhost\n::1\t\tlocalhost ipv6-localhost ipv6-loopback\n\
-fe00::0\t\tipv6-localnet\nff00::0\t\tipv6-mcastprefix\nff02::1\
-\t\tipv6-allnodes\nff02::2\t\tipv6-allrouters\nff02::3\t\t\
-ipv6-allhosts\n" >/mnt/etc/hosts
-if [ -n  "$domain_name" ]; then
-  echo -en "$clientip\t" >>/mnt/etc/hosts
-  for name in $domain_name; do
-    echo -en "$host_name.$name " >>/mnt/etc/hosts
-  done
-  echo -e "$host_name" >>/mnt/etc/hosts
-else
-  echo -e "$clientip\t$host_name" >>/mnt/etc/hosts
-fi
-# set up domainname and resolving
-rm -rf /mnt/etc/resolv.conf
-test -n "$domain_name" && \
-  echo -e "# /etc/resolv.conf - file generated by\n#\t$0:\n\
-#\t$date\n#options timeout:1 attempts:1 rotate\n\
-search "$domain_name >/mnt/etc/resolv.conf
-test -n "$domain_name_servers" && {
-  for name in $domain_name_servers; do
-    echo nameserver $name >>/mnt/etc/resolv.conf;
-  done; }
-
-#############################################################################
-# run distro specific configuration function
-config_distro
-
-#############################################################################
-# boot.local (fixme: deprecated)
-if [ -n "$bootlocal_script" ]; then
-  echo -e "# Option is deprecated and will be removed soon. Please put the \
-file to the ConfTGZ (rootfs/etc/${D_INITDIR}/boot.local)" >> \
-  /mnt/etc/${D_INITDIR}/boot.local
-fi
-
-#############################################################################
-# basic (non network) services
-
-# at daemon - calling distro specific function config_atd
-config_atd
-
-# configuration of cron services - calling distro specific function
-# config_cron (runlevel links, directories, ...)
-config_cron
-[ "x$crontab_entries" != "x" ] && \
-    echo -e "$crontab_entries" >> /mnt/etc/crontab
-
-# setup system log services - distro dependent function config_syslog
-config_syslog
-
-# acpi and powersave - distro dependent function config_acpi, these daemons
-# might require dbus
-config_acpi
-
-# configure dbus - distro dependent function config_dreshal - handle
-# all stuff regarding dependent services like dbus, resmgr, hal ...
-# (check for runlevel scripts, passwd entries, directories ...)
-config_dreshal
-
-# configure automounter
-if [ "x$automnt" != "xno" ] ; then
-  # check if there is some user provided configuration (only auto.master is
-  # important) and skip automatic setup
-  if [ ! -f /rootfs/etc/auto.master ] ; then
-    if [ -d /mnt/misc ] ; then
-      echo -e "# /etc/auto.master - file generated by $0:\n\
-/misc\t/etc/auto.misc" >/mnt/etc/auto.master
-      echo -e "# /etc/auto.misc - file generated by $0:" >/mnt/etc/auto.misc
-    else
-      echo -e "# /etc/auto.master - file generated by $0:\n\
-/misc\t#/etc/auto.misc" >/mnt/etc/auto.master
-      echo -e "# /etc/auto.misc - file generated by $0:\nautomount for \
-removable devices is mostly deprecated, so /misc is not\nactivated in \
-auto.master." >/mnt/etc/auto.misc
-    fi
-    if [ -n "${automnt_src}" ] ; then
-      # local directory and home directory server from machine-setup
-      [ -z "${automnt_dir}" ] && automnt_dir="/home"
-      # remove leading and trailing slash
-      automnt_dir=${automnt_dir#/}
-      automnt_dir=${automnt_dir%/}
-      test -d /${automnt_dir} || error "$scfg_erradir" nonfatal
-      strinstr "/" ${automnt_dir} && error "$scfg_erratpld" nonfatal
-      amserv=$(uri_token $automnt_src server)
-      ampath=$(uri_token $automnt_src path)
-      echo -e "/${automnt_dir}\t/etc/auto.${automnt_dir}\n" \
-        >> /mnt/etc/auto.master
-      echo -e "# /etc/auto.${automnt_dir} created by $0:\n" \
-        > /mnt/etc/auto.${automnt_dir}
-      echo -e "*\t-rsize=32768,wsize=32768,rw\t${amserv}:${ampath}/&" \
-        >> /mnt/etc/auto.${automnt_dir}
-      # no tempfs needed if automounter operates on /home
-      [ "${automnt_dir}" = "home" ] && umount -t tmpfs /mnt/home 2>/dev/null
-      # portmapper is needed for remote NFS sources and local nfs directories
-      testmkd /mnt/var/lib/nfs/state
-      config_portmap
-    fi
-  fi
-  config_automount
-fi
-
-# configure print services / start requested printer daemon
-config_printer
-
-# configure bluetooth services
-config_bt
-
-#############################################################################
-# network(ed) services
-
-# network time service (ntp) configuration file
-if [ -n "$ntp_servers" -a ! -f /rootfs/etc/ntp.conf ]; then
-  echo -e "# /etc/ntp.conf - file generated by $0: \
-$date\n" >/mnt/etc/ntp.conf
-  for name in $ntp_servers; do
-    echo server $name >>/mnt/etc/ntp.conf
-  done
-fi
-# copy timezone file defined with language settings
-[ -z "$TZ" ] && TZ="$timezone"
-ln -snf /usr/share/zoneinfo/${TZ} /mnt/etc/localtime || \
-  error "$scfg_ntptz" nonfatal
-config_ntp
-
-# secure shell server - at the moment all clients share one "secret"
-# key or the key has to be regenerated on every bootup or fetched on
-# every bootup from somewhere
-config_sshd
-
-# simple network management protocol agent
-config_snmp
-
-# setup afs client stuff
-config_afs
-
-# setup nfsv4/krb stuff
-config_nfsv4
-
-# configure samba service
-config_samba
-
-#############################################################################
-# NIS
-# setup nis configuration if needed
-if [ "x$nis_domain" != "x" ] && [ "x$nis_servers" != "x" ] ; then
-  echo $nis_domain >/mnt/etc/defaultdomain
-  echo -e "# /etc/yp.conf - file generated by $0:\n#\t\
-$date\n\nypserver "$nis_servers >/mnt/etc/yp.conf
-  config_nis
-fi
-
-#############################################################################
-# name service caching daemon if networked user database
-config_nscd
-
-#############################################################################
-# preparation of /tmp directory (partition 44, nfs scratch, ramdisk). there
-# might be the chance that we have a disk partition available, so wait for
-# completion of detection, setup process
-[ $DEBUGLEVEL -eq 8 ] && echo "** Waiting for /tmp completion at $(sysup)"
-waitfor /tmp/tmpready 40000
-[ $DEBUGLEVEL -eq 8 ] && echo "** Setup of /tmp completed at $(sysup)"
-# create some directories and correct permissions
-tmpisdisk=$(sed -n '/\/tmp/p' /tmp/fstab 2>/dev/null)
-# if there is no local disk partition for /tmp then try to mount a rw
-# scratch space (if defined in $scratch) and prepared on server
-if [ -n "$scratch" -a -z "$tmpisdisk" ] ; then
-  scrproto=$(uri_token $FILESRC prot)
-  scrpath=$(uri_token $FILESRC path)
-  testmkd /tmp/scratch
-  # exports have to be per client!!
-  case "$scrproto" in
-    nbd)
-      :
-    ;;
-    *)
-      tmpserv=$(uri_token $scratch server)
-      tmppath=$(uri_token $scratch path)
-      # hanging mount processes might stop further setup - timeout
-      # should be configured ... it is possible to mount "nolock" only
-      mount -t nfs -o rw,tcp,nolock,intr,nodev,soft,timeo=2,nosuid \
-        ${tmpserv}:${tmppath} /tmp/scratch >/dev/null 2>&1 && {
-        testmkd /tmp/scratch/${clientip}
-        umount /tmp/scratch
-        # no need for tempfs there ...
-        umount /mnt/tmp >/dev/null 2>&1
-        mount -t nfs -o rw,tcp,nolock,intr,nodev,soft,timeo=2,nosuid \
-          ${tmpserv}:${tmppath}/${clientip} /mnt/tmp >/dev/null 2>&1 
-	# somehow we need to move it to the vmware plugin. Any ideas
-	# how to handle the dependencies?
-        # create an empty container file for vmware *.vmem, it does not
-        # like to live on NFS exports
-        if [ "x$vmware" != "x" -a "x$vmware" != "xno" ] ; then
-          dd if=/dev/zero of=/mnt/tmp/vm-container count=1 seek=2048000
-          diskfm /mnt/tmp/vm-container /mnt/tmp/vmware
-          chmod a+rwxt /mnt/tmp/vmware
-        fi; }
-    ;;
-  esac
-fi
-
-#############################################################################
-# X11/GUI stuff
-if [ "x$start_x" != "xno" ] ; then
-  # creating directories commonly needed for X11 in all distros
-  # rest should be done via config_x11 function (distro specific)
-  for i in /var/lib/xkb/compiled \
-           /etc/X11/xdm \
-           /etc/X11/sessions \
-           /var/X11R6/bin \
-           /var/run/xdmctl \
-           /tmp/.ICE-unix \
-           /tmp/.X11-unix ; do testmkd /mnt/$i; done
-  chmod 1777 /mnt/tmp/.ICE-unix /mnt/tmp/.X11-unix
-  chown 0:0 /mnt/tmp/.ICE-unix /mnt/tmp/.X11-unix
-  echo "# file emtied by $0 during initramfs" > /mnt/etc/X11/xdm/Xservers
-  # define additional sessions offered to the user (via dhcp/ldap config)
-  # descsession -> deprecated by new vmware integration concept
-  # write available X display manager to /etc/X11/xdm/Xaccess
-  [ -n "$x_display_manager" ] && \
-  echo -e "# /etc/X11/xdm/Xaccess - file generated by $0: \
-$date\n*\n%hostlist\t$x_display_manager\n*\t\tCHOOSER %hostlist"\
-    >/mnt/etc/X11/xdm/Xaccess
-
-  # define type of X session
-  dsx="no"
-  case "$start_x" in
-    yes|YES|direct|DIRECT|query|QUERY)
-      # direct connection onto the own displaymanager, which
-      # should be enabled then
-#      [ "x$start_xdmcp" = "xno" ] && $start_xdmcp="yes"
-      init=""
-      dsx="yes"
-      xdmcp="false"
-      echo -e "# /etc/X11/Xservers - file generated by \
-$0: $date\n:0 local X :0 vt07\n" >/mnt/etc/X11/xdm/Xservers
-    ;;
-    broadcast|BROADCAST)
-      # the client will XDMCP broadcast and choose first available
-      # X11 server
-      [ "x$start_xdmcp" = "xgdm" ] || \
-        init="7:5:respawn:${D_XORGBIN} vt7 -quiet -broadcast"
-    ;;
-    indirect|INDIRECT)
-      # the client will try to XDMCP connect list of X11 servers
-      if [ "x$start_xdmcp" = "xgdm" ] ; then
-        init=""
-      else
-        init="7:5:respawn:${D_XORGBIN} vt7 -quiet -indirect $host_name"
-      fi
-      [ "x$start_xdmcp" = "xno" ] && start_xdmcp="yes"
-      xdmcp="true"
-    ;;
-    *)
-      # no display manager needed in kiosk mode
-      # in this mode you have to provide the type of X session to start
-      [ x$start_xdmcp != "x" ] || start_xdmcp="no";
-      init="7:5:respawn:/var/X11R6/bin/kiosk /dev/tty7"
-      # nobody can halt pc 
-      echo 'nobody ALL=NOPASSWD:/sbin/halt, /sbin/shutdown' >>/mnt/etc/sudoers
-      echo -e "#!/bin/sh\n# /var/X11R6/bin/kiosk - file generated by $0: $date
-      while ps aux|grep -i kiosk|grep -v \"grep\" &>/dev/null; do
-        test -f /var/run/kiosk || break; sleep 3;
-      done
-      touch /var/run/kiosk
-      for((i=0;\$i<=120;i=\$((\$i+1)))); do
-        [ -e /var/run/resmgr.pid ] && break
-        [ \$i = 120 ] && exit 1
-        sleep 1
-      done
-      resmgr login nobody tty8 \\
-      && resmgr grant nobody desktop \\
-      && chown -R nobody:nogroup /var/lib/nobody \\
-      && (su -c '(sleep 10; amixer -q sset Master 28 unmute; \\
-        amixer -q sset PCM 28 unmute) &
-        xinit /var/X11R6/bin/startgui $start_x \\
-        -- vt7 -quiet' -l nobody &>/dev/null)
-      rm /var/run/kiosk
-      resmgr revoke nobody
-      resmgr logout tty7
-      killall X" >/mnt/var/X11R6/bin/kiosk
-      # early start of kiosk session
-      echo -e "\t# kiosk start added by $0\n\t\
-/var/X11R6/bin/kiosk &>/dev/null &" >>/mnt/etc/${D_INITDIR}/boot.slx
-      cp /etc/startgui /mnt/var/X11R6/bin
-      chmod a+x /mnt/var/X11R6/bin/kiosk /mnt/var/X11R6/bin/startgui
-      rm /mnt/var/run/kiosk 2>/dev/null
-    ;;
-  esac
-  echo -e "# entry made by $0 $date\n$init" >> /mnt/etc/inittab
-  # most probably not needed any longer
-  if [ -n ${D_XORGBIN} ] ; then
-    testmkd /mnt/var/X11R6/bin
-    ln -sf ${D_XORGBIN} /mnt/var/X11R6/bin/X
-  fi
-fi
-
-# script run timer
-[ $DEBUGLEVEL -eq 8 ] && echo "** SW setup finished at $(sysup)"
-
-# servconfig finished successfully
-echo "servconfig finished at $(sysup)" > /tmp/svcfg