mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-09-24 13:17:16 +02:00
core: skip mount points during backup and clean installs (#16532)
* Skip mount points during backup and clean install Prevent accidental deletion or backup of mount points: - In create_backup(), skip paths that are mount points with a warning - In _deploy_source_tarball(), _deploy_unpacked_archive(), and fetch_and_deploy_from_url(), use find with mountpoint pruning to avoid deleting mount point directories during CLEAN_INSTALL * change comments for new variant Update `_deploy_source_tarball` and related helper comments to note that CLEAN_INSTALL wipes target contents including dotfiles while preserving mount points. This improves guidance around backup/restore of config dotfiles during source deployments.
This commit is contained in:
committed by
GitHub
parent
d0456f5b77
commit
a9ff7e6a13
+13
-9
@@ -1336,6 +1336,10 @@ create_backup() {
|
|||||||
msg_warn "Skipping backup of '${path}' (not found)"
|
msg_warn "Skipping backup of '${path}' (not found)"
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
if mountpoint -q "$path" 2>/dev/null; then
|
||||||
|
msg_warn "Skipping backup of '${path}' (is a mount point)"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
dest="${store}/files${path}"
|
dest="${store}/files${path}"
|
||||||
if ! mkdir -p "$(dirname "$dest")" || ! cp -a "$path" "$dest"; then
|
if ! mkdir -p "$(dirname "$dest")" || ! cp -a "$path" "$dest"; then
|
||||||
msg_error "Backup of '${path}' failed - aborting update"
|
msg_error "Backup of '${path}' failed - aborting update"
|
||||||
@@ -2524,9 +2528,9 @@ _download_source_tarball() {
|
|||||||
# directory). Extracts <tarball_path> into <workdir>, then copies the contents
|
# directory). Extracts <tarball_path> into <workdir>, then copies the contents
|
||||||
# of that top-level directory into <target>.
|
# of that top-level directory into <target>.
|
||||||
#
|
#
|
||||||
# - Honors CLEAN_INSTALL=1 (wipes <target> first, dotfiles included — back
|
# - Honors CLEAN_INSTALL=1 (wipes <target> first, dotfiles included, mount
|
||||||
# up config dotfiles like .env via create_backup and call restore_backup
|
# points preserved — back up config dotfiles like .env via create_backup
|
||||||
# BEFORE any build step that sources them).
|
# and call restore_backup BEFORE any build step that sources them).
|
||||||
# - Does NOT own <workdir>: the caller creates it and is responsible for its
|
# - Does NOT own <workdir>: the caller creates it and is responsible for its
|
||||||
# cleanup (typically via a RETURN trap on its tmpdir).
|
# cleanup (typically via a RETURN trap on its tmpdir).
|
||||||
# - cp failures are non-fatal here, matching the previous inline behavior.
|
# - cp failures are non-fatal here, matching the previous inline behavior.
|
||||||
@@ -2538,7 +2542,7 @@ _deploy_source_tarball() {
|
|||||||
|
|
||||||
mkdir -p "$target"
|
mkdir -p "$target"
|
||||||
if [[ "${CLEAN_INSTALL:-0}" == "1" ]]; then
|
if [[ "${CLEAN_INSTALL:-0}" == "1" ]]; then
|
||||||
find "${target:?}" -mindepth 1 -delete
|
find "${target:?}" -mindepth 1 \( -type d -exec mountpoint -q {} \; -prune \) -o -delete
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tar --no-same-owner -xzf "$tarball" -C "$workdir" || {
|
tar --no-same-owner -xzf "$tarball" -C "$workdir" || {
|
||||||
@@ -2564,9 +2568,9 @@ _deploy_source_tarball() {
|
|||||||
# a single top-level directory, that directory is stripped (its contents land
|
# a single top-level directory, that directory is stripped (its contents land
|
||||||
# directly in <target>); otherwise the archive contents are copied as-is.
|
# directly in <target>); otherwise the archive contents are copied as-is.
|
||||||
#
|
#
|
||||||
# - Honors CLEAN_INSTALL=1 (wipes <target> first, dotfiles included — back
|
# - Honors CLEAN_INSTALL=1 (wipes <target> first, dotfiles included, mount
|
||||||
# up config dotfiles like .env via create_backup and call restore_backup
|
# points preserved — back up config dotfiles like .env via create_backup
|
||||||
# BEFORE any build step that sources them).
|
# and call restore_backup BEFORE any build step that sources them).
|
||||||
# - Does NOT own <workdir>: the caller creates it and cleans it up.
|
# - Does NOT own <workdir>: the caller creates it and cleans it up.
|
||||||
#
|
#
|
||||||
# Returns: 0 on success, 65 on unsupported format, 251 on extraction failure,
|
# Returns: 0 on success, 65 on unsupported format, 251 on extraction failure,
|
||||||
@@ -2627,7 +2631,7 @@ _deploy_unpacked_archive() {
|
|||||||
# was truncated, the archive was unreadable, or it unpacked to nothing.
|
# was truncated, the archive was unreadable, or it unpacked to nothing.
|
||||||
mkdir -p "$target"
|
mkdir -p "$target"
|
||||||
if [[ "${CLEAN_INSTALL:-0}" == "1" ]]; then
|
if [[ "${CLEAN_INSTALL:-0}" == "1" ]]; then
|
||||||
find "${target:?}" -mindepth 1 -delete
|
find "${target:?}" -mindepth 1 \( -type d -exec mountpoint -q {} \; -prune \) -o -delete
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! cp -r "$source_dir"/* "$target/"; then
|
if ! cp -r "$source_dir"/* "$target/"; then
|
||||||
@@ -9368,7 +9372,7 @@ fetch_and_deploy_from_url() {
|
|||||||
mkdir -p "$directory"
|
mkdir -p "$directory"
|
||||||
|
|
||||||
if [[ "${CLEAN_INSTALL:-0}" == "1" ]]; then
|
if [[ "${CLEAN_INSTALL:-0}" == "1" ]]; then
|
||||||
find "${directory:?}" -mindepth 1 -delete
|
find "${directory:?}" -mindepth 1 \( -type d -exec mountpoint -q {} \; -prune \) -o -delete
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local unpack_tmp
|
local unpack_tmp
|
||||||
|
|||||||
Reference in New Issue
Block a user