Package: vzctl
Version: 3.0.24-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu maverick ubuntu-patch

In Ubuntu, we've applied the attached patch to achieve the following:

    - Install udev rules into /lib/udev/rules.d

We thought you might be interested in doing the same. 

This is the last delta between Debian and Ubuntu - if 3.0.24-3 would get
merged.
--- vzctl-3.0.24.orig/paths.am
+++ vzctl-3.0.24/paths.am
@@ -29,7 +29,7 @@
 endif
 
 if ENABLE_UDEV
-udevdir     = $(sysconfdir)/udev/rules.d
+udevdir     = /lib/udev/rules.d
 endif
 
 initddir    = $(sysconfdir)/init.d
only in patch2:
unchanged:
--- vzctl-3.0.24.orig/etc/Makefile.in
+++ vzctl-3.0.24/etc/Makefile.in
@@ -273,7 +273,7 @@
 @enable_cron_t...@cronddir = $(pkgconfdir)/cron
 @enable_cron_t...@dst_cronddir = $(sysconfdir)/cron.d
 @enable_logrotate_t...@logrdir = $(sysconfdir)/logrotate.d
-...@enable_udev_true@udevdir = $(sysconfdir)/udev/rules.d
+...@enable_udev_true@udevdir = /lib/udev/rules.d
 initddir = $(sysconfdir)/init.d
 netsdir = $(sysconfdir)/sysconfig/network-scripts
 ifupdir = $(sysconfdir)/network/if-up.d
only in patch2:
unchanged:
--- vzctl-3.0.24.orig/etc/udev/Makefile.in
+++ vzctl-3.0.24/etc/udev/Makefile.in
@@ -233,7 +233,7 @@
 @enable_cron_t...@cronddir = $(pkgconfdir)/cron
 @enable_cron_t...@dst_cronddir = $(sysconfdir)/cron.d
 @enable_logrotate_t...@logrdir = $(sysconfdir)/logrotate.d
-...@enable_udev_true@udevdir = $(sysconfdir)/udev/rules.d
+...@enable_udev_true@udevdir = /lib/udev/rules.d
 initddir = $(sysconfdir)/init.d
 netsdir = $(sysconfdir)/sysconfig/network-scripts
 ifupdir = $(sysconfdir)/network/if-up.d
only in patch2:
unchanged:
--- vzctl-3.0.24.orig/etc/network-scripts/Makefile.in
+++ vzctl-3.0.24/etc/network-scripts/Makefile.in
@@ -237,7 +237,7 @@
 @enable_cron_t...@cronddir = $(pkgconfdir)/cron
 @enable_cron_t...@dst_cronddir = $(sysconfdir)/cron.d
 @enable_logrotate_t...@logrdir = $(sysconfdir)/logrotate.d
-...@enable_udev_true@udevdir = $(sysconfdir)/udev/rules.d
+...@enable_udev_true@udevdir = /lib/udev/rules.d
 initddir = $(sysconfdir)/init.d
 netsdir = $(sysconfdir)/sysconfig/network-scripts
 ifupdir = $(sysconfdir)/network/if-up.d
only in patch2:
unchanged:
--- vzctl-3.0.24.orig/etc/logrotate.d/Makefile.in
+++ vzctl-3.0.24/etc/logrotate.d/Makefile.in
@@ -233,7 +233,7 @@
 @enable_cron_t...@cronddir = $(pkgconfdir)/cron
 @enable_cron_t...@dst_cronddir = $(sysconfdir)/cron.d
 @enable_logrotate_t...@logrdir = $(sysconfdir)/logrotate.d
-...@enable_udev_true@udevdir = $(sysconfdir)/udev/rules.d
+...@enable_udev_true@udevdir = /lib/udev/rules.d
 initddir = $(sysconfdir)/init.d
 netsdir = $(sysconfdir)/sysconfig/network-scripts
 ifupdir = $(sysconfdir)/network/if-up.d
only in patch2:
unchanged:
--- vzctl-3.0.24.orig/etc/bash_completion.d/Makefile.in
+++ vzctl-3.0.24/etc/bash_completion.d/Makefile.in
@@ -250,7 +250,7 @@
 @enable_cron_t...@cronddir = $(pkgconfdir)/cron
 @enable_cron_t...@dst_cronddir = $(sysconfdir)/cron.d
 @enable_logrotate_t...@logrdir = $(sysconfdir)/logrotate.d
-...@enable_udev_true@udevdir = $(sysconfdir)/udev/rules.d
+...@enable_udev_true@udevdir = /lib/udev/rules.d
 initddir = $(sysconfdir)/init.d
 netsdir = $(sysconfdir)/sysconfig/network-scripts
 ifupdir = $(sysconfdir)/network/if-up.d
only in patch2:
unchanged:
--- vzctl-3.0.24.orig/etc/cron.d/Makefile.in
+++ vzctl-3.0.24/etc/cron.d/Makefile.in
@@ -250,7 +250,7 @@
 @enable_cron_t...@cronddir = $(pkgconfdir)/cron
 @enable_cron_t...@dst_cronddir = $(sysconfdir)/cron.d
 @enable_logrotate_t...@logrdir = $(sysconfdir)/logrotate.d
-...@enable_udev_true@udevdir = $(sysconfdir)/udev/rules.d
+...@enable_udev_true@udevdir = /lib/udev/rules.d
 initddir = $(sysconfdir)/init.d
 netsdir = $(sysconfdir)/sysconfig/network-scripts
 ifupdir = $(sysconfdir)/network/if-up.d
only in patch2:
unchanged:
--- vzctl-3.0.24.orig/etc/init.d/Makefile.in
+++ vzctl-3.0.24/etc/init.d/Makefile.in
@@ -229,7 +229,7 @@
 @enable_cron_t...@cronddir = $(pkgconfdir)/cron
 @enable_cron_t...@dst_cronddir = $(sysconfdir)/cron.d
 @enable_logrotate_t...@logrdir = $(sysconfdir)/logrotate.d
-...@enable_udev_true@udevdir = $(sysconfdir)/udev/rules.d
+...@enable_udev_true@udevdir = /lib/udev/rules.d
 initddir = $(sysconfdir)/init.d
 netsdir = $(sysconfdir)/sysconfig/network-scripts
 ifupdir = $(sysconfdir)/network/if-up.d
only in patch2:
unchanged:
--- vzctl-3.0.24.orig/etc/dists/Makefile.in
+++ vzctl-3.0.24/etc/dists/Makefile.in
@@ -236,7 +236,7 @@
 @enable_cron_t...@cronddir = $(pkgconfdir)/cron
 @enable_cron_t...@dst_cronddir = $(sysconfdir)/cron.d
 @enable_logrotate_t...@logrdir = $(sysconfdir)/logrotate.d
-...@enable_udev_true@udevdir = $(sysconfdir)/udev/rules.d
+...@enable_udev_true@udevdir = /lib/udev/rules.d
 initddir = $(sysconfdir)/init.d
 netsdir = $(sysconfdir)/sysconfig/network-scripts
 ifupdir = $(sysconfdir)/network/if-up.d
only in patch2:
unchanged:
--- vzctl-3.0.24.orig/etc/conf/Makefile.in
+++ vzctl-3.0.24/etc/conf/Makefile.in
@@ -233,7 +233,7 @@
 @enable_cron_t...@cronddir = $(pkgconfdir)/cron
 @enable_cron_t...@dst_cronddir = $(sysconfdir)/cron.d
 @enable_logrotate_t...@logrdir = $(sysconfdir)/logrotate.d
-...@enable_udev_true@udevdir = $(sysconfdir)/udev/rules.d
+...@enable_udev_true@udevdir = /lib/udev/rules.d
 initddir = $(sysconfdir)/init.d
 netsdir = $(sysconfdir)/sysconfig/network-scripts
 ifupdir = $(sysconfdir)/network/if-up.d
only in patch2:
unchanged:
--- vzctl-3.0.24.orig/bin/Makefile.in
+++ vzctl-3.0.24/bin/Makefile.in
@@ -259,7 +259,7 @@
 @enable_cron_t...@cronddir = $(pkgconfdir)/cron
 @enable_cron_t...@dst_cronddir = $(sysconfdir)/cron.d
 @enable_logrotate_t...@logrdir = $(sysconfdir)/logrotate.d
-...@enable_udev_true@udevdir = $(sysconfdir)/udev/rules.d
+...@enable_udev_true@udevdir = /lib/udev/rules.d
 initddir = $(sysconfdir)/init.d
 netsdir = $(sysconfdir)/sysconfig/network-scripts
 ifupdir = $(sysconfdir)/network/if-up.d
only in patch2:
unchanged:
--- vzctl-3.0.24.orig/src/Makefile.in
+++ vzctl-3.0.24/src/Makefile.in
@@ -309,7 +309,7 @@
 @enable_cron_t...@cronddir = $(pkgconfdir)/cron
 @enable_cron_t...@dst_cronddir = $(sysconfdir)/cron.d
 @enable_logrotate_t...@logrdir = $(sysconfdir)/logrotate.d
-...@enable_udev_true@udevdir = $(sysconfdir)/udev/rules.d
+...@enable_udev_true@udevdir = /lib/udev/rules.d
 initddir = $(sysconfdir)/init.d
 netsdir = $(sysconfdir)/sysconfig/network-scripts
 ifupdir = $(sysconfdir)/network/if-up.d
only in patch2:
unchanged:
--- vzctl-3.0.24.orig/src/lib/Makefile.in
+++ vzctl-3.0.24/src/lib/Makefile.in
@@ -268,7 +268,7 @@
 @enable_cron_t...@cronddir = $(pkgconfdir)/cron
 @enable_cron_t...@dst_cronddir = $(sysconfdir)/cron.d
 @enable_logrotate_t...@logrdir = $(sysconfdir)/logrotate.d
-...@enable_udev_true@udevdir = $(sysconfdir)/udev/rules.d
+...@enable_udev_true@udevdir = /lib/udev/rules.d
 initddir = $(sysconfdir)/init.d
 netsdir = $(sysconfdir)/sysconfig/network-scripts
 ifupdir = $(sysconfdir)/network/if-up.d
only in patch2:
unchanged:
--- vzctl-3.0.24.orig/scripts/Makefile.in
+++ vzctl-3.0.24/scripts/Makefile.in
@@ -250,7 +250,7 @@
 @enable_cron_t...@cronddir = $(pkgconfdir)/cron
 @enable_cron_t...@dst_cronddir = $(sysconfdir)/cron.d
 @enable_logrotate_t...@logrdir = $(sysconfdir)/logrotate.d
-...@enable_udev_true@udevdir = $(sysconfdir)/udev/rules.d
+...@enable_udev_true@udevdir = /lib/udev/rules.d
 initddir = $(sysconfdir)/init.d
 netsdir = $(sysconfdir)/sysconfig/network-scripts
 ifupdir = $(sysconfdir)/network/if-up.d

Reply via email to