From 146dd80df59188e909448dad64c58ac6be040afe Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 27 Jan 2012 16:51:26 +0000
Subject: [PATCH] Upstream patch to work with udev >= 176.

---
 ...76-now-requires-dev-to-be-a-devtmpfs.patch | 28 +++++++++++++++++++
 libguestfs.spec                               | 10 ++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 0001-appliance-udev-176-now-requires-dev-to-be-a-devtmpfs.patch

diff --git a/0001-appliance-udev-176-now-requires-dev-to-be-a-devtmpfs.patch b/0001-appliance-udev-176-now-requires-dev-to-be-a-devtmpfs.patch
new file mode 100644
index 0000000..f953036
--- /dev/null
+++ b/0001-appliance-udev-176-now-requires-dev-to-be-a-devtmpfs.patch
@@ -0,0 +1,28 @@
+From 8f564ae7a2fb0f170308bd103a6be0a981583b1c Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Fri, 27 Jan 2012 15:36:31 +0000
+Subject: [PATCH] appliance: udev >= 176 now requires /dev to be a devtmpfs.
+
+See this udev commit:
+https://git.kernel.org/?p=linux/hotplug/udev.git;a=commitdiff;h=220893b3cbdbf8932f95c44811b169a8f0d33939
+---
+ appliance/init |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/appliance/init b/appliance/init
+index d3a6156..4d74f91 100755
+--- a/appliance/init
++++ b/appliance/init
+@@ -18,6 +18,9 @@ rm -f /sys; mkdir /sys
+ mount -t sysfs /sys /sys
+ mkdir -p /run/lock
+ 
++# devtmpfs is required since udev 176
++mount -t devtmpfs /dev /dev
++
+ if [ ! -L /etc/init.d/udev -a -x /etc/init.d/udev ]; then
+   if type service >/dev/null 2>&1; then
+      service udev start
+-- 
+1.7.6
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 3bbe345..1645409 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -30,7 +30,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.17.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -41,6 +41,9 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 ExclusiveArch: x86_64
 %endif
 
+# Upstream patch to work with udev >= 176.
+Patch0001:    0001-appliance-udev-176-now-requires-dev-to-be-a-devtmpfs.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -623,6 +626,8 @@ for %{name}.
 %prep
 %setup -q
 
+%patch0001 -p1
+
 mkdir -p daemon/m4
 
 # Replace developer-specific README that ships with libguestfs, with
@@ -1021,6 +1026,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 27 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.2-3
+- Upstream patch to work with udev >= 176.
+
 * Thu Jan 26 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.2-2
 - New upstream version 1.17.2.
 - Use libdb-utils instead of old db4-utils.