fix #3

Author: previ

src/sbin/init_overlay

@@ -122,11 +122,15 @@ if [ "$DOUPDATE" -eq 1 ]
 then
 	#do update
 	#merge first
-	merge_overlay && \
-	#backup_boot
+        echo "merging..." && \
+	merge_overlay $OVERMPOINT / && \
+        echo "merge done" && \
+        echo "backing up boot..." && \
 	backup_boot && \
-	#create new overlay
+        echo "backup boot done" && \
+        echo "recreating overlay..." && \
 	/sbin/create_overlay && \
+        echo "recreated overlay" && \
 	mountall
 fi
 

src/sbin/merge_overlay

@@ -19,12 +19,12 @@ CONF=${CONF:-/etc/coderbot/init_overlay.conf}
 source $CONF #||  fail "ERROR: file not found CONF_FILE: $CONF"
 
 OVERMPOINT=${OVERMPOINT:-$1}
-ROMMPOINT=${ROMMPOINT:-$2}
+ROMMPOINT=/
 REOPTS="rw,remount,rw"
 UPPERDIR=${UPPERDIR:-upper}
 
-[ -d $OVERMPOINT ] || fail "ERROR: OVERMPOINT $OVERMPOINT directory not faound"
-[ -d $ROMMPOINT ] || fail "ERROR: ROMMPOINT $ROMMPOINT directory not faound"
+[ -d $OVERMPOINT ] || fail "ERROR: OVERMPOINT $OVERMPOINT directory not found"
+[ -d $ROMMPOINT ] || fail "ERROR: ROMMPOINT $ROMMPOINT directory not found"
 
 mount -o $REOPTS $ROMMPOINT || fail "ERROR: can't remount $ROMMPOINT rw"
 
@@ -35,6 +35,7 @@ OPAQUE=`getfattr -dm- -R . | perl -le '$lastfile=""; while(<>){if($_ =~ m/^#.*fi
 #back to previous dir
 cd - || fail "ERROR: can't cd to previous dir (-)"
 
+echo "Removing deleted files"
 if [ -z "$REMOVED" ]
 then
 	echo "Nothing to remove"
@@ -46,6 +47,7 @@ else
 	done <<< $REMOVED
 fi
 
+echo "Removing opaque files"
 if [ -z "$OPAQUE" ]
 then
 	echo "No opaque to remove"
@@ -56,6 +58,8 @@ else
 	done <<< $OPAQUE
 fi
 
+echo "Copying files from overlay to lower fs"
+
 cp -a "${OVERMPOINT}/${UPPERDIR}/." $ROMMPOINT/ || fail "ERROR in copying files"
 
 echo "Merged ok, now you should clear overlay and backup boot"