[Fai-commit] r5122 - in trunk: debian lib

[lange at alioth.debian.org]

Author: lange
Date: 2008-09-06 17:21:00 +0000 (Sat, 06 Sep 2008)
New Revision: 5122

Modified:
   trunk/debian/changelog
   trunk/lib/subroutines
Log:
  (closes: #439101),
  do not access /proc/uptime if /proc is not mounted (closes: #496234)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-09-06 17:05:11 UTC (rev 5121)
+++ trunk/debian/changelog	2008-09-06 17:21:00 UTC (rev 5122)
@@ -13,7 +13,8 @@
   * fai-cd: do not redirect stdout to /dev/null when calling find_fai_data,
     otherwise we do not get any errors when the grub call fails ($WHY)
   * subroutines: use proper path to RUNNING_FROM_FAICD to make eject work
-    (closes: #439101)
+    (closes: #439101),
+    do not access /proc/uptime if /proc is not mounted (closes: #496234)
   * fai-client.postrm: use rm -rf, we do so in other maintainer scripts as
     well and /var/run/fai is probably the least critical place
     (closes: #494423)

Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2008-09-06 17:05:11 UTC (rev 5121)
+++ trunk/lib/subroutines	2008-09-06 17:21:00 UTC (rev 5122)
@@ -549,7 +549,7 @@
     task instsoft
     task configure
     date
-    echo "The $FAI_ACTION took $[$(cut -d . -f 1 /proc/uptime)-$start_seconds] seconds."
+    [ -f /proc/uptime ] && echo "The $FAI_ACTION took $[$(cut -d . -f 1 /proc/uptime)-$start_seconds] seconds."
 
     rm -f $stamp
     # save again, because new messages could be created