From 1e869fafaef57bba1bb10c283968492c04452ff8 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Thu, 2 Apr 2020 21:38:46 -0500 Subject: hscript: Handle existing /etc/localtime in target This can occur if you re-use an intermediate directory for images. --- hscript/meta.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hscript/meta.cc b/hscript/meta.cc index e419cde..9b0eb83 100644 --- a/hscript/meta.cc +++ b/hscript/meta.cc @@ -519,6 +519,8 @@ bool Timezone::execute() const { std::string target_lt = script->targetDirectory() + "/etc/localtime"; error_code ec; if(fs::exists(target_zi, ec)) { + if(fs::exists(target_lt, ec)) fs::remove(target_lt, ec); + fs::create_symlink(zi_path, target_lt, ec); if(ec) { output_error("installfile:" + std::to_string(this->lineno()), -- cgit v1.2.3-70-g09d2