[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. d9d759be2496a88e71d9eab4ec7d1ff16ae022fa

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit a7386abf1178e56fc4a9d4bd18d1eca1d8fa379e
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Thu Feb 9 21:00:47 2012 +0100

    Use /bin/bash for scripts.  Cleanup and fix.

diff --git a/fai/config/debconf/CLIENT_A b/fai/config/debconf/CLIENT_A
deleted file mode 100644
index 6874e07..0000000
--- a/fai/config/debconf/CLIENT_A
+++ /dev/null
@@ -1,4 +0,0 @@
-nslcd nslcd/ldap-base string dc=intern
-nslcd nslcd/ldap-uris string ldap://ldap
-nslcd nslcd/ldap-starttls boolean true
-nslcd nslcd/ldap-reqcert select allow
diff --git a/fai/config/scripts/DISKLESS_CLIENT/10-misc b/fai/config/scripts/DISKLESS_CLIENT/10-misc
index 3d53501..af59cef 100755
--- a/fai/config/scripts/DISKLESS_CLIENT/10-misc
+++ b/fai/config/scripts/DISKLESS_CLIENT/10-misc
@@ -1,12 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 fcopy -v /etc/resolv.conf
 fcopy -v /etc/hosts
-
-## FIXME remove this as soon as not needed anymore:
-# set root password
-#echo "root:$ROOTPW" | $ROOTCMD chpasswd --encrypted
-$ROOTCMD usermod -p "$ROOTPW" root
-# make /root accessible only by root
-chmod 0700 $target/root
-chown root:root $target/root
diff --git a/fai/config/scripts/DISKLESS_CLIENT/20-server b/fai/config/scripts/DISKLESS_CLIENT/20-server
index 5eeb7ac..ef2131e 100755
--- a/fai/config/scripts/DISKLESS_CLIENT/20-server
+++ b/fai/config/scripts/DISKLESS_CLIENT/20-server
@@ -1,11 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 #
 # modifications needed on the server to boot the diskless client
 #
 
 set -e
 
-if [ $FAI_ACTION == "install" ] ; then
+if [ $FAI_ACTION == "dirinstall" ] ; then
     TEMPLATE=/srv/tftp/fai/pxelinux.cfg/diskless.tmpl
 
     if [ ! -e $TEMPLATE ]; then
diff --git a/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5 b/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5
index 5f3fdf4..a54c97f 100755
--- a/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5
+++ b/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 set -e
 

-- 
Debian-LAN development and packaging