[Pkg-utopia-commits] r3588 - in /packages/unstable/avahi/debian: avahi-autoipd.install avahi-autoipd.postinst avahi-autoipd.postrm avahi-autoipd.preinst changelog
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Fri Jun 25 23:44:52 UTC 2010
Author: biebl
Date: Fri Jun 25 23:44:52 2010
New Revision: 3588
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3588
Log:
Move dhclient hooks from /etc/dhcp3/ to /etc/dhcp/ as isc-dhcp-client
(ISC DHCP v4) uses this new location. Create symlinks for dhcp3-client
and preserve any local modifications. (Closes: #583992)
Added:
packages/unstable/avahi/debian/avahi-autoipd.preinst
Modified:
packages/unstable/avahi/debian/avahi-autoipd.install
packages/unstable/avahi/debian/avahi-autoipd.postinst
packages/unstable/avahi/debian/avahi-autoipd.postrm
packages/unstable/avahi/debian/changelog
Modified: packages/unstable/avahi/debian/avahi-autoipd.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/avahi-autoipd.install?rev=3588&op=diff
==============================================================================
--- packages/unstable/avahi/debian/avahi-autoipd.install (original)
+++ packages/unstable/avahi/debian/avahi-autoipd.install Fri Jun 25 23:44:52 2010
@@ -1,3 +1,3 @@
debian/tmp/usr/sbin/avahi-autoipd
debian/tmp/etc/avahi/avahi-autoipd.action
-debian/tmp/etc/dhcp3/
+debian/tmp/etc/dhcp3/* etc/dhcp/
Modified: packages/unstable/avahi/debian/avahi-autoipd.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/avahi-autoipd.postinst?rev=3588&op=diff
==============================================================================
--- packages/unstable/avahi/debian/avahi-autoipd.postinst (original)
+++ packages/unstable/avahi/debian/avahi-autoipd.postinst Fri Jun 25 23:44:52 2010
@@ -1,6 +1,18 @@
#!/bin/sh
set -e
+
+# Move a conffile without triggering a dpkg question
+mv_conffile() {
+ local OLDCONFFILE="$1"
+ local NEWCONFFILE="$2"
+
+ [ -e "$OLDCONFFILE" ] || return 0
+
+ echo "Preserving user changes to $NEWCONFFILE ..."
+ mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
+ mv -f "$OLDCONFFILE" "$NEWCONFFILE"
+}
case "$1" in
configure)
@@ -9,6 +21,26 @@
--home /var/lib/avahi-autoipd \
--gecos "Avahi autoip daemon" --group avahi-autoipd
fi
+
+ # When upgradig from previous versions move dhclient hooks to new location
+ if dpkg --compare-versions "$2" lt "0.6.25-4"; then
+ mv_conffile "/etc/dhcp3/dhclient-enter-hooks.d/avahi-autoipd" \
+ "/etc/dhcp/dhclient-enter-hooks.d/avahi-autoipd"
+ mv_conffile "/etc/dhcp3/dhclient-exit-hooks.d/zzz_avahi-autoipd" \
+ "/etc/dhcp/dhclient-exit-hooks.d/zzz_avahi-autoipd"
+ fi
+ # Create compat symlinks for dhcp3-client
+ if [ -d /etc/dhcp3/dhclient-enter-hooks.d ] &&
+ [ ! -e /etc/dhcp3/dhclient-enter-hooks.d/avahi-autoipd ]; then
+ ln -s /etc/dhcp/dhclient-enter-hooks.d/avahi-autoipd \
+ /etc/dhcp3/dhclient-enter-hooks.d/avahi-autoipd
+ fi
+ if [ -d /etc/dhcp3/dhclient-exit-hooks.d ] &&
+ [ ! -e /etc/dhcp3/dhclient-exit-hooks.d/zzz_avahi-autoipd ] ; then
+ ln -s /etc/dhcp/dhclient-exit-hooks.d/zzz_avahi-autoipd \
+ /etc/dhcp3/dhclient-exit-hooks.d/zzz_avahi-autoipd
+ fi
+
# FIXME: restart it somehow... SIGHUP?
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: packages/unstable/avahi/debian/avahi-autoipd.postrm
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/avahi-autoipd.postrm?rev=3588&op=diff
==============================================================================
--- packages/unstable/avahi/debian/avahi-autoipd.postrm (original)
+++ packages/unstable/avahi/debian/avahi-autoipd.postrm Fri Jun 25 23:44:52 2010
@@ -13,5 +13,8 @@
rm -f "$f"/??\:??\:??\:??\:??\:??
rmdir "$f" || { chown root:root "$f" && chmod 00700 "$f"; }
fi
+ # Remove compat symlinks for dhcp3-client
+ rm -f /etc/dhcp3/dhclient-enter-hooks.d/avahi-autoipd
+ rm -f /etc/dhcp3/dhclient-exit-hooks.d/zzz_avahi-autoipd
fi
Added: packages/unstable/avahi/debian/avahi-autoipd.preinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/avahi-autoipd.preinst?rev=3588&op=file
==============================================================================
--- packages/unstable/avahi/debian/avahi-autoipd.preinst (added)
+++ packages/unstable/avahi/debian/avahi-autoipd.preinst Fri Jun 25 23:44:52 2010
@@ -1,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+# Prepare to move a conffile without triggering a dpkg question
+prep_mv_conffile() {
+ local PKGNAME="$1"
+ local CONFFILE="$2"
+
+ [ -e "$CONFFILE" ] || return 0
+
+ local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
+ local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
+ sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
+ if [ "$md5sum" = "$old_md5sum" ]; then
+ rm -f "$CONFFILE"
+ fi
+}
+
+case "$1" in
+install|upgrade)
+ if dpkg --compare-versions "$2" lt "0.6.25-4"; then
+ prep_mv_conffile avahi-autoipd "/etc/dhcp3/dhclient-enter-hooks.d/avahi-autoipd"
+ prep_mv_conffile avahi-autoipd "/etc/dhcp3/dhclient-exit-hooks.d/zzz_avahi-autoipd"
+ fi
+esac
+
+#DEBHELPER#
Modified: packages/unstable/avahi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/changelog?rev=3588&op=diff
==============================================================================
--- packages/unstable/avahi/debian/changelog (original)
+++ packages/unstable/avahi/debian/changelog Fri Jun 25 23:44:52 2010
@@ -5,6 +5,9 @@
- Drop quilt from Build-Depends.
- Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules.
* Bump Standards-Version to 3.8.4. No further changes.
+ * Move dhclient hooks from /etc/dhcp3/ to /etc/dhcp/ as isc-dhcp-client
+ (ISC DHCP v4) uses this new location. Create symlinks for dhcp3-client
+ and preserve any local modifications. (Closes: #583992)
-- Michael Biebl <biebl at debian.org> Thu, 24 Jun 2010 18:10:59 +0200
More information about the Pkg-utopia-commits
mailing list