[arch-commits] Commit in rfkill/trunk (8 files)
Gaetan Bisson
bisson at archlinux.org
Wed Aug 15 01:16:14 UTC 2012
Date: Tuesday, August 14, 2012 @ 21:16:13
Author: bisson
Revision: 165296
add service file, cleanup PKGBUILD
Added:
rfkill/trunk/conf.d
(from rev 165295, rfkill/trunk/rfkill.conf.d)
rfkill/trunk/rc.d
(from rev 165295, rfkill/trunk/rfkill.rc.d)
rfkill/trunk/rules.d
(from rev 165295, rfkill/trunk/60-rfkill.rules)
rfkill/trunk/service
Modified:
rfkill/trunk/PKGBUILD
Deleted:
rfkill/trunk/60-rfkill.rules
rfkill/trunk/rfkill.conf.d
rfkill/trunk/rfkill.rc.d
-----------------+
60-rfkill.rules | 1 -
PKGBUILD | 52 +++++++++++++++++++++++++++-------------------------
conf.d | 20 ++++++++++++++++++++
rc.d | 38 ++++++++++++++++++++++++++++++++++++++
rfkill.conf.d | 20 --------------------
rfkill.rc.d | 38 --------------------------------------
rules.d | 1 +
service | 11 +++++++++++
8 files changed, 97 insertions(+), 84 deletions(-)
Deleted: 60-rfkill.rules
===================================================================
--- 60-rfkill.rules 2012-08-15 00:30:47 UTC (rev 165295)
+++ 60-rfkill.rules 2012-08-15 01:16:13 UTC (rev 165296)
@@ -1 +0,0 @@
-KERNEL=="rfkill", GROUP="rfkill", MODE="0664"
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-08-15 00:30:47 UTC (rev 165295)
+++ PKGBUILD 2012-08-15 01:16:13 UTC (rev 165296)
@@ -1,37 +1,39 @@
# $Id$
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Thomas Bächler <thomas at archlinux.org>
# Contributor: Giovanni Scafora <giovanni at archlinux.org>
pkgname=rfkill
pkgver=0.4
-pkgrel=4
-pkgdesc="A tool for enabling and disabling wireless devices"
+pkgrel=5
+pkgdesc='Tool for enabling and disabling wireless devices'
+url='http://linuxwireless.org/en/users/Documentation/rfkill'
+license=('custom')
arch=('i686' 'x86_64')
-url="http://linuxwireless.org/en/users/Documentation/rfkill"
-license=('custom')
-source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2
- 60-rfkill.rules
- rfkill.conf.d
- rfkill.rc.d)
-backup=(etc/conf.d/rfkill)
-md5sums=('727892c0fb35c80ee3849fbe89b45350'
- '63f9bf9264911242e430867a41e8918c'
- '398e7cadf023e05e3e0c323aa33575b9'
- '793f0510e26547eb2632efce7d16e50e')
+source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+ 'rules.d'
+ 'service'
+ 'conf.d'
+ 'rc.d')
+sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b'
+ '6390eaa793b473098aaa11b13c5254d611a4c13a'
+ 'cadc563f967c5ac680e7cdfd764718b412201f8a'
+ 'd969fe927a9fb2926af43a311a7c1fa126fe59a9'
+ '380af0b002f51543557306ed68a27f0059fd5a6f')
+backup=('etc/conf.d/rfkill')
+
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- # License
- install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- # Udev rule
- install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
- # Init script
- install -Dm644 "${srcdir}/rfkill.conf.d" "${pkgdir}/etc/conf.d/rfkill"
- install -Dm755 "${srcdir}/rfkill.rc.d" "${pkgdir}/etc/rc.d/rfkill"
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ 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 ../conf.d "${pkgdir}/etc/conf.d/rfkill"
+ install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill"
}
Copied: rfkill/trunk/conf.d (from rev 165295, rfkill/trunk/rfkill.conf.d)
===================================================================
--- conf.d (rev 0)
+++ conf.d 2012-08-15 01:16:13 UTC (rev 165296)
@@ -0,0 +1,20 @@
+#
+# /etc/conf.d/rfkill
+# Configuration for the rfkill startup script
+#
+
+# List of devices to block on startup (space-separated)
+RFKILL_BLOCK=""
+
+# List of devices to unblock on startup (space-separated)
+RFKILL_UNBLOCK="all"
+
+# Supported device names are: all, wifi, bluetooth, umb, wimax, wwan, gps and specific device names like phy0, hci0, ...
+# See "rfkill list" for available devices
+# Examples:
+#
+# Block all bluetooth devices:
+# RFKILL_BLOCK="bluetooth"
+#
+# Unblock the phy0 wifi device and all wwan devices:
+# RFKILL_UNBLOCK="phy0 wwan"
Copied: rfkill/trunk/rc.d (from rev 165295, rfkill/trunk/rfkill.rc.d)
===================================================================
--- rc.d (rev 0)
+++ rc.d 2012-08-15 01:16:13 UTC (rev 165296)
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/rfkill
+
+case "$1" in
+ start)
+ for device in ${RFKILL_BLOCK}; do
+ stat_busy "Blocking rfkill device: ${device}"
+ /usr/sbin/rfkill block ${device}
+ if [ $? -eq 0 ]; then
+ stat_done
+ else
+ stat_fail
+ fi
+ done
+ for device in ${RFKILL_UNBLOCK}; do
+ stat_busy "Unblocking rfkill device: ${device}"
+ /usr/sbin/rfkill unblock ${device}
+ if [ $? -eq 0 ]; then
+ stat_done
+ else
+ stat_fail
+ fi
+ done
+ ;;
+ stop)
+ ;;
+ restart)
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start}"
+ exit 1
+ ;;
+esac
+exit 0
Deleted: rfkill.conf.d
===================================================================
--- rfkill.conf.d 2012-08-15 00:30:47 UTC (rev 165295)
+++ rfkill.conf.d 2012-08-15 01:16:13 UTC (rev 165296)
@@ -1,20 +0,0 @@
-#
-# /etc/conf.d/rfkill
-# Configuration for the rfkill startup script
-#
-
-# List of devices to block on startup (space-separated)
-RFKILL_BLOCK=""
-
-# List of devices to unblock on startup (space-separated)
-RFKILL_UNBLOCK="all"
-
-# Supported device names are: all, wifi, bluetooth, umb, wimax, wwan, gps and specific device names like phy0, hci0, ...
-# See "rfkill list" for available devices
-# Examples:
-#
-# Block all bluetooth devices:
-# RFKILL_BLOCK="bluetooth"
-#
-# Unblock the phy0 wifi device and all wwan devices:
-# RFKILL_UNBLOCK="phy0 wwan"
Deleted: rfkill.rc.d
===================================================================
--- rfkill.rc.d 2012-08-15 00:30:47 UTC (rev 165295)
+++ rfkill.rc.d 2012-08-15 01:16:13 UTC (rev 165296)
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/rfkill
-
-case "$1" in
- start)
- for device in ${RFKILL_BLOCK}; do
- stat_busy "Blocking rfkill device: ${device}"
- /usr/sbin/rfkill block ${device}
- if [ $? -eq 0 ]; then
- stat_done
- else
- stat_fail
- fi
- done
- for device in ${RFKILL_UNBLOCK}; do
- stat_busy "Unblocking rfkill device: ${device}"
- /usr/sbin/rfkill unblock ${device}
- if [ $? -eq 0 ]; then
- stat_done
- else
- stat_fail
- fi
- done
- ;;
- stop)
- ;;
- restart)
- $0 start
- ;;
- *)
- echo "usage: $0 {start}"
- exit 1
- ;;
-esac
-exit 0
Copied: rfkill/trunk/rules.d (from rev 165295, rfkill/trunk/60-rfkill.rules)
===================================================================
--- rules.d (rev 0)
+++ rules.d 2012-08-15 01:16:13 UTC (rev 165296)
@@ -0,0 +1 @@
+KERNEL=="rfkill", GROUP="rfkill", MODE="0664"
Added: service
===================================================================
--- service (rev 0)
+++ service 2012-08-15 01:16:13 UTC (rev 165296)
@@ -0,0 +1,11 @@
+[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
More information about the arch-commits
mailing list