Fix code for upstream overlay changes

Signed-off-by: Ethan Dye <[email protected]>
ecdye · Aug 16, 2024 · 81acd3a · 81acd3a
1 parent 203ae24
commit 81acd3a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 *.zip
 *.img
 *.sig
+.vscode
diff --git a/zram-config b/zram-config
@@ -126,7 +126,7 @@ createZdir() {
 mergeOverlay() {
 	echo "mergeOverlay: Beginning merge of ${ZDIR}${BIND_DIR}." >> "$ZLOG"
 	ls -la "$ZDIR" "${ZDIR}${BIND_DIR}" "${ZDIR}${ZRAM_DEV}/upper" >> "$ZLOG"
-	overlay merge --yes --lowerdir="${ZDIR}${BIND_DIR}" --upperdir="${ZDIR}${ZRAM_DEV}/upper" &>> "$ZLOG" || return 1
+	overlay merge --ignore-mounted --lowerdir="${ZDIR}${BIND_DIR}" --upperdir="${ZDIR}${ZRAM_DEV}/upper" &>> "$ZLOG" || return 1
 	bash -x -- *.sh &>> "$ZLOG"
 	rm -fv -- *.sh &>> "$ZLOG" || return 1
 	echo "mergeOverlay: Merge of ${ZDIR}${BIND_DIR} complete." >> "$ZLOG"