[Fai-commit] r5457 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2009-07-19 21:07:56 +0000 (Sun, 19 Jul 2009)
New Revision: 5457

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
  dereference symli nks when copying file into nfsroot

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2009-07-19 18:14:24 UTC (rev 5456)
+++ trunk/bin/make-fai-nfsroot	2009-07-19 21:07:56 UTC (rev 5457)
@@ -223,7 +223,7 @@
 
     # copy to nfsroot
     echo "root:$FAI_ROOTPW" | $ROOTCMD chpasswd --encrypted
-    cp -Rpv $cfdir/* $NFSROOT/etc/fai
+    cp -RLpv $cfdir/* $NFSROOT/etc/fai
     # append additional variables to fai.conf for the install clients
     [ -z "$FAI_CONFIG_SRC" ] && echo "FAI_CONFIG_SRC=nfs://`hostname`$FAI_CONFIGDIR" >> $NFSROOT/etc/fai/fai.conf
 
@@ -304,7 +304,7 @@
     > etc/raidtab
     echo 'NTPSERVERS=""' > etc/default/ntp-servers
 
-    cp -a $cfdir/apt $NFSROOT/etc
+    cp -La $cfdir/apt $NFSROOT/etc
 
     ainsl -as $NFSROOT/etc/hosts "127.0.0.1 localhost"
     ainsl     $NFSROOT/etc/hosts "$NFSROOT_ETC_HOSTS"
@@ -321,7 +321,7 @@
 
     # overwrite default live.conf
     if [ -f $cfdir/live.conf ]; then
-	cp -p $cfdir/live.conf etc/live.conf
+	cp -Lp $cfdir/live.conf etc/live.conf
     else
 	cat > etc/live.conf <<EOF
 # UNIONTYPE=aufs # if unionfs is broken
@@ -360,8 +360,8 @@
 upgrade_nfsroot() {
 
     if [ -f /etc/resolv.conf ]; then
-	cp -p $v /etc/resolv.conf $NFSROOT/etc/resolv.conf-installserver
-	cp -p $v /etc/resolv.conf $NFSROOT/etc/resolv.conf # this is needed during make-fai-nfsroot
+	cp -Lp $v /etc/resolv.conf $NFSROOT/etc/resolv.conf-installserver
+	cp -Lp $v /etc/resolv.conf $NFSROOT/etc/resolv.conf # this is needed during make-fai-nfsroot
     fi
     mount -t proc /proc $NFSROOT/proc
     mount -t sysfs /sys $NFSROOT/sys

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-07-19 18:14:24 UTC (rev 5456)
+++ trunk/debian/changelog	2009-07-19 21:07:56 UTC (rev 5457)
@@ -12,6 +12,7 @@
     /files/packages
   * ainsl: create missing path elements if -a is used (closes: #447199)
   * make-fai-nfsroot: mount sysfs inside nfsroot (closes: #532985)
+    dereference symli nks when copying file into nfsroot
   * debian/control: Depends: iproute for fai-client, fai-server
   * fai-setup, make-fai-nfsroot, subroutine-linux, get-boot-info,
     task_sysinfo, S99fai-setup/FAISERVER: Replaced all calls to ifconfig
@@ -63,7 +64,7 @@
     debugging this).  (closes: #532321)
   * Bumped setup-storage version number to 1.1.
   
- -- Thomas Lange <lange at debian.org>  Sun, 19 Jul 2009 12:08:02 +0200
+ -- Thomas Lange <lange at debian.org>  Sun, 19 Jul 2009 23:07:51 +0200
 
 fai (3.2.20) unstable; urgency=low