      inst_simple "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
  
 -- 
-1.7.11.4
+1.7.1
 

Conflicts:
	modules.d/95rootfs-block/mount-root.sh
---
 modules.d/95rootfs-block/mount-root.sh | 14 +++++++-------
 modules.d/99base/init.sh               | 27 ++++++++++++++++++++-------
 modules.d/99base/module-setup.sh       |  4 ++++
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh

+ostree=$(getarg ostree=)
+if test -n $ostree; then
+    NEWROOT_MOUNTPOINT=${NEWROOT}
+    NEWROOT=${NEWROOT}/ostree/deploy/$ostree
+else
+    NEWROOT_MOUNTPOINT=$NEWROOT
+fi
