[SCM] live-boot branch, debian, updated. debian/3.0_a25-1-72-gfc7a680
Daniel Baumann
daniel at debian.org
Thu Apr 5 06:21:39 UTC 2012
The following commit has been merged in the debian branch:
commit a844e2f2b5c126e6f3e54a65e69b8673553afdf3
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Apr 1 22:04:06 2012 +0200
Calling rm without -f when removing some temporary custom mount related files to ensure non-interactivity.
diff --git a/scripts/live b/scripts/live
index ac2845c..077ad52 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1695,12 +1695,12 @@ setup_unionfs ()
# that we won't hide a previous mount. We also ignore
# duplicate destinations in a more or less arbitrary way.
[ -e "${bindings}" ] && sort -k2 -sbu ${bindings} >> ${custom_mounts}
- rm ${bindings}
+ rm -f ${bindings}
# After all mounts are considered we add symlinks so they
# won't be hidden by some mount.
[ -e "${links}" ] && sort -k2 -sbu ${links} >> ${custom_mounts}
- rm ${links}
+ rm -f ${links}
[ "${DEBUG}" = "Yes" ] && cp ${custom_mounts} ${persistent_backing}
--
live-boot
More information about the debian-live-changes
mailing list