*** init.orig   2012-12-10 21:53:20.000000000 +0100
--- init        2012-12-11 17:34:30.759184089 +0100
***************
*** 137,142 ****
--- 138,146 ----
        loopfstype=*)
                LOOPFSTYPE="${x#loopfstype=}"
                ;;
+       rootsubdir=*)
+               ROOTSUBDIR="${x#rootsubdir=}"
+               ;;
        cryptopts=*)
                cryptopts="${x#cryptopts=}"
                ;;
*** scripts/local.orig  2012-12-01 15:45:04.000000000 +0100
--- scripts/local       2012-12-10 22:31:52.000000000 +0100
***************
*** 140,145 ****
--- 140,167 ----
                if [ -d ${rootmnt}/host ]; then
                        mount -o move /host ${rootmnt}/host
                fi
+       elif [ "$ROOTSUBDIR" ]; then
+               if [ "$mountroot_status" != 0 ]; then
+                       panic "
+ Could not mount the partition ${ROOT}.
+ This could also happen if the file system is not clean because of an operating
+ system crash, an interrupted boot process, an improper shutdown, or unplugging
+ of a removable device without first unmounting or ejecting it.
+ (filesystem = ${FSTYPE}, error code = $mountroot_status)
+ "
+               fi
+
+               mkdir -p /host
+               mount -o move ${rootmnt} /host
+
+               if [ ! -d "/host/$ROOTSUBDIR" ]; then
+                   panic "Failed to bind folder ${ROOTSUBDIR} as root: folder does not exist."
+               fi
+
+               mount -o bind /host/$ROOTSUBDIR ${rootmnt}
+               if [ -d ${rootmnt}/host ]; then
+                       mount -o move /host ${rootmnt}/host
+               fi
        fi

        [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-bottom"