[arch-commits] Commit in partimage/trunk (PKGBUILD partimaged partimaged.service)

[Sébastien Luttringer]

    Date: Friday, May 31, 2013 @ 02:06:21
  Author: seblu
Revision: 92034

upgpkg: partimage 0.6.9-4

- /usr merge

Modified:
  partimage/trunk/PKGBUILD
  partimage/trunk/partimaged.service
Deleted:
  partimage/trunk/partimaged

--------------------+
 PKGBUILD           |    9 ++-----
 partimaged         |   64 ---------------------------------------------------
 partimaged.service |    2 -
 3 files changed, 4 insertions(+), 71 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-30 23:55:47 UTC (rev 92033)
+++ PKGBUILD	2013-05-31 00:06:21 UTC (rev 92034)
@@ -7,7 +7,7 @@
 
 pkgname=partimage
 pkgver=0.6.9
-pkgrel=3
+pkgrel=4
 pkgdesc='Partition Image saves partitions in many formats to an image file.'
 arch=('i686' 'x86_64')
 url='http://www.partimage.org/'
@@ -17,21 +17,19 @@
 install='partimage.install'
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'partimage-0.6.9-zlib-1.2.6.patch'
-        'partimaged'
         'partimaged-gencrt'
         'partimaged.service')
 md5sums=('1bc046fd915c5debbafc85729464e513'
          '202c4334766041d98c5f67c9d62c3063'
-         'f3b517a62de5540f3b1a8b7edf65b7ec'
          '2316b116227b07efb48266e660ca1ba1'
-         '4102983fdf6e7af7cac73fdf9d37a6f6')
+         '5f8dae511cdfbf097409a45e9642a372')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -p1 -i ../partimage-0.6.9-zlib-1.2.6.patch
 
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-pam
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --enable-pam
   make
   make pamfile
 }
@@ -42,7 +40,6 @@
   make DESTDIR="${pkgdir}" install
 
   install -Dm0644 partimaged.pam "${pkgdir}/etc/pam.d/partimaged"
-  install -Dm0755 "${srcdir}/partimaged" "${pkgdir}/etc/rc.d/partimaged"
   install -Dm0755 "${srcdir}/partimaged-gencrt" "${pkgdir}/usr/bin/partimaged-gencrt"
   chmod 644 "${pkgdir}/etc/partimaged/partimagedusers"
 

Deleted: partimaged
===================================================================
--- partimaged	2013-05-30 23:55:47 UTC (rev 92033)
+++ partimaged	2013-05-31 00:06:21 UTC (rev 92034)
@@ -1,64 +0,0 @@
-#!/bin/bash
-# This file belongs in /etc/rc.d
-#
-###############################################################################
-
-#inserting certain functions (like stat_busy)
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PARTIMAGE=/usr/sbin/
-
-# Check the file is there and is executable.
-[ -x $PARTIMAGE/partimaged ] || exit 0
-
-PID=`pidof -o %PPID /usr/sbin/partimaged`
-
-# See how we were called.
-case "$1" in
-  start)
-	stat_busy "Starting Partimage Daemon "
-	if [ -z "$PID" ]; then 
-	   /usr/sbin/partimaged -D &>/dev/null
-	   RETVAL=$? #storing the status of the last command to RETVAL
-	   if [ $? -gt 0 ]; then #if the status was other than 0, the command failed
-	      stat_fail
-	      exit 1
-           else			
-	      add_daemon partimaged
-	      stat_done
-	   fi
-	else
-	   stat_fail
-	   echo ":: Daemon already started as pid $PID"
-	   exit 1
-	fi			    
-	;;
-  stop)
-	stat_busy "Stopping Partimage Daemon "
-	if [ "$PID" != "" ]; then #if PID exists
-	   kill -KILL $PID &>/dev/null
-	   stat_done
-	   if [ $? -gt 0 ]; then
-	      stat_fail
-	      exit 1
-	   else		  
-	      RETVAL=$?
-	      rm_daemon partimaged
-      	   fi
-  	 else   
-	   stat_fail
-	   echo ":: Daemon already stopped"
-	   exit 1
-   	fi
-	;;
-  restart|reload)
-	$0 stop
-	$0 start
-	RETVAL=$?
-	;;
-  *)
-	echo "Usage: partimaged {start|stop|restart|reload}"
-	exit 1
-esac
-exit $RETVAL

Modified: partimaged.service
===================================================================
--- partimaged.service	2013-05-30 23:55:47 UTC (rev 92033)
+++ partimaged.service	2013-05-31 00:06:21 UTC (rev 92034)
@@ -4,7 +4,7 @@
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/partimaged --daemon
+ExecStart=/usr/bin/partimaged --daemon
 
 [Install]
 WantedBy=multi-user.target