From 7ccb6c458de1c7c7bc41fcd9b1db9a9a2c387175 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 18 Sep 2011 22:45:24 -0500 Subject: [PATCH] script/makepkg: make port_save_config a little more atomic --- script/makepkg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/script/makepkg b/script/makepkg index c9ea2d9..9e9e3b4 100755 --- a/script/makepkg +++ b/script/makepkg @@ -358,7 +358,10 @@ port_save_config() { meh "port save-config" mkdir -p "${conf_dir}/port.options.tmp" cheval "cd /var/db/ports; find . -type d -o -type f -name options | cpio -oHnewc" | ( cd "${conf_dir}/port.options.tmp"; cpio -i ) || wtf "port safe-config failed" - rm -Rf "${conf_dir}/port.options" && mv -f "${conf_dir}/port.options.tmp" "${conf_dir}/port.options" || wtf "port save-config atomic commit failed" + mv -f "${conf_dir}/port.options" "${conf_dir}/port.options.old" && \ + mv -f "${conf_dir}/port.options.tmp" "${conf_dir}/port.options" && \ + rm -Rf "${conf_dir}/port.options.old" || \ + wtf "port save-config atomic commit failed" } ######## -- 2.42.0