[Fai-commit] r4251 - in people/h01ger/softupdate-git-rpm: debian lib

[Holger Levsen]

Author: h01ger-guest
Date: 2007-04-11 14:32:17 +0000 (Wed, 11 Apr 2007)
New Revision: 4251

Modified:
   people/h01ger/softupdate-git-rpm/debian/changelog
   people/h01ger/softupdate-git-rpm/lib/subroutines
Log:
fixed subroutines to not give an error if not installed with fai 
(Closes: #415880)



Modified: people/h01ger/softupdate-git-rpm/debian/changelog
===================================================================
--- people/h01ger/softupdate-git-rpm/debian/changelog	2007-04-11 14:28:36 UTC (rev 4250)
+++ people/h01ger/softupdate-git-rpm/debian/changelog	2007-04-11 14:32:17 UTC (rev 4251)
@@ -2,6 +2,8 @@
 
   * added get-config-dir-git
   * added Suggests: subversion, git-core to fai-client
+  * fixed subroutines to not give an error if not installed with fai 
+    (Closes: #415880)
 
  -- Holger Levsen <debian at layer-acht.org>  Wed, 11 Apr 2007 14:26:23 +0200
 

Modified: people/h01ger/softupdate-git-rpm/lib/subroutines
===================================================================
--- people/h01ger/softupdate-git-rpm/lib/subroutines	2007-04-11 14:28:36 UTC (rev 4250)
+++ people/h01ger/softupdate-git-rpm/lib/subroutines	2007-04-11 14:32:17 UTC (rev 4251)
@@ -503,7 +503,7 @@
     fi
     # the following copy operation is required to make $LOGDIR a reliable source
     # for disk_var.sh
-    cp -p /var/lib/fai/disk_var.sh $LOGDIR # use the last disk_var during update
+    [ -f /var/lib/fai/disk_var.sh ] && cp -p /var/lib/fai/disk_var.sh $LOGDIR # use the last disk_var during update
 
     defnop wait_for_jobs
     save_dmesg