From 577d9cc954014effafbfc1452c3e62f42be55ccb Mon Sep 17 00:00:00 2001
From: David Lehman <dlehman@redhat.com>
Date: Wed, 6 Mar 2013 16:20:49 -0600
Subject: [PATCH] Let devices get detected and started automatically.

Also stop masking fedora-storage-* units as they no longer exist.
---
 share/runtime-cleanup.tmpl     | 2 --
 share/runtime-postinstall.tmpl | 8 +++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 01000e0d..9f2ed1c3 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -167,7 +167,6 @@ removefrom dbus-glib /usr/bin/*
 removefrom dbus-x11 /etc/X11/*
 removefrom dejavu-sans-fonts --allbut *.conf */DejaVuSans{,-Bold}.ttf
 removefrom dejavu-sans-mono-fonts --allbut *.conf */DejaVuSansMono.ttf
-removefrom device-mapper-multipath /etc/* /sbin/mpathconf /sbin/multipathd /lib/udev/rules.d/62-multipath.rules
 removefrom dhclient /usr/lib/* /usr/share/*
 removefrom dnsmasq /etc/rc.d/* /usr/sbin/*
 removefrom dump /etc/*
@@ -252,7 +251,6 @@ removefrom libxml2-python /usr/${libdir}/python?.?/site-packages/libxml2mod.a
 removefrom libxml2-python /usr/${libdir}/python?.?/site-packages/libxml2mod.la
 removefrom lldpad /etc/* /usr/sbin/lldptool
 removefrom lua /usr/bin/*
-removefrom lvm2 /etc/*
 removefrom lzo /usr/${libdir}/liblzo2.*
 removefrom madan-fonts /usr/share/fonts/madan/*
 removefrom mdadm /etc/*
diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl
index 1c0f9ba5..e9a4d480 100644
--- a/share/runtime-postinstall.tmpl
+++ b/share/runtime-postinstall.tmpl
@@ -35,7 +35,6 @@ systemctl disable systemd-readahead-collect.service \
 ## These services can't be disabled normally (they're linked into place in
 ## /usr/lib/systemd rather than /etc/systemd), so we have to mask them.
 systemctl mask fedora-configure.service fedora-loadmodules.service \
-               fedora-storage-init.service fedora-storage-init-late.service \
                fedora-autorelabel.service fedora-autorelabel-mark.service \
                fedora-wait-storage.service media.mount
 
@@ -103,4 +102,11 @@ symlink ../run/install mnt/install
 ## create_depmod_conf()
 append etc/depmod.d/dd.conf "search updates built-in"
 
+## create multipath.conf so multipath gets auto-started
+append etc/multipath.conf "defaults {\n\tfind_multipaths yes\n\tuser_friendly_names yes\n}\n"
+
+## make lvm auto-activate
+remove etc/lvm/*
+append etc/lvm/lvm.conf "global {\n\tuse_lvmetad = 1\n}\n"
+
 ## TODO: we could run prelink here if we wanted?