[Fai-commit] r5933 - trunk/lib

[Thomas Lange]

Author: lange
Date: 2010-08-02 03:57:54 +0000 (Mon, 02 Aug 2010)
New Revision: 5933

Modified:
   trunk/lib/subroutines
Log:
fix syntax error


Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2010-08-01 21:55:28 UTC (rev 5932)
+++ trunk/lib/subroutines	2010-08-02 03:57:54 UTC (rev 5933)
@@ -855,8 +855,9 @@
     # resolv.conf is needed, /etc/hosts is useful in /target
     # use a file from the config space or from /etc inside the nfsroot
     fcopy -Bv /etc/apt/sources.list || cp -v $FAI_ETC_DIR/apt/sources.list $FAI_ROOT/etc/apt
-    fcopy -Bv /etc/apt/preferences || [ -f $FAI_ETC_DIR/apt/preferences ] && \ 
-          cp -v $FAI_ETC_DIR/apt/preferences $FAI_ROOT/etc/apt
+    if fcopy -Bv /etc/apt/preferences; then
+	[ -f $FAI_ETC_DIR/apt/preferences ] && cp -v $FAI_ETC_DIR/apt/preferences $FAI_ROOT/etc/apt 
+    fi
     fcopy -Bv /etc/resolv.conf || cp -v /etc/resolv.conf $FAI_ROOT/etc
     fcopy -Bv /etc/hosts || cp -v /etc/hosts $FAI_ROOT/etc
     fcopy -ir /etc/apt # copy all other apt config files from the config space