confd: relocate auto-factory templates and prepare fail secure mode

The template and scripts for generating per-device factory-config have
been spread out across the repo.  This is an attempt to gather all the
pieces to a single location for better overview.

Parts of factory-config will be reused for the new fail secure mode, in
the file failure-config.  The beginnings of which are in this commit.

Other changes:
 - cfg-bootstrap and confd-bootstrap have been collapsed into one
 - let gen-hostname + gen-interfaces save to /cfg instead of /etc,
   we've moved the /etc directory to read-only storage in /usr/share
 - delay start of bootstrap and sysrepo-plugind after syslogd barrier
 - set 'norestart' when loading startup-confg and failure-config,
   no point in retrying if that fails, just go to error immediately

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

board/netconf/rootfs/lib/infix/cfg-bootstrap

@@ -1,35 +0,0 @@
-#!/bin/sh
-set -e
-
-PATH=/lib/infix/factory:$PATH
-
-[ "$FACTORY_D" ] || FACTORY_D=/etc/auto-factory.d
-[ "$CFG_D" ]     || CFG_D=/cfg
-[ "$GENCFG_D" ]  || GENCFG_D=/cfg/factory.d
-mkdir -p $GENCFG_D
-
-gen-hostname   >$FACTORY_D/20-auto-hostname.json
-gen-interfaces >$FACTORY_D/20-auto-interfaces.json
-
-[ -s $GENCFG_D/20-auto-hostkey.json ] || gen-hostkeys >$GENCFG_D/20-auto-hostkey.json
-
-# Allow regenerating default factory-config, but keep it read-ony
-# to prevent it from being overwritten by mistake by users.
-rm -f $CFG_D/auto-factory-config.cfg
-# shellcheck disable=SC2046
-jq -s 'reduce .[] as $item ({}; . * $item)' \
-   $(find $FACTORY_D -name '*.json') \
-   $(find $GENCFG_D  -name '*.json') \
-   >$CFG_D/auto-factory-config.cfg
-chmod 444 $CFG_D/auto-factory-config.cfg
-
-# TODO: Look for statically defined factory-config, based on the
-# system's product ID.
-
-# If we haven't found a better one, settle for auto-factory-config as
-# the system's factory-config.
-[ -h $CFG_D/factory-config.cfg ] || \
-    ln -sf auto-factory-config.cfg $CFG_D/factory-config.cfg
-
-# Bootstrap sysrepo db with all modules required by confd
-/usr/libexec/confd/confd-bootstrap.sh $CFG_D/factory-config.cfg $CFG_D/startup-config.cfg

package/confd/sysrepo.conf

@@ -1,16 +1,21 @@
 #set DEBUG=1
 
-run name:bootstrap log:prio:user.notice \
+run name:bootstrap log:prio:user.notice <pid/syslogd> \
-	[S] /lib/infix/cfg-bootstrap -- Bootstrapping YANG models
+	[S] /usr/libexec/confd/bootstrap -- Bootstrapping YANG datastore
 
-service name:sysrepo log \
+service name:sysrepo log <pid/syslogd> \
 	[S12345789] sysrepo-plugind -f -p /run/sysrepo.pid -n -v3 -- Configuration daemon
 
 # Bootstrap system with startup-config
-run name:startup log:prio:user.notice \
+run name:startup log:prio:user.notice norestart \
-	[S] <pid/sysrepo> /usr/libexec/confd/confd-load.sh -b startup-config \
+	[S] <pid/sysrepo> /usr/libexec/confd/load -b startup-config \
 	-- Loading startup-config
 
+# Run if loading startup-config fails for some reason
+run name:failure log:prio:user.critical norestart if:<run/startup/failure> \
+	[S] <pid/sysrepo> /usr/libexec/confd/load failure-config \
+	-- Loading failure-config
+
 service name:netopeer log \
 	[12345789] <pid/sysrepo> netopeer2-server -F -t 60 \
 	-- NETCONF server

src/confd/Makefile.am

@@ -1,5 +1,5 @@
-SUBDIRS             = src yang
+SUBDIRS             = src yang share
 dist_doc_DATA       = README.md LICENSE
-pkglibexec_SCRIPTS  = confd-bootstrap.sh confd-load.sh
+pkglibexec_SCRIPTS  = $(wildcard bin/*)
 DISTCLEANFILES      = *~ *.d
 ACLOCAL_AMFLAGS     = -I m4

src/confd/bin/bootstrap

@@ -1,4 +1,6 @@
 #!/bin/sh
+# Bootstrap sysrepo db with all modules required by confd
+#
 # 1. Load all yang models with /cfg/factory-config
 # 2. [ if /cfg/startup-config is missing :: copy {factory} -> /cfg/startup-config ]
 # 3. Import /cfg/startup -> {startup} ]
@@ -9,14 +11,42 @@
 # It's all really simple ... this script takes care of 1-4
 #
 
-FACTORY=$1
+PATH=/usr/libexec/confd/:$PATH
-STARTUP=$2
 INIT_DATA=/etc/sysrepo/factory-default.json
 SEARCH=/usr/share/yang/modules/confd:/usr/share/yang/modules/libnetconf2:/usr/share/yang/modules/libyang:/usr/share/yang/modules/netopeer2:/usr/share/yang/modules/sysrepo
 
-if [ -z "$FACTORY" -o -z "$STARTUP" ]; then
+[ "$FACTORY_D" ] || FACTORY_D=/usr/share/confd/factory
-        echo "Missing argument to sysrepo-bootstrap.sh $FACTORY $STARTUP"
+[ "$CFG_D" ]     || CFG_D=/cfg
-        exit 1
+[ "$GENCFG_D" ]  || GENCFG_D=/cfg/factory.d
+
+FACTORY=$CFG_D/factory-config.cfg
+STARTUP=$CFG_D/startup-config.cfg
+
+# Generate device's factory-config at first boot
+if [ ! -d "$GENCFG_D" ]; then
+    mkdir -p $GENCFG_D
+
+    gen-hostname   >$GENCFG_D/20-auto-hostname.json
+    gen-interfaces >$GENCFG_D/20-auto-interfaces.json
+
+    [ -s $GENCFG_D/20-auto-hostkey.json ] || gen-hostkeys >$GENCFG_D/20-auto-hostkey.json
+
+    # Allow regenerating default factory-config, but keep it read-ony
+    # to prevent it from being overwritten by mistake by users.
+    rm -f $CFG_D/auto-factory-config.cfg
+    # shellcheck disable=SC2046
+    jq -s 'reduce .[] as $item ({}; . * $item)' \
+       $(find $FACTORY_D -name '*.json') \
+       $(find $GENCFG_D  -name '*.json') \
+       >$CFG_D/auto-factory-config.cfg
+    chmod 444 $CFG_D/auto-factory-config.cfg
+
+    # TODO: Look for statically defined factory-config, based on the
+    #       system's product ID, or just custom site-specific factory.
+
+    # If we haven't found a better one, settle for auto-factory-config as
+    # the system's factory-config.
+    [ -h $FACTORY ] || ln -sf auto-factory-config.cfg $FACTORY
 fi
 
 # Drop all pre-initialized data from netopeer2 install, then re-create

src/confd/bin/load

@@ -29,7 +29,6 @@ fi
 if ! sysrepocfg -v3 -I"$fn" -f json; then
     if eval $bootstrap; then
 	logger -sik -p user.error "Failed bootstrapping system, reverting to Fail Secure mode!"
-	initctl -nbq cond set fail-startup
 	initctl -nbq runlevel 9
     else
 	logger -sik -p user.error "Failed loading $fn, aborting!"

src/confd/configure.ac

@@ -5,6 +5,9 @@ AM_SILENT_RULES(yes)
 
 AC_CONFIG_FILES([
 	Makefile
+	share/Makefile
+	share/factory/Makefile
+	share/failure/Makefile
 	src/Makefile
 	yang/Makefile
 ])

src/confd/share/Makefile.am

@@ -0,0 +1,2 @@
+SUBDIRS             = factory failure
+pkgdata_DATA        = $(wildcard share/*)

src/confd/share/README

@@ -0,0 +1 @@
+Templates for generating device-specific factory-config and failure-config.

src/confd/share/factory/Makefile.am

@@ -0,0 +1,2 @@
+factorydir          = $(pkgdatadir)/factory
+factory_DATA        = $(wildcard *.json)

src/confd/share/failure/10-authentication.json

@@ -0,0 +1,13 @@
+{
+  "ietf-system:system": {
+    "authentication": {
+      "user": [
+        {
+          "name": "admin",
+          "password": "$6$bKPp6xu45L1cmp70$fcwDhGZct4q8LxwPASf9iVHyWqnklcdjeYi/SupLo1K9nb.aAQUz48.3qTcW38XL6gQzfHyGoyeDG2orjPUwm1",
+	  "infix-system:shell": "infix-shell-type:bash"
+        }
+      ]
+    }
+  }
+}

src/confd/share/failure/10-nacm.json

@@ -0,0 +1 @@
+../factory/10-nacm.json

src/confd/share/failure/10-netconf-server.json

@@ -0,0 +1 @@
+../factory/10-netconf-server.json

src/confd/share/failure/10-system.json

@@ -0,0 +1,11 @@
+{
+    "ietf-system:system": {
+	"hostname": "failure"
+    },
+    "ieee802-dot1ab-lldp:lldp": {
+	"infix-lldp:enabled": true
+    },
+    "infix-services:mdns": {
+	"enabled": true
+    }
+}

src/confd/share/failure/Makefile.am

@@ -0,0 +1,2 @@
+failuredir          = $(pkgdatadir)/failure
+failure_DATA        = $(wildcard *.json)