--- casper-apw»·······2015-08-21 15:38:30.333984956 -0500
+++ casper-apw-new»·····2015-08-24 21:43:40.852068440 -0500
@@ -533,10 +533,10 @@
[ "$quiet" != "y" ] && ovl_verbose="2>/dev/null"
·
# First attempt to mount with a workdir _and_ multiple lower layers.
- log_msg_begin "union: mount -t ${UNIONFS} -o upperdir=$mount/upper,lowerdir=$rofsstring,workdir=$mount/work ${UNIONFS} $rootmnt"
- mount -t ${UNIONFS} -o "upperdir=$mount/upper,lowerdir=$rofsstring,workdir=$mount/work" ${UNIONFS} "$rootmnt" $ovl_verbose && ovl_mounted=1
+ log_begin_msg "union: mount -t ${UNIONFS} -o upperdir=/cow/upper,lowerdir=$rofsstring,workdir=/cow/work ${UNIONFS} $rootmnt"
+ mount -t ${UNIONFS} -o "upperdir=/cow/upper,lowerdir=$rofsstring,workdir=/cow/work" ${UNIONFS} "$rootmnt" $ovl_verbose && ovl_mounted=1
[ "$ovl_mounted" = 0 ] && log_warning_msg "mount failed"
- log_msg_end
+ log_end_msg
·
if [ "$ovl_mounted" = 0 ]; then
# Mount the layers pairwise from the bottom onto rootmnt,
@@ -554,14 +554,14 @@
continue
fi
ovl_mounted=0
- log_msg_begin "union: mount -t ${UNIONFS} -o upperdir=$mount/upper,lowerdir=$lower,workdir=$mount/work ${UNIONFS} $rootmnt"
+ log_begin_msg "union: mount -t ${UNIONFS} -o upperdir=$mount/upper,lowerdir=$lower,workdir=$mount/work ${UNIONFS} $rootmnt"
mount -t ${UNIONFS} -o "upperdir=$mount/upper,lowerdir=$lower,workdir=$mount/work" ${UNIONFS} "$rootmnt" $ovl_verbose && ovl_mounted=1
[ "$ovl_mounted" = 0 ] && log_warning_msg "mount failed"
- log_msg_end
+ log_end_msg
if [ "$ovl_mounted" = 0 ]; then
- log_msg_begin "union: mount -t ${UNIONFS} -o upperdir=$mount/upper,lowerdir=$lower ${UNIONFS} $rootmnt"
"casper.patch" 35L, 2451C 1,1 Top