summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-10-26 02:25:41 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-10-26 02:25:41 -0500
commit1cd72d82372a9e89bdf406f58ae8609e344a1bd1 (patch)
tree092ea4d5dc4d1e0122deef6f5795c9112d70c049
parentec395888bd4a62e5a36b55e98999a24c6ffe3ac0 (diff)
downloadhorizon-1cd72d82372a9e89bdf406f58ae8609e344a1bd1.tar.gz
horizon-1cd72d82372a9e89bdf406f58ae8609e344a1bd1.tar.bz2
horizon-1cd72d82372a9e89bdf406f58ae8609e344a1bd1.tar.xz
horizon-1cd72d82372a9e89bdf406f58ae8609e344a1bd1.zip
hscript: Fix missing endl for timezone simulation; print what's happening
-rw-r--r--hscript/meta.cc9
-rw-r--r--hscript/user.cc3
2 files changed, 11 insertions, 1 deletions
diff --git a/hscript/meta.cc b/hscript/meta.cc
index 9f0da76..66e96f2 100644
--- a/hscript/meta.cc
+++ b/hscript/meta.cc
@@ -264,6 +264,10 @@ Key *Language::parseFromData(const std::string &data, int lineno, int *errors,
bool Language::execute(ScriptOptions opts) const {
+ output_info("installfile:" + std::to_string(this->lineno()),
+ "language: setting default system language to " +
+ this->value());
+
if(opts.test(Simulate)) {
std::cout << "printf '#!/bin/sh\\" << "nexport LANG=\"%s\"\\" << "n'"
<< this->value() << " > /target/etc/profile.d/language.sh"
@@ -360,13 +364,16 @@ Key *Timezone::parseFromData(const std::string &data, int lineno, int *errors,
}
bool Timezone::execute(ScriptOptions opts) const {
+ output_info("installfile:" + std::to_string(this->lineno()),
+ "timezone: setting system timezone to " + this->value());
+
if(opts.test(Simulate)) {
/* If the target doesn't have tzdata installed, copy the zoneinfo from
* the Horizon environment. */
std::cout << "([ -f /target/usr/share/zoneinfo/" << this->value()
<< " ] && ln -s /usr/share/zoneinfo/" << this->value()
<< " /target/etc/localtime) || cp /usr/share/zoneinfo/"
- << this->value() << " /target/etc/localtime";
+ << this->value() << " /target/etc/localtime" << std::endl;
return true;
}
diff --git a/hscript/user.cc b/hscript/user.cc
index b288070..f654db9 100644
--- a/hscript/user.cc
+++ b/hscript/user.cc
@@ -137,6 +137,9 @@ bool RootPassphrase::execute(ScriptOptions options) const {
const std::string root_line = "root:" + this->_value + ":" +
std::to_string(time(nullptr) / 86400) + ":0:::::";
+ output_info("installfile:" + std::to_string(this->lineno()),
+ "rootpw: setting root passphrase");
+
if(options.test(Simulate)) {
std::cout << "(printf '" << root_line << "\\" << "n'; "
<< "cat /target/etc/shadow | sed '1d') > /tmp/shadow"