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

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 273853e8d5dcda4b217108051ec9b096f8517e31
Author: Andreas B. Mundt <andi at debian.org>
Date:   Mon Dec 31 12:01:18 2012 +0100

    Sync fixes/modifications from FAI 4.0.5 examples.
    
    Commits used from <URL:git://github.com/faiproject/fai.git>:
    
    	306c2149b790bedca27f13529f287a5acf75f137
    	ac8defe671b34936b154379d7a30233bdec36252
    	35c1b5780433c621e66fba3626668a02c531c56b

diff --git a/fai/config/disk_config/FAIBASE b/fai/config/disk_config/FAIBASE
index f03fd0c..7815fe4 100644
--- a/fai/config/disk_config/FAIBASE
+++ b/fai/config/disk_config/FAIBASE
@@ -5,7 +5,7 @@
 disk_config disk1 disklabel:msdos bootable:1 fstabkey:uuid
 
 primary /      250      ext4  rw,noatime,errors=remount-ro
-logical swap   200-1000 swap  rw
+logical swap   200-1000 swap  sw
 logical /var   600-1300 ext4  rw,noatime         createopts="-L var -m 5" tuneopts="-c 0 -i 0"
 logical /tmp   100-1G   ext4  rw,noatime,nosuid,nodev createopts="-L tmp -m 0" tuneopts="-c 0 -i 0"
 logical /usr   1G-8G    ext4  rw,noatime,nodev   createopts="-L usr"
diff --git a/fai/config/disk_config/FAISERVER b/fai/config/disk_config/FAISERVER
index 234fa6c..ff5ae40 100644
--- a/fai/config/disk_config/FAISERVER
+++ b/fai/config/disk_config/FAISERVER
@@ -5,7 +5,7 @@
 disk_config disk1 disklabel:msdos fstabkey:uuid
 
 primary  /             300        ext4   rw,noatime,errors=remount-ro
-logical  swap          200-1000   swap   rw
+logical  swap          200-1000   swap   sw
 logical  /var          600-5G     ext4   rw,noatime,nosuid,nodev  createopts="-m15" tuneopts="-c 0 -i 0"
 logical  /tmp          100-1000   ext4   rw,noatime,nosuid,nodev  createopts="-m 0" tuneopts="-c 0 -i 0"
 logical  /usr          1G-6G      ext4   rw,noatime
diff --git a/fai/config/hooks/savelog.LAST.source b/fai/config/hooks/savelog.LAST.source
index d30d030..183fbb7 100755
--- a/fai/config/hooks/savelog.LAST.source
+++ b/fai/config/hooks/savelog.LAST.source
@@ -132,6 +132,8 @@ warning: linuxlogo stop runlevel arguments (none) do not match
 insserv: warning: script .\+ missing LSB tags and overrides
 live-premount.\+ If this fails
 cannot read table of mounted file systems
+error: no alternatives for
+ERST: Error Record Serialization Table (ERST) support is initialized
 failed to stat /dev/pts"
 
 # add pattern on some conditions
diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface
index 4562baa..18dcecc 100755
--- a/fai/config/scripts/DEBIAN/30-interface
+++ b/fai/config/scripts/DEBIAN/30-interface
@@ -28,7 +28,7 @@ fi
 
 # here fcopy is mostly used, when installing a client for running in a
 # different subnet than during the installation
-fcopy -iU /etc/resolv.conf
+fcopy -iUM /etc/resolv.conf
 fcopy -iUM /etc/network/interfaces /etc/networks
 
 exit $error
diff --git a/fai/config/scripts/DEBIAN/40-misc b/fai/config/scripts/DEBIAN/40-misc
index 38feb38..6a76e15 100755
--- a/fai/config/scripts/DEBIAN/40-misc
+++ b/fai/config/scripts/DEBIAN/40-misc
@@ -10,7 +10,7 @@ for module in $MODULESLIST; do
     ainsl -a /etc/modules "^$module$"
 done
 
-fcopy -v /etc/hostname || echo $HOSTNAME > $target/etc/hostname
+fcopy -Mv /etc/hostname || echo $HOSTNAME > $target/etc/hostname
 ainsl -av /etc/mailname ${HOSTNAME}
 sed -i -e "s/^UTC.*/UTC=${UTC}/" $target/etc/default/rcS
 sed -i -e 's#/sbin/getty 38400#/sbin/getty --noclear -f /etc/issue.linuxlogo 38400#' ${target}/etc/inittab
@@ -18,6 +18,6 @@ sed -i -e 's#/sbin/getty 38400#/sbin/getty --noclear -f /etc/issue.linuxlogo 384
 [ $FAI_ACTION = "softupdate" ] || cp /etc/fai/fai.conf $target/etc/fai/fai.conf
 ainsl -av /etc/fai/fai.conf "FAI_CONFIG_SRC=$FAI_CONFIG_SRC"
 
-fcopy -iv /etc/fai/fai.conf
+fcopy -Miv /etc/fai/fai.conf
 
 exit $error
diff --git a/fai/config/scripts/DISKLESS_CLIENT/10-misc b/fai/config/scripts/DISKLESS_CLIENT/10-misc
index 86c7549..de6934a 100755
--- a/fai/config/scripts/DISKLESS_CLIENT/10-misc
+++ b/fai/config/scripts/DISKLESS_CLIENT/10-misc
@@ -5,13 +5,13 @@
 
 set -e
 
-fcopy -v /etc/hosts
+fcopy -Mv /etc/hosts
 
 ## use hostname offered by dhcp server:
 rm -fv $target/etc/hostname
 
 ## fetch template and fill in nameserver's IP address:
-fcopy -v /etc/resolv.conf
+fcopy -Mv /etc/resolv.conf
 IP=`host ns | tail -n 1 | awk '{print $NF}'`
 sed -i "s/NAMESERVER/$IP/" $target/etc/resolv.conf
 
diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc
index 873771d..b565436 100755
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@ -33,7 +33,7 @@ fi
 lskernels=$(echo $target/boot/vmlinu*)
 [ -f ${lskernels%% *} ] || echo "ERROR: No kernel was installed. Have a look at shell.log" >&2
 # copy sources.list
-fcopy -i /etc/apt/sources.list
+fcopy -iM /etc/apt/sources.list
 
 exit $error
 

-- 
Debian-LAN development and packaging