[Fai-commit] r5557 - in trunk: debian lib
Thomas Lange
lange at alioth.debian.org
Sun Oct 18 08:50:16 UTC 2009
Author: lange
Date: 2009-10-18 08:50:16 +0000 (Sun, 18 Oct 2009)
New Revision: 5557
Modified:
trunk/debian/changelog
trunk/lib/subroutines
Log:
if two softupdates are running, print the name of the lock file
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-10-17 22:59:20 UTC (rev 5556)
+++ trunk/debian/changelog 2009-10-18 08:50:16 UTC (rev 5557)
@@ -13,6 +13,7 @@
create /var/run/sshd (needed for ubuntu 9.10)
additional call to clean_exit in task_dirinstall
include subroutines-linux into subroutines (closes: #494377)
+ if two softupdates are running, print the name of the lock file
* fai-class: add string warning to message
* task_sysinfo: call blkid on all disks
* fcopy: add die() after open command
Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines 2009-10-17 22:59:20 UTC (rev 5556)
+++ trunk/lib/subroutines 2009-10-18 08:50:16 UTC (rev 5557)
@@ -558,7 +558,7 @@
stamp=/var/run/fai/fai_softupdate_is_running
trap "rm -f $stamp" INT QUIT EXIT
- [ -f "$stamp" ] && die "Another fai softupdate is already running. Aborting."
+ [ -f "$stamp" ] && die "Lock file $stamp found. Another fai softupdate is already running. Aborting."
echo $$ > $stamp
# if the system had been installed using fai < 3.0 disk_var.sh is found in /etc/fai
if [ ! -f /var/lib/fai/disk_var.sh -a -f /etc/fai/disk_var.sh ] ; then
More information about the Fai-commit
mailing list