Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=268668d405b3e93818f6195719ab54d164f7b064
commit 268668d405b3e93818f6195719ab54d164f7b064 Author: Miklos Vajna <[email protected]> Date: Thu Nov 15 22:06:52 2012 +0100 hal-0.5.14-19-x86_64 - drop sysvinit support diff --git a/source/apps-extra/hal/FrugalBuild b/source/apps-extra/hal/FrugalBuild index af839cf..5bf5980 100644 --- a/source/apps-extra/hal/FrugalBuild +++ b/source/apps-extra/hal/FrugalBuild @@ -4,7 +4,7 @@ pkgname=hal pkgver=0.5.14 -pkgrel=18 +pkgrel=19 pkgdesc="Hardware Abstraction Layer" url="http://www.freedesktop.org/wiki/Software/hal" depends=('dbus-glib>=0.74' 'util-linux' 'glib2' 'libcap>=2.19' 'dbus>=1.2.12-4' \ @@ -18,7 +18,6 @@ archs=('i686' 'x86_64') _F_archive_grepv="hal-info" up2date="Flasttar http://hal.freedesktop.org/releases/" source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz \ - rc.hald \ ntfs-3g.patch \ suspend_hibernate.patch \ hal-performance_pci.ids_v5.diff \ @@ -30,7 +29,6 @@ source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz \ org.freedesktop.Hal.service \ haldaemon.service) sha1sums=('95bdc8141b0bce197d0d47f5bec491b08c6e3853' \ - '4846dc72e10268768df9d301d0e92b2d4c7a3cc5' \ '2273e77c0c3c52aca31294b2b1a829937d0a3c18' \ '2fab4fd75f1359b0838748dfae4d749eb26b64b9' \ '654235977c83f76433f9737f37b8a18f04136b35' \ @@ -70,7 +68,6 @@ build() --build=${CHOST} Fmakeinstall Frm /etc/hotplug.d - Frcd hald Ffile /usr/share/dbus-1/system-services/org.freedesktop.Hal.service Ffile /lib/systemd/system/haldaemon.service Fln /dev/null /lib/systemd/system/hald.service diff --git a/source/apps-extra/hal/hal.install b/source/apps-extra/hal/hal.install index 527a1db..bcae5d3 100644 --- a/source/apps-extra/hal/hal.install +++ b/source/apps-extra/hal/hal.install @@ -12,8 +12,7 @@ post_install() fi # only on install - if [ -n "$1" -a -x /usr/sbin/chkconfig ]; then - /usr/sbin/chkconfig --add rc.hald + if [ -n "$1" ]; then # hald supports bus activation, no systemctl enable here systemctl daemon-reload >/dev/null 2>&1 else @@ -37,11 +36,8 @@ post_upgrade() pre_remove() { - if [ -x /usr/sbin/chkconfig ]; then - /usr/sbin/chkconfig --del rc.hald - systemctl stop haldaemon.service >/dev/null 2>&1 - systemctl disable haldaemon.service >/dev/null 2>&1 - fi + systemctl stop haldaemon.service >/dev/null 2>&1 + systemctl disable haldaemon.service >/dev/null 2>&1 # remove hald user if grep -q '^hald:' /etc/passwd; then /usr/sbin/userdel hald diff --git a/source/apps-extra/hal/messages/hald.de b/source/apps-extra/hal/messages/hald.de deleted file mode 100644 index 775ce45..0000000 --- a/source/apps-extra/hal/messages/hald.de +++ /dev/null @@ -1,2 +0,0 @@ -stophald="Stoppe HAL Daemon" -starthald="Starte HAL Daemon" diff --git a/source/apps-extra/hal/messages/hald.en b/source/apps-extra/hal/messages/hald.en deleted file mode 100644 index 1f7efcb..0000000 --- a/source/apps-extra/hal/messages/hald.en +++ /dev/null @@ -1,2 +0,0 @@ -stophald="Stopping HAL daemon" -starthald="Starting HAL daemon" diff --git a/source/apps-extra/hal/messages/hald.hu b/source/apps-extra/hal/messages/hald.hu deleted file mode 100644 index a084d93..0000000 --- a/source/apps-extra/hal/messages/hald.hu +++ /dev/null @@ -1,2 +0,0 @@ -stophald="A HAL démon leállítása" -starthald="A HAL démon indítása" diff --git a/source/apps-extra/hal/rc.hald b/source/apps-extra/hal/rc.hald deleted file mode 100644 index 9fcbb30..0000000 --- a/source/apps-extra/hal/rc.hald +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh - -# (c) 2004-2005 Laszlo Dvornik <[email protected]> -# rc.hald for Frugalware -# distributed under GPL License - -# chkconfig: 2345 98 02 -# description: Hardware Abstraction Layer daemon - -source /lib/initscripts/functions - -daemon=$"HAL daemon" -actions=(start stop restart status) -pid_dbus="pidof /usr/bin/dbus-daemon" -pid="pidof /usr/sbin/hald" - -rc_start() -{ - start_msg - if [ -z "$(eval $pid_dbus)" -o -n "$(eval $pid)" ]; then - ok 999 - else - # hald won't be functional without its own group, so add it if - # it's missing - if ! grep -q '^hald:' /etc/group; then - echo -n "Adding hald group..." - groupadd -g 39 hald - echo -e "done." - fi - - if ! grep -q '^hald:' /etc/passwd; then - echo -n "Adding hald user..." - useradd -c 'HAL Daemon' -u 39 -g hald -G cdrom,floppy,camera,storage -d '/' -s /bin/false hald - # lock the account we just created - passwd -l hald - echo -e "done." - fi - - if [ ! -d /var/run/hald ]; then - mkdir -p /var/run/hald - chown hald:hald /var/run/hald - else - chown hald:hald /var/run/hald - fi - - /usr/sbin/hald --daemon=yes - ok $? - fi -} - -rc_stop() -{ - stop_msg - if [ -n "$(eval $pid)" ] ; then - kill "$(eval $pid)" - ok $? - else - ok 999 - fi -} - -rc_exec $1 - diff --git a/source/apps-extra/hal/rc.hald.new b/source/apps-extra/hal/rc.hald.new deleted file mode 100644 index 967b587..0000000 --- a/source/apps-extra/hal/rc.hald.new +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl <[email protected]> -# (c) 2004-2005 Laszlo Dvornik <[email protected]> -# rc.hald for Frugalware -# distributed under GPL License - -# chkconfig: 2345 98 02 -# description: This is a daemon for collecting and maintaing information -# about hardware from several sources. - -source /lib/initscripts/functions -TEXTDOMAIN=hald - -actions=(restart start status stop) -daemon=$"HAL daemon" - -pid="$(pidof hald 2> /dev/null)" - -rc_start() -{ - start_msg - if [ -z ${pid} ] ; then - /usr/sbin/hald --retain-privileges - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [ ! -z ${pid} ] ; then - killall hald 2> /dev/null - ok $? - else - ok 999 - fi -} - -rc_exec $1 - -# vim: ft=sh
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
