From c2e4f7a85f94401eff8b397291853c82780f336c883c1b519e125d130c536642 Mon Sep 17 00:00:00 2001
From: Shawn Dunn <sfalken@cloverleaf-linux.org>
Date: Sat, 29 Mar 2014 17:29:04 +0000
Subject: [PATCH] Accepting request 228136 from home:trenn:branches:Base:System

- systemd always tries to load autofs4 otherwise it reports:
  Failed to insert module 'autofs4'
  dracut already adds it, but only if loaded already.
  Always load autofs4 even if not already loaded (bnc#869411)

OBS-URL: https://build.opensuse.org/request/show/228136
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=118
---
 dracut-really-always-add-autofs4.patch | 13 +++++++++++++
 dracut.changes                         |  8 ++++++++
 dracut.spec                            |  2 ++
 3 files changed, 23 insertions(+)
 create mode 100644 dracut-really-always-add-autofs4.patch

diff --git a/dracut-really-always-add-autofs4.patch b/dracut-really-always-add-autofs4.patch
new file mode 100644
index 0000000..64fe6ce
--- /dev/null
+++ b/dracut-really-always-add-autofs4.patch
@@ -0,0 +1,13 @@
+Index: dracut-036/modules.d/98systemd/module-setup.sh
+===================================================================
+--- dracut-036.orig/modules.d/98systemd/module-setup.sh
++++ dracut-036/modules.d/98systemd/module-setup.sh
+@@ -20,7 +20,7 @@ depends() {
+ }
+ 
+ installkernel() {
+-    instmods autofs4 ipv6
++    hostonly='' instmods autofs4 ipv6
+ }
+ 
+ # called by dracut
diff --git a/dracut.changes b/dracut.changes
index a95595e..e41b516 100644
--- a/dracut.changes
+++ b/dracut.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Mar 28 17:39:08 UTC 2014 - trenn@suse.de
+
+- systemd always tries to load autofs4 otherwise it reports:
+  Failed to insert module 'autofs4'
+  dracut already adds it, but only if loaded already.
+  Always load autofs4 even if not already loaded (bnc#869411)
+
 -------------------------------------------------------------------
 Tue Mar 25 18:18:56 UTC 2014 - trenn@suse.de
 
diff --git a/dracut.spec b/dracut.spec
index 749ac07..7867753 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -49,6 +49,7 @@ Patch21:        wait_for_network_race_condition_fix.patch
 Patch22:        dracut-warpclock_module.patch
 Patch23:        s390-dcssblk.patch
 Patch24:        dracut-install-persistent-rule.patch
+Patch25:        dracut-really-always-add-autofs4.patch
 BuildRequires:  asciidoc
 BuildRequires:  bash
 BuildRequires:  docbook-xsl-stylesheets
@@ -102,6 +103,7 @@ NFS, iSCSI, NBD, FCoE with the dracut-network package.
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
 
 %build
 %configure\