[arch-commits] Commit in rfkill/trunk (PKGBUILD service service.block service.unblock)

[Gaetan Bisson]

    Date: Sunday, November 11, 2012 @ 16:54:21
  Author: bisson
Revision: 170799

fix FS#32421

Added:
  rfkill/trunk/service.block
  rfkill/trunk/service.unblock
Modified:
  rfkill/trunk/PKGBUILD
Deleted:
  rfkill/trunk/service

-----------------+
 PKGBUILD        |   11 +++++++----
 service         |   11 -----------
 service.block   |   11 +++++++++++
 service.unblock |   11 +++++++++++
 4 files changed, 29 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-11 16:22:13 UTC (rev 170798)
+++ PKGBUILD	2012-11-11 21:54:21 UTC (rev 170799)
@@ -5,19 +5,21 @@
 
 pkgname=rfkill
 pkgver=0.4
-pkgrel=5
+pkgrel=6
 pkgdesc='Tool for enabling and disabling wireless devices'
 url='http://linuxwireless.org/en/users/Documentation/rfkill'
 license=('custom')
 arch=('i686' 'x86_64')
 source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'service.unblock'
+        'service.block'
         'rules.d'
-        'service'
         'conf.d'
         'rc.d')
 sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b'
+          '8b4f0effcad564e929cf65c50773881d1209e54b'
+          '10febfa26656bc395aeca477d4d44a1e0482375c'
           '6390eaa793b473098aaa11b13c5254d611a4c13a'
-          'cadc563f967c5ac680e7cdfd764718b412201f8a'
           'd969fe927a9fb2926af43a311a7c1fa126fe59a9'
           '380af0b002f51543557306ed68a27f0059fd5a6f')
 
@@ -33,7 +35,8 @@
 	make DESTDIR="${pkgdir}" install
 	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
-	install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/rfkill.service"
+	install -Dm644 ../service.block "${pkgdir}/usr/lib/systemd/system/rfkill-block at .service"
+	install -Dm644 ../service.unblock "${pkgdir}/usr/lib/systemd/system/rfkill-unblock at .service"
 	install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill"
 	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill"
 }

Deleted: service
===================================================================
--- service	2012-11-11 16:22:13 UTC (rev 170798)
+++ service	2012-11-11 21:54:21 UTC (rev 170799)
@@ -1,11 +0,0 @@
-[Unit]
-Description=RFKill-Block Selected Devices
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/rfkill block 9999
-ExecStop=/usr/sbin/rfkill unblock all
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target

Added: service.block
===================================================================
--- service.block	                        (rev 0)
+++ service.block	2012-11-11 21:54:21 UTC (rev 170799)
@@ -0,0 +1,11 @@
+[Unit]
+Description=RFKill-Block %I
+After=rfkill-unblock at all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/rfkill block %I
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

Added: service.unblock
===================================================================
--- service.unblock	                        (rev 0)
+++ service.unblock	2012-11-11 21:54:21 UTC (rev 170799)
@@ -0,0 +1,11 @@
+[Unit]
+Description=RFKill-Unblock %I
+After=rfkill-block at all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/rfkill unblock %I
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target