[arch-commits] Commit in ipvsadm/trunk (PKGBUILD ipvsadm.systemd)

[Sébastien Luttringer]

    Date: Sunday, February 3, 2013 @ 15:26:27
  Author: seblu
Revision: 83589

upgpkg: ipvsadm 1.26-7

Modified:
  ipvsadm/trunk/PKGBUILD
  ipvsadm/trunk/ipvsadm.systemd

-----------------+
 PKGBUILD        |    8 +++++---
 ipvsadm.systemd |    3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-03 14:23:35 UTC (rev 83588)
+++ PKGBUILD	2013-02-03 14:26:27 UTC (rev 83589)
@@ -4,7 +4,7 @@
 
 pkgname=ipvsadm
 pkgver=1.26
-pkgrel=6
+pkgrel=7
 pkgdesc='The IP Virtual Server administration utility'
 arch=('i686' 'x86_64')
 url='http://www.linuxvirtualserver.org/software/ipvs.html'
@@ -18,14 +18,14 @@
         "$pkgname.service"
         '01-fix-not-showing-all-server.patch')
 md5sums=('eac3ba3f62cd4dea2da353aeddd353a8'
-         'df28308873b437eeb55657f6aa438ecd'
+         'b45ef25d384a7a68b51ff80d0fe81dd2'
          'dc87684064f85b64c1e79c1eac336303'
          'e9fb77d2fbe2d3f41d60257316338543')
 
 build() {
   cd $pkgname-$pkgver
   patch -p1 -i ../01-fix-not-showing-all-server.patch
-  make #INCLUDE="-I/usr/src/linux-$(uname -r)/include -I.. -I."
+  make
 }
 
 package() {
@@ -42,6 +42,8 @@
     "$pkgdir/usr/lib/systemd/scripts/$pkgname"
   install -Dm 644 $pkgname.service \
     "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  # remove legacy init system
+  rm -rf "$pkgdir/etc/rc.d"
   # default config file
   install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf"
 }

Modified: ipvsadm.systemd
===================================================================
--- ipvsadm.systemd	2013-02-03 14:23:35 UTC (rev 83588)
+++ ipvsadm.systemd	2013-02-03 14:26:27 UTC (rev 83589)
@@ -1,13 +1,12 @@
 #!/bin/bash
 
-. /etc/conf.d/ipvsadm
+CONFIG_FILE='/etc/ipvsadm.conf'
 
 case $1 in
   start)
     ipvsadm-restore < "$CONFIG_FILE"
   ;;
   stop)
-    [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save
     ipvsadm -C
   ;;
   save)