summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-04-03 08:02:24 +0200
committerChristian Breunig <christian@breunig.cc>2023-04-03 08:04:57 +0200
commit36f08f78b806639827c9ae3a81275e057309bb1d (patch)
tree246f8d3b118249f8e7a635cc959cc49e693c101a
parent944c9a7217309451dfb73a92ec09f12e6772dbc1 (diff)
downloadvyatta-cfg-system-36f08f78b806639827c9ae3a81275e057309bb1d.tar.gz
vyatta-cfg-system-36f08f78b806639827c9ae3a81275e057309bb1d.zip
T5136: do not rm -rf if unmount fails
Commit f34e9028 ("T5136: properly unmount filesystems after installation") assumed it would be a good idea to simply rm -rf the new root folder. This could have a bad, non booting side effect. Warn user if unmount fails but the filesystem is synced anyway. The rest is handled by the Kernel on reboot. (cherry picked from commit 964e06bc3404b096d55e939b2bdb8d9c61a6a9b9)
-rwxr-xr-xscripts/install/install-image-existing1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing
index abbd1421..feba6683 100755
--- a/scripts/install/install-image-existing
+++ b/scripts/install/install-image-existing
@@ -280,7 +280,6 @@ fi
# unmount filesystems
if ! try_unmount "--read-only $INST_ROOT $READ_ROOT"; then
- rm -rf $REL_ROOT
failure_exit 'Failed to unmount new squashfs image.'
fi