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

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

From 38d464be708874ce722d0c2e9808224ad9221030 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 16 Dec 2012 15:43:29 -0500
Subject: [PATCH] Support OSTree

If the kernel command line includes an "ostree=foo" argument, assume
