From 943e79a7e8a9014fd9a7557d4697417257cbd5e5 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Wed, 3 Jun 2020 19:25:03 -0500 Subject: json: Support models without a root mount defined --- tools/hscript-fromjson/jsonconv.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/hscript-fromjson/jsonconv.cc b/tools/hscript-fromjson/jsonconv.cc index b5c9504..cbe6a60 100644 --- a/tools/hscript-fromjson/jsonconv.cc +++ b/tools/hscript-fromjson/jsonconv.cc @@ -43,11 +43,11 @@ bool parse_one_desc(json desc, std::ostream &out) { ENSURE_KEY(desc, "hostname"); ENSURE_KEY(desc, "rootpw"); ENSURE_KEY(desc, "packages"); - ENSURE_KEY(desc, "root"); + //ENSURE_KEY(desc, "root"); out << "hostname " << desc["hostname"].get() << std::endl; out << "rootpw " << desc["rootpw"].get() << std::endl; - out << "mount " << desc["root"].get() << " /" << std::endl; + if(desc.find("root") != desc.end()) out << "mount " << desc["root"].get() << " /" << std::endl; if(desc.find("netaddresses") != desc.end()) { out << "network true" << std::endl; -- cgit v1.2.3-60-g2f50