[Fai-commit] r6688 - trunk/lib

[Thomas Lange]

Author: lange
Date: 2011-10-17 13:32:02 +0000 (Mon, 17 Oct 2011)
New Revision: 6688

Modified:
   trunk/lib/subroutines
Log:
add comment, move code


Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2011-10-17 13:22:28 UTC (rev 6687)
+++ trunk/lib/subroutines	2011-10-17 13:32:02 UTC (rev 6688)
@@ -893,14 +893,17 @@
 
     [ $do_init_tasks -eq 1 ] && FAI_ETC_DIR=/etc
 
+    # some generale network files are needed on the client
     # 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/resolv.conf || cp -v /etc/resolv.conf $FAI_ROOT/etc
+    fcopy -Bv /etc/hosts || cp -v /etc/hosts $FAI_ROOT/etc
+
+    # apt specific things
     fcopy -Bv /etc/apt/sources.list || cp -v $FAI_ETC_DIR/apt/sources.list $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
 
     if [ X$FAI_ALLOW_UNSIGNED = X1 ]; then