diff --git a/.gitignore b/.gitignore index 729f8a8..380ac4c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.zip *.img *.sig +.vscode diff --git a/zram-config b/zram-config index 558c1d4..4e2733e 100755 --- 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"