Author: waldi Date: Mon Nov 16 18:49:53 2009 New Revision: 677 Log: * debian/changelog: Update. * debian/rules: Force correct directory for udev rules. * debian/xen-utils-common.install: Install udev files in new location. * debian/xen-utils-common.postinst: Don''t create udev link. * debian/xen-utils-common.preinst: Remove old udev link. Added: trunk/xen-common/debian/xen-utils-common.preinst Modified: trunk/xen-common/debian/changelog trunk/xen-common/debian/rules trunk/xen-common/debian/xen-utils-common.install trunk/xen-common/debian/xen-utils-common.postinst Modified: trunk/xen-common/debian/changelog =============================================================================--- trunk/xen-common/debian/changelog Mon Nov 16 18:47:50 2009 (r676) +++ trunk/xen-common/debian/changelog Mon Nov 16 18:49:53 2009 (r677) @@ -4,6 +4,7 @@ * Check for correct hypervisor type. * Fix xend stop. (closes: #555902) * Load modules and setup xenfs in xend init script. + * Move udev rules to /lib/udev/rules.d. -- Bastian Blank <waldi at debian.org> Sun, 23 Aug 2009 13:07:18 +0200 Modified: trunk/xen-common/debian/rules =============================================================================--- trunk/xen-common/debian/rules Mon Nov 16 18:47:50 2009 (r676) +++ trunk/xen-common/debian/rules Mon Nov 16 18:49:53 2009 (r677) @@ -59,7 +59,7 @@ dh_testroot dh_clean -k $(MAKE) -C $(BUILD_DIR)/tools/examples install-configs - $(MAKE) -C $(BUILD_DIR)/tools/hotplug/Linux install-udev install-scripts + $(MAKE) -C $(BUILD_DIR)/tools/hotplug/Linux install-udev install-scripts UDEV_RULES_DIR=/lib/udev/rules.d $(MAKE) -C $(BUILD_DIR)/scripts install binary-indep: install Modified: trunk/xen-common/debian/xen-utils-common.install =============================================================================--- trunk/xen-common/debian/xen-utils-common.install Mon Nov 16 18:47:50 2009 (r676) +++ trunk/xen-common/debian/xen-utils-common.install Mon Nov 16 18:49:53 2009 (r677) @@ -1,5 +1,5 @@ -etc/udev/*.rules etc/xen/scripts etc/xen/xend* +lib/udev/rules.d/*.rules usr/lib/xen-common usr/sbin Modified: trunk/xen-common/debian/xen-utils-common.postinst =============================================================================--- trunk/xen-common/debian/xen-utils-common.postinst Mon Nov 16 18:47:50 2009 (r676) +++ trunk/xen-common/debian/xen-utils-common.postinst Mon Nov 16 18:49:53 2009 (r677) @@ -4,11 +4,6 @@ case "$1" in configure) - if [ -z "$2" ]; then - L="/etc/udev/rules.d/z60_xen-backend.rules" - [ -e "$L" ] || ln -s ../xen-backend.rules "$L" - fi - install -d -m 0700 /var/lib/xenstored install -d -m 2750 -g adm /var/log/xen ;; Added: trunk/xen-common/debian/xen-utils-common.preinst =============================================================================--- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/xen-common/debian/xen-utils-common.preinst Mon Nov 16 18:49:53 2009 (r677) @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +case "$1" in +install|upgrade) + if [ -L "/etc/udev/rules.d/z60_xen-backend.rules" ]; then + rm -f "/etc/udev/rules.d/z60_xen-backend.rules" + fi + ;; + +abort-upgrade) + ;; + +*) + echo "preinst called with unknown argument \`$1''" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0