tags 633028 + patch
thanks
On Wed, Jul 13, 2011 at 08:50:16AM +0200, Michael Biebl wrote:
> Am 13.07.2011 08:30, schrieb Michael Biebl:
> > aide does not only use /lib/init/rw/sendsigs.omit.d, as can be seen when
> > grepping though the source tarball (*).
> > It also contains references to
> > - /lib/init/rw/wpasupplicant (#633040)
> > - /lib/init/rw/resolvconf (#621503)
> > - /lib/init/rw/.mdadm (#633054)
>
> Please note, that the proposed new location for mdadm will be /run/mdadm and
> *not* /run/.mdadm. See #633054.
> It might make sense to wait until mdadm has been updated before uploading a
> fixed aide package.
Patch attached against current git.
Regards,
Roger
--
.''`. Roger Leigh
: :' : Debian GNU/Linux http://people.debian.org/~rleigh/
`. `' Printing on GNU/Linux? http://gutenprint.sourceforge.net/
`- GPG Public Key: 0x25BFB848 Please GPG sign your mail.
>From 903810947f3b08759faa751bf5581d5b8aa138cc Mon Sep 17 00:00:00 2001
From: Roger Leigh <Roger Leigh rle...@debian.org>
Date: Wed, 7 Dec 2011 00:26:42 +0000
Subject: [PATCH] /run transition: Use /run in place of /lib/init/rw and close
#633028
Signed-off-by: Roger Leigh <Roger Leigh rle...@debian.org>
---
debian/aide.conf.d/31_aide_lib-init-rw | 3 ---
debian/aide.conf.d/31_aide_mdadm | 7 +++----
debian/aide.conf.d/31_aide_portmap | 2 +-
debian/aide.conf.d/31_aide_resolvconf | 8 ++++----
debian/aide.conf.d/31_aide_rsyslog | 2 +-
debian/aide.conf.d/31_aide_run | 3 +++
debian/aide.conf.d/31_aide_wpasupplicant | 2 +-
debian/changelog | 11 +++++++++++
8 files changed, 24 insertions(+), 14 deletions(-)
delete mode 100644 debian/aide.conf.d/31_aide_lib-init-rw
create mode 100644 debian/aide.conf.d/31_aide_run
diff --git a/debian/aide.conf.d/31_aide_lib-init-rw b/debian/aide.conf.d/31_aide_lib-init-rw
deleted file mode 100644
index 46a9eb7..0000000
--- a/debian/aide.conf.d/31_aide_lib-init-rw
+++ /dev/null
@@ -1,3 +0,0 @@
-/lib/init/rw/sendsigs\.omit\.d$ VarDirInode
-/lib/init/rw/\.ramfs$ VarFile
-/lib/init/rw$ VarDirInode
diff --git a/debian/aide.conf.d/31_aide_mdadm b/debian/aide.conf.d/31_aide_mdadm
index 6f7c8c7..a64495e 100644
--- a/debian/aide.conf.d/31_aide_mdadm
+++ b/debian/aide.conf.d/31_aide_mdadm
@@ -1,4 +1,3 @@
-/var/run/mdadm/monitor\.pid$ VarFile
-/var/run/mdadm$ VarDir
-/lib/init/rw/\.mdadm/md[0-9]+-uevent$ VarInode
-/lib/init/rw/\.mdadm$ VarDirInode
+/run/mdadm/monitor\.pid$ VarFile
+/run/mdadm/md[0-9]+-uevent$ VarInode
+/run/mdadm$ VarDirInode
diff --git a/debian/aide.conf.d/31_aide_portmap b/debian/aide.conf.d/31_aide_portmap
index a214791..7db79b4 100644
--- a/debian/aide.conf.d/31_aide_portmap
+++ b/debian/aide.conf.d/31_aide_portmap
@@ -1,2 +1,2 @@
/var/run/portmap(\.pid|_mapping)$ VarFile
-/lib/init/rw/sendsigs\.omit\.d/portmap$ VarInode
+/run/sendsigs\.omit\.d/portmap$ VarInode
diff --git a/debian/aide.conf.d/31_aide_resolvconf b/debian/aide.conf.d/31_aide_resolvconf
index 9d7e3b4..88340d2 100644
--- a/debian/aide.conf.d/31_aide_resolvconf
+++ b/debian/aide.conf.d/31_aide_resolvconf
@@ -1,5 +1,5 @@
/etc/resolv\.conf$ VarFile
-/lib/init/rw/resolvconf/interface/(wlan|eth)[0-9]+$ VarFile
-/lib/init/rw/resolvconf/enable-updates$ VarFile
-/lib/init/rw/resolvconf/resolv\.conf$ VarFile
-/lib/init/rw/resolvconf(/interface)?$ VarDirInode
+/run/resolvconf/interface/(wlan|eth)[0-9]+$ VarFile
+/run/resolvconf/enable-updates$ VarFile
+/run/resolvconf/resolv\.conf$ VarFile
+/run/resolvconf(/interface)?$ VarDirInode
diff --git a/debian/aide.conf.d/31_aide_rsyslog b/debian/aide.conf.d/31_aide_rsyslog
index 840882f..ebbbf69 100644
--- a/debian/aide.conf.d/31_aide_rsyslog
+++ b/debian/aide.conf.d/31_aide_rsyslog
@@ -12,4 +12,4 @@
/var/log/@@{LOGFILES4R}\.4\.gz$ HiSerMemberLog
/var/log$ VarDir
/var/run/rsyslogd.pid$ VarFile
-/lib/init/rw/sendsigs\.omit\.d/rsyslog$ VarInode
+/run/sendsigs\.omit\.d/rsyslog$ VarInode
diff --git a/debian/aide.conf.d/31_aide_run b/debian/aide.conf.d/31_aide_run
new file mode 100644
index 0000000..0f68f0c
--- /dev/null
+++ b/debian/aide.conf.d/31_aide_run
@@ -0,0 +1,3 @@
+/run/sendsigs\.omit\.d$ VarDirInode
+/run/\.ramfs$ VarFile
+/run$ VarDirInode
diff --git a/debian/aide.conf.d/31_aide_wpasupplicant b/debian/aide.conf.d/31_aide_wpasupplicant
index f80ae3c..e9b4d43 100644
--- a/debian/aide.conf.d/31_aide_wpasupplicant
+++ b/debian/aide.conf.d/31_aide_wpasupplicant
@@ -1,5 +1,5 @@
@@define INTERFACES wlan0
-/lib/init/rw/sendsigs\.omit\.d/wpasupplicant\.wpa_(supplicant|action)\.@@{INTERFACES}\.pid$ VarFile
+/run/sendsigs\.omit\.d/wpasupplicant\.wpa_(supplicant|action)\.@@{INTERFACES}\.pid$ VarFile
/var/run/wpa_action\.@@{INTERFACES}\.(pid|timestamp)$ VarFile
/var/run/wpa_supplicant\.@@{INTERFACES}\.pid$ VarFile
diff --git a/debian/changelog b/debian/changelog
index 1397f15..c0c53b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,17 @@ aide (0.15.1-4) UNRELEASED; urgency=low
* 10_aide_distribution: add code to reference the current
distribution in rule files to be more flexible.
+ [ Roger Leigh ]
+ * /run transition: Use /run in place of /lib/init.rw. (closes: #633028)
+ - Remove debian/aide.conf.d/31_aide_lib-init-rw
+ - Add debian/aide.conf.d/31_aide_run
+ - Replace sendsigs.omit.d and other /lib/init/rw usage with /run
+ in debian/aide.conf.d/31_aide_mdadm,
+ debian/aide.conf.d/31_aide_portmap,
+ debian/aide.conf.d/31_aide_resolvconf,
+ debian/aide.conf.d/31_aide_rsyslog and
+ debian/aide.conf.d/31_aide_wpasupplicant.
+
-- Hannes von Haugwitz <han...@vonhaugwitz.com> Sat, 09 Jul 2011 07:28:22 +0200
aide (0.15.1-3) unstable; urgency=low
--
1.7.7.3
