From f69db69b81c1398b0a7491488128a494e7320b2a91266e153726899b74b2e201 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel@molkentin.de>
Date: Tue, 10 Dec 2019 08:44:34 +0000
Subject: [PATCH] - Update to version 049+git116.e9995c78:   * dracut.spec: add
 convertfs module correctly (boo#1158777)

OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=388
---
 _servicedata                       | 2 +-
 dracut-049+git115.c2d8d6fb.obscpio | 3 ---
 dracut-049+git115.c2d8d6fb.tar.xz  | 3 ---
 dracut-049+git116.e9995c78.obscpio | 3 +++
 dracut-049+git116.e9995c78.tar.xz  | 3 +++
 dracut.changes                     | 6 ++++++
 dracut.obsinfo                     | 6 +++---
 dracut.spec                        | 6 +++---
 8 files changed, 19 insertions(+), 13 deletions(-)
 delete mode 100644 dracut-049+git115.c2d8d6fb.obscpio
 delete mode 100644 dracut-049+git115.c2d8d6fb.tar.xz
 create mode 100644 dracut-049+git116.e9995c78.obscpio
 create mode 100644 dracut-049+git116.e9995c78.tar.xz

diff --git a/_servicedata b/_servicedata
index 3c6f3d9..f135ec8 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/opensuse/dracut.git</param>
-              <param name="changesrevision">c2d8d6fb4c700f40eaaa30cffac41e3d8071c20b</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">e9995c7853e61de8513b41a302d465ddb1586a20</param></service></servicedata>
\ No newline at end of file
diff --git a/dracut-049+git115.c2d8d6fb.obscpio b/dracut-049+git115.c2d8d6fb.obscpio
deleted file mode 100644
index 74ff6c5..0000000
--- a/dracut-049+git115.c2d8d6fb.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b859403b8277c60f9c0a3b278f0ff181bc9a505c76f3d6560b02e694001f86d5
-size 1654284
diff --git a/dracut-049+git115.c2d8d6fb.tar.xz b/dracut-049+git115.c2d8d6fb.tar.xz
deleted file mode 100644
index f076534..0000000
--- a/dracut-049+git115.c2d8d6fb.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a2ede39783eed6f6c68ed4ac8724447fa53573d735835ad490e351ad888f8cf
-size 292596
diff --git a/dracut-049+git116.e9995c78.obscpio b/dracut-049+git116.e9995c78.obscpio
new file mode 100644
index 0000000..7e1a212
--- /dev/null
+++ b/dracut-049+git116.e9995c78.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa6f374c55d6fe70f21ec88e5e086a346e272b28f776e0c9c4dfbf729054da54
+size 1654284
diff --git a/dracut-049+git116.e9995c78.tar.xz b/dracut-049+git116.e9995c78.tar.xz
new file mode 100644
index 0000000..4a42e37
--- /dev/null
+++ b/dracut-049+git116.e9995c78.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f1836d7c37228f814978185c56584ef4eb7e9ee8d990b8dbea9b4d9aa5ee6f6
+size 292516
diff --git a/dracut.changes b/dracut.changes
index 0eed3d4..5eee3a4 100644
--- a/dracut.changes
+++ b/dracut.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec 10 08:43:44 UTC 2019 - daniel.molkentin@suse.com
+
+- Update to version 049+git116.e9995c78:
+  * dracut.spec: add convertfs module correctly (boo#1158777)
+
 -------------------------------------------------------------------
 Thu Nov 28 08:05:53 UTC 2019 - daniel.molkentin@suse.com
 
diff --git a/dracut.obsinfo b/dracut.obsinfo
index 205f773..52809c1 100644
--- a/dracut.obsinfo
+++ b/dracut.obsinfo
@@ -1,5 +1,5 @@
 name: dracut
-version: 049+git115.c2d8d6fb
-mtime: 1574828019
-commit: c2d8d6fb4c700f40eaaa30cffac41e3d8071c20b
+version: 049+git116.e9995c78
+mtime: 1575967394
+commit: e9995c7853e61de8513b41a302d465ddb1586a20
 
diff --git a/dracut.spec b/dracut.spec
index 465c444..75b1492 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -19,7 +19,7 @@
 %define dracutlibdir %{_prefix}/lib/dracut
 
 Name:           dracut
-Version:        049+git115.c2d8d6fb
+Version:        049+git116.e9995c78
 Release:        0
 Summary:        Initramfs generator using udev
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -179,11 +179,11 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra
 # check whether /var/run has been converted to a symlink
 [ -L /var/run ] || sed -i '/GRUB_CMDLINE_LINUX_DEFAULT.*/s/"$/ rd.convertfs"/' /etc/default/grub  || :
 [ -L /var/run ] || cat >>/etc/dracut.conf.d/05-convertfs.conf<<EOF
-add_dracutmodules+="convertfs"
+add_dracutmodules+=" convertfs "
 EOF
 #clean up after the conversion is done
 [ -L /var/run ] &&  sed -i '/GRUB_CMDLINE_LINUX_DEFAULT.*/s/rd.convertfs//' /etc/default/grub || :
-[ -L /var/run ] && sed -i '/add_dracutmodules+="convertfs"/d' /etc/dracut.conf.d/05-convertfs.conf || :
+[ -L /var/run ] && sed -i '/add_dracutmodules+=" *convertfs *"/d' /etc/dracut.conf.d/05-convertfs.conf || :
 [ -d /var/lock.lockmove~ ] && rm -rf /var/lock.lockmove~ || :
 [ -d /var/run.runmove~ ] && rm -rf /var/run.runmove~ || :
 [ -s /etc/dracut.conf.d/05-convertfs.conf ] || rm -f /etc/dracut.conf.d/05-convertfs.conf || :