From 47e2c43533abe96eca65f3906528c8654d5839b4 Mon Sep 17 00:00:00 2001
From: Kim Hagen <kim.sidney@gmail.com>
Date: Fri, 29 Jan 2016 07:41:43 -0500
Subject: Correct overlay mount function.

---
 scripts/install/install-functions | 7 ++++---
 scripts/install/install-image-new | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/install/install-functions b/scripts/install/install-functions
index 720ac28a..d6e38523 100755
--- a/scripts/install/install-functions
+++ b/scripts/install/install-functions
@@ -337,11 +337,12 @@ gen_mopts ()
     local mnttype=$1
     local upper=$2
     local lower=$3
-    local mntpoint=$4
+    local work=$4
+    local mntpoint=$5
 
     case "$1" in
-        overlayfs)
-            echo "-t $mnttype -o noatime,upperdir=$upper,lowerdir=$lower $mnttype $mntpoint"
+        overlay)
+            echo "-t $mnttype -o noatime,upperdir=$upper,lowerdir=$lower,workdir=$work $mnttype $mntpoint"
             ;;
         *)
             echo "-t $mnttype -o noatime,dirs=$upper=rw:$lower=ro $mnttype $mntpoint"
diff --git a/scripts/install/install-image-new b/scripts/install/install-image-new
index 91cb27fa..81ac45e9 100755
--- a/scripts/install/install-image-new
+++ b/scripts/install/install-image-new
@@ -64,6 +64,8 @@ mkdir -p $WRITE_ROOT/boot/$image_name
 # make dir for backing store
 rw_dir=$WRITE_ROOT/boot/$image_name/live-rw
 mkdir -p $rw_dir
+work_dir=$WRITE_ROOT/boot/$image_name/live-work
+mkdir -p $work_dir
 
 echo Copying squashfs image...
 # these are the defaults if installing from a specified ISO image file.
@@ -94,7 +96,7 @@ if ! try_mount "-o loop,ro -t squashfs $target_squash $READ_ROOT"; then
   echo 'Exiting...'
   exit 1
 fi
-margs=$(gen_mopts "overlayfs" $rw_dir $READ_ROOT $INST_ROOT)
+margs=$(gen_mopts "overlay" $rw_dir $READ_ROOT $work_dir $INST_ROOT)
 if ! try_mount "$margs"; then
   echo 'Exiting...'
   exit 1
-- 
cgit v1.2.3