- rel 1

[packages/arcavir.git] / arcavir-update.patch

diff --git a/arcavir-update.patch b/arcavir-update.patch
index fd0ceba6651e95f93f2f95889c7d01feb8bbf9df..f166c552625247cd34fe4afaed0bbbaff4ae3a19 100644 (file)
--- a/arcavir-update.patch
+++ b/arcavir-update.patch
@@ -7,7 +7,7 @@ diff -ur arcavir2010/usr/bin/arcaupdate arcavir2010-update/usr/bin/arcaupdate
  #
  # ArcaVir 2010 Server update script.
  # Copyright (C) 2009 ArcaBit sp. z o.o.
-@@ -10,18 +10,17 @@
+@@ -10,18 +10,18 @@
  
  . /usr/share/arcavir/functions || { echo 'Cannot load /usr/share/arcavir/functions!'; exit 1; }
  
@@ -29,7 +29,8 @@ diff -ur arcavir2010/usr/bin/arcaupdate arcavir2010-update/usr/bin/arcaupdate
 -#fi
 +              ${bt} "${dst}"var/lib/arcavir/bases/ "${dst}"var/lib/arcavir/bases/abasetr_bt.dat
 +      chown -R arcabit:arcabit "${dst}"/var/lib/arcavir/bases/
-+        /sbin/service arcad reload
++      read arcadpid 2>/dev/null </var/run/arcad.pid
++      [ -n "$arcadpid" ] && kill -HUP $arcadpid
 +        ${rm} -f ${lockfile}
 +else
 +        die 'Cannot open lockfile'
@@ -96,3 +97,14 @@ diff -ur arcavir2010/usr/bin/arcaupdate-get arcavir2010-update/usr/bin/arcaupdat
  
  tmpfile=/tmp/arcaupdate.tmp
  
+--- arcavir2010-update/usr/share/arcavir/functions~    2010-08-09 14:20:39.000000000 +0200
++++ arcavir2010-update/usr/share/arcavir/functions     2010-08-18 11:06:41.569925597 +0200
+@@ -24,7 +24,7 @@
+ # Various other variables
+ repo=/var/cache/arcavir/update
+ dst=/
+-lockfile=/var/run/arcaupdate.lock
++lockfile=/var/cache/arcavir/update/arcaupdate.lock
+ 
+ rsyncpath=80.72.37.138/ArcaLinux2010
+ httppath=80.72.37.138/update/ArcaLinux2010