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

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit d75f76eb90b76cd18871f33248926bfb99111360
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sun Jul 15 11:45:50 2012 +0200

    Remove '$target' from path when using ainsl.  Changed in FAI for wheezy.

diff --git a/fai/config/scripts/CLIENT_A/20-misc b/fai/config/scripts/CLIENT_A/20-misc
index cef8995..a65480a 100755
--- a/fai/config/scripts/CLIENT_A/20-misc
+++ b/fai/config/scripts/CLIENT_A/20-misc
@@ -14,12 +14,12 @@ EOF
 WPAD=/tmp/wpad.dat
 http_proxy=""; wget --output-document=$WPAD http://wpad.intern/wpad.dat
 PROXY=`cat $WPAD | grep PROXY | sed "s/^.*PROXY //" | sed "s/;.*$//"`
-ainsl $target/etc/environment "http_proxy=http://$PROXY/"
+ainsl /etc/environment "http_proxy=http://$PROXY/"
 
 if [ "$PROXY" == "webcache:8080" ] ; then
     ## dansguardian is used, lock iceweasel proxy configuration:
-    ainsl $target/etc/iceweasel/pref/iceweasel.js 'lockPref("network.proxy.type", 4);'
+    ainsl /etc/iceweasel/pref/iceweasel.js 'lockPref("network.proxy.type", 4);'
 else
     ## default configuration to wpad.dat proxy:
-    ainsl $target/etc/iceweasel/pref/iceweasel.js 'pref("network.proxy.type", 4);'
+    ainsl /etc/iceweasel/pref/iceweasel.js 'pref("network.proxy.type", 4);'
 fi
diff --git a/fai/config/scripts/DESKTOP/10-groups b/fai/config/scripts/DESKTOP/10-groups
index 998b81a..e479b10 100755
--- a/fai/config/scripts/DESKTOP/10-groups
+++ b/fai/config/scripts/DESKTOP/10-groups
@@ -8,5 +8,5 @@ set -e
 ## Example:  Configure PAM to add users to the dialout group (needed
 ## to access /dev/tty*): 
 
-ainsl -q $target/etc/security/group.conf "gdm3;*;*;Al0000-2400;dialout"
-ainsl -q $target/etc/pam.d/gdm3 "auth    optional        pam_group.so"
+ainsl -q /etc/security/group.conf "gdm3;*;*;Al0000-2400;dialout"
+ainsl -q /etc/pam.d/gdm3 "auth    optional        pam_group.so"
diff --git a/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5 b/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5
index a54c97f..cc21e53 100755
--- a/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5
+++ b/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5
@@ -4,8 +4,8 @@ set -e
 
 FILE=${target}/usr/share/libpam-script/pam_script_auth
 
-ainsl ${target}/etc/default/nfs-common 'RPCGSSDOPTS="-n"'  
-ainsl ${target}/etc/pam.d/common-auth  'auth    optional  pam_script.so' 
+ainsl /etc/default/nfs-common 'RPCGSSDOPTS="-n"'
+ainsl /etc/pam.d/common-auth  'auth    optional  pam_script.so'
 
 cat > $FILE <<EOF
 #!/bin/sh
diff --git a/fai/config/scripts/DISKLESS_SERVER/10-setup b/fai/config/scripts/DISKLESS_SERVER/10-setup
index 9c0dee3..464addb 100755
--- a/fai/config/scripts/DISKLESS_SERVER/10-setup
+++ b/fai/config/scripts/DISKLESS_SERVER/10-setup
@@ -7,5 +7,5 @@ fcopy -m root,root,0755 /usr/sbin/nbdswapd
 
 $ROOTCMD update-inetd --add "9572 stream tcp nowait nobody /usr/sbin/tcpd /usr/sbin/nbdswapd"
 
-ainsl $target/etc/exports     "/opt              ${SUBNETMASK}(async,ro,no_subtree_check,no_root_squash)"
-ainsl $target/etc/hosts.allow "nbdswapd: ALL: keepalive"
+ainsl /etc/exports     "/opt              ${SUBNETMASK}(async,ro,no_subtree_check,no_root_squash)"
+ainsl /etc/hosts.allow "nbdswapd: ALL: keepalive"
diff --git a/fai/config/scripts/DNS_SERVER/10-zones b/fai/config/scripts/DNS_SERVER/10-zones
index 37c1bc7..ab8947c 100755
--- a/fai/config/scripts/DNS_SERVER/10-zones
+++ b/fai/config/scripts/DNS_SERVER/10-zones
@@ -6,7 +6,7 @@ if [ $FAI_ACTION != "install" ]; then
     exit 0
 fi
 
-ainsl $target/etc/bind/named.conf.local "include \"/etc/bind/localzones\";"
+ainsl /etc/bind/named.conf.local "include \"/etc/bind/localzones\";"
 
 ## Generate the DNS configuration.
 ## Use variables from corresponding class/*.var file.
diff --git a/fai/config/scripts/FAISERVER/30-exports b/fai/config/scripts/FAISERVER/30-exports
index 4fd2b5f..fc3f06e 100755
--- a/fai/config/scripts/FAISERVER/30-exports
+++ b/fai/config/scripts/FAISERVER/30-exports
@@ -2,5 +2,5 @@
 
 set -e
 
-ainsl $target/etc/exports "/srv/fai/nfsroot  ${FAINETMASK}(async,ro,no_subtree_check,no_root_squash)"
-ainsl $target/etc/exports "/srv/fai/config   ${FAINETMASK}(async,ro,no_subtree_check,no_root_squash)"
+ainsl /etc/exports "/srv/fai/nfsroot  ${FAINETMASK}(async,ro,no_subtree_check,no_root_squash)"
+ainsl /etc/exports "/srv/fai/config   ${FAINETMASK}(async,ro,no_subtree_check,no_root_squash)"

-- 
Debian-LAN development and packaging