systemd-selinux 217-7 update

4 files changed, 46 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce2469089fd7..7c2ff74f939c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-selinux
 	pkgver = 217
-	pkgrel = 6
+	pkgrel = 7
 	url = http://www.freedesktop.org/wiki/Software/systemd
 	arch = i686
 	arch = x86_64
@@ -40,6 +40,7 @@ pkgbase = systemd-selinux
 	source = 0001-units-order-sd-journal-flush-after-sd-remount-fs.patch
 	source = 0001-units-make-systemd-journald.service-Type-notify.patch
 	source = 0001-shutdown-fix-arguments-to-run-initramfs-shutdown.patch
+	source = 0001-udev-hwdb-Change-error-message-regarding-missing-hwd.patch
 	source = initcpio-hook-udev
 	source = initcpio-install-systemd
 	source = initcpio-install-udev
@@ -52,7 +53,8 @@ pkgbase = systemd-selinux
 	md5sums = 92497d06e0af615be4b368fe615109c0
 	md5sums = a321d62d6ffada9e6976bdd339fa3219
 	md5sums = f72e8d086172177c224f0ce48ef54222
-	md5sums = 29245f7a240bfba66e2b1783b63b6b40
+	md5sums = 6326988822e9d18217525b2cb25cec1d
+	md5sums = 90ea67a7bb237502094914622a39e281
 	md5sums = 107c489f27c667be4101aecd3369b355
 	md5sums = bde43090d4ac0ef048e3eaee8202a407
 
@@ -89,7 +91,7 @@ pkgname = systemd-selinux
 	provides = nss-myhostname
 	provides = systemd-tools=217
 	provides = udev=217
-	provides = systemd=217-6
+	provides = systemd=217-7
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -130,15 +132,15 @@ pkgname = libsystemd-selinux
 	provides = libsystemd-journal.so
 	provides = libsystemd-login.so
 	provides = libudev.so
-	provides = libsystemd=217-6
+	provides = libsystemd=217-7
 	conflicts = libsystemd
 
 pkgname = systemd-sysvcompat-selinux
 	pkgdesc = sysvinit compat for systemd with SELinux support
 	license = GPL2
 	depends = systemd-selinux
-	provides = systemd-sysvcompat=217-6
-	provides = selinux-systemd-sysvcompat=217-6
+	provides = systemd-sysvcompat=217-7
+	provides = selinux-systemd-sysvcompat=217-7
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
 	conflicts = selinux-systemd-sysvcompat
diff --git a/0001-udev-hwdb-Change-error-message-regarding-missing-hwd.patch b/0001-udev-hwdb-Change-error-message-regarding-missing-hwd.patch
new file mode 100644
index 000000000000..1a2ac1edf798
--- /dev/null
+++ b/0001-udev-hwdb-Change-error-message-regarding-missing-hwd.patch
@@ -0,0 +1,32 @@
+From 8232e39e7cf32071e11b3b04839e6c98fbc81d0f Mon Sep 17 00:00:00 2001
+From: Colin Guthrie <colin@mageia.org>
+Date: Wed, 5 Nov 2014 15:29:41 +0000
+Subject: [PATCH] udev hwdb: Change error message regarding missing hwdb.bin
+ back to debug.
+
+When used in an initramfs, it's expected that the hwdb.bin file is
+not present (it makes for a very large initramfs otherwise).
+
+While it's nice to tell the user about this, as it's not strictly
+speaking an error we really shouldn't be so forceful in our
+reporting.
+---
+ src/libudev/libudev-hwdb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c
+index a1cfc0b..0716072 100644
+--- a/src/libudev/libudev-hwdb.c
++++ b/src/libudev/libudev-hwdb.c
+@@ -296,7 +296,7 @@ _public_ struct udev_hwdb *udev_hwdb_new(struct udev *udev) {
+         }
+ 
+         if (!hwdb->f) {
+-                udev_err(udev, "hwdb.bin does not exist, please run udevadm hwdb --update");
++                udev_dbg(udev, "hwdb.bin does not exist, please run udevadm hwdb --update");
+                 udev_hwdb_unref(hwdb);
+                 return NULL;
+         }
+-- 
+2.1.3
+
diff --git a/PKGBUILD b/PKGBUILD
index 3d445c5c51bf..7d41bcae89e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase=systemd-selinux
 pkgname=('systemd-selinux' 'libsystemd-selinux' 'systemd-sysvcompat-selinux')
 pkgver=217
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 groups=('selinux')
@@ -25,6 +25,7 @@ source=("http://www.freedesktop.org/software/${pkgname/-selinux}/${pkgname/-seli
         '0001-units-order-sd-journal-flush-after-sd-remount-fs.patch'
         '0001-units-make-systemd-journald.service-Type-notify.patch'
         '0001-shutdown-fix-arguments-to-run-initramfs-shutdown.patch'
+        '0001-udev-hwdb-Change-error-message-regarding-missing-hwd.patch'
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev')
@@ -37,7 +38,8 @@ md5sums=('e68dbff3cc19f66e341572d9fb2ffa89'
          '92497d06e0af615be4b368fe615109c0'
          'a321d62d6ffada9e6976bdd339fa3219'
          'f72e8d086172177c224f0ce48ef54222'
-         '29245f7a240bfba66e2b1783b63b6b40'
+         '6326988822e9d18217525b2cb25cec1d'
+         '90ea67a7bb237502094914622a39e281'
          '107c489f27c667be4101aecd3369b355'
          'bde43090d4ac0ef048e3eaee8202a407')
 
@@ -53,6 +55,7 @@ prepare() {
   patch -Np1 <../0001-units-order-sd-journal-flush-after-sd-remount-fs.patch
   patch -Np1 <../0001-units-make-systemd-journald.service-Type-notify.patch
   patch -Np1 <../0001-shutdown-fix-arguments-to-run-initramfs-shutdown.patch
+  patch -Np1 <../0001-udev-hwdb-Change-error-message-regarding-missing-hwd.patch
 }
 
 build() {
diff --git a/initcpio-hook-udev b/initcpio-hook-udev
index 0bc32e008c2e..ea9a11f8ce87 100644
--- a/initcpio-hook-udev
+++ b/initcpio-hook-udev
@@ -2,7 +2,7 @@
 
 run_earlyhook() {
     kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
-    systemd-tmpfiles --prefix=/dev --create
+    systemd-tmpfiles --prefix=/dev --create --boot
     /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
     udevd_running=1
 }