[Pkg-utopia-commits] r3050 - in /packages/unstable/hal/debian: changelog hal.dirs hal.init hal.postinst hal.postrm rules
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed Apr 8 08:18:34 UTC 2009
Author: biebl
Date: Wed Apr 8 08:18:33 2009
New Revision: 3050
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3050
Log:
Change the run directory to /var/run/hald
* Bump Standards-Version to 3.8.1. See the changes wrt to the /var/run
directory below.
* debian/hal.dirs
- Do no longer install the /var/run/hal directory.
* debian/hal.init
- Change the location of PIDDIR to /var/run/hald and make it only
accessible to root.
* debian/rules
- Change pid file to /var/run/hald/hald.pid
* debian/hal.postinst
- Change the home directory of haldaemon to /var/run/hald and update it on
upgrades.
- Remove the chown call, let the init script take care of it.
* debian/hal.postrm
- Cleanup /var/run/hald upon removal.
Modified:
packages/unstable/hal/debian/changelog
packages/unstable/hal/debian/hal.dirs
packages/unstable/hal/debian/hal.init
packages/unstable/hal/debian/hal.postinst
packages/unstable/hal/debian/hal.postrm
packages/unstable/hal/debian/rules
Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=3050&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Wed Apr 8 08:18:33 2009
@@ -3,7 +3,8 @@
* Git snapshot of the upcoming 0.5.12 release.
* debian/control
- Wrap Build-Depends.
- - Bump Standards-Version to 3.8.1. No further changes.
+ - Bump Standards-Version to 3.8.1. See the changes wrt to the /var/run
+ directory below.
- Bump Build-Depends on debhelper to (>= 7).
- Add ${misc:Depends} to all binary packages.
* debian/compat
@@ -14,6 +15,19 @@
- debian/patches/56_revert_ntfs_locale_mount_option.patch
- debian/patches/60_use-phy80211-instead-of-wiphy-symlink-to-detect.patch
- debian/patches/61_use-wext-ioctl-instead-of-sysfs-to-detect-wireless.patch
+ * debian/hal.dirs
+ - Do no longer install the /var/run/hal directory.
+ * debian/hal.init
+ - Change the location of PIDDIR to /var/run/hald and make it only
+ accessible to root.
+ * debian/rules
+ - Change pid file to /var/run/hald/hald.pid
+ * debian/hal.postinst
+ - Change the home directory of haldaemon to /var/run/hald and update it on
+ upgrades.
+ - Remove the chown call, let the init script take care of it.
+ * debian/hal.postrm
+ - Cleanup /var/run/hald upon removal.
-- Michael Biebl <biebl at debian.org> Wed, 07 Jan 2009 23:55:22 +0100
Modified: packages/unstable/hal/debian/hal.dirs
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.dirs?rev=3050&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.dirs (original)
+++ packages/unstable/hal/debian/hal.dirs Wed Apr 8 08:18:33 2009
@@ -1,3 +1,2 @@
/var/cache/hald
/var/lib/hal
-/var/run/hal
Modified: packages/unstable/hal/debian/hal.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.init?rev=3050&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.init (original)
+++ packages/unstable/hal/debian/hal.init Wed Apr 8 08:18:33 2009
@@ -14,7 +14,7 @@
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/hald
-PIDDIR=/var/run/hal
+PIDDIR=/var/run/hald
PIDFILE=$PIDDIR/hald.pid
NAME=hald
DAEMONUSER=haldaemon
@@ -34,6 +34,7 @@
do_start() {
if [ ! -d $PIDDIR ]; then
mkdir -p $PIDDIR
+ chmod 770 $PIDDIR
chown $DAEMONUSER:$DAEMONUSER $PIDDIR
fi
start-stop-daemon --start --oknodo --pidfile $PIDFILE \
Modified: packages/unstable/hal/debian/hal.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.postinst?rev=3050&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.postinst (original)
+++ packages/unstable/hal/debian/hal.postinst Wed Apr 8 08:18:33 2009
@@ -29,7 +29,7 @@
--quiet \
--disabled-password \
--no-create-home \
- --home "/var/run/hal" \
+ --home "/var/run/hald" \
--gecos "Hardware abstraction layer" \
--group haldaemon
@@ -39,12 +39,14 @@
# Add the plugdev group (mounting removable devices)
addgroup --quiet --system plugdev || true
- # be sure the run dir is owned by the hal user
- chown haldaemon:haldaemon /var/run/hal
-
# Remove old stop symlinks on upgrades
if dpkg --compare-versions "$2" lt-nl "0.5.11-6"; then
rm -f /etc/rc[06].d/K??hal
+ fi
+
+ # Update haldaemon home directory
+ if dpkg --compare-versions "$2" lt-nl "0.5.12~git20090406.46dc48-1" ; then
+ usermod --home /var/run/hald haldaemon || true
fi
if [ -x /etc/init.d/dbus ]; then
Modified: packages/unstable/hal/debian/hal.postrm
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.postrm?rev=3050&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.postrm (original)
+++ packages/unstable/hal/debian/hal.postrm Wed Apr 8 08:18:33 2009
@@ -19,6 +19,9 @@
rm -f /var/cache/hald/fdi-cache
rmdir /var/cache/hald || true
+
+ rm -f /var/run/hald/acl-list
+ rmdir /var/run/hald || true
fi
exit 0
Modified: packages/unstable/hal/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/rules?rev=3050&op=diff
==============================================================================
--- packages/unstable/hal/debian/rules (original)
+++ packages/unstable/hal/debian/rules Wed Apr 8 08:18:33 2009
@@ -10,7 +10,7 @@
common-binary-post-install-arch:: list-missing
DEB_CONFIGURE_EXTRA_FLAGS := --enable-hotplug-map \
- --with-pid-file=/var/run/hal/hald.pid \
+ --with-pid-file=/var/run/hald/hald.pid \
--enable-pcmcia-support \
--with-hwdata=/usr/share/misc \
--without-macbook \
More information about the Pkg-utopia-commits
mailing list