Fixes to misc. boot warnings

board/common/rootfs/etc/fstab

@@ -15,9 +15,9 @@ cfgfs		/config		configfs	nofail,noauto		0	0
 # The chosen backing storage for the overlays placed on /cfg, /etc,
 # /home, /root, and /var, are determined dynamically by /usr/libexec/infix/mnt
 # depending on the available devices.
-mnttmp		/mnt/tmp	tmpfs	defaults				0	0
-LABEL=aux	/mnt/aux	auto	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
-LABEL=var	/mnt/var	auto	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
-LABEL=cfg	/mnt/cfg	auto	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
-hostfs		/mnt/host	9p	cache=none,msize=16384,noauto		0	0
-/usr/libexec/infix/mnt#	/cfg	helper	none					0	0
+mnttmp		/mnt/tmp	tmpfs	defaults					0	0
+LABEL=aux	/mnt/aux	auto	noatime,nodiratime,noauto,errors=remount-ro	0	0
+LABEL=var	/mnt/var	ext4	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
+LABEL=cfg	/mnt/cfg	ext4	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
+hostfs		/mnt/host	9p	cache=none,msize=16384,noauto			0	0
+/usr/libexec/infix/mnt#	/cfg	helper	none						0	0

board/common/rootfs/usr/libexec/infix/mnt

@@ -44,12 +44,15 @@ check_factory()
 factory_reset()
 {
     find /sys/class/leds/ -type l -exec sh -c 'echo 100 > $0/brightness' {} \;
-    logger $opt -p user.crit -t "$nm" "Resetting to factory defaults."
+    print_start "Resetting to factory defaults."
+    logger $opt -p user.notice -t "$nm" "Resetting to factory defaults."
 
     rm -rf /mnt/cfg/* /mnt/var/*
-
-    logger $opt -p user.crit -t "$nm" "Factory reset complete."
     sync
+
+    logger $opt -p user.notice -t "$nm" "Factory reset complete."
+    print_end 0 "Factory reset complete."
+    print_restore
 }
 
 is_mmc()
@@ -105,15 +108,18 @@ find_partition_by_label()
 	esac
 
 	disk="/dev/$devname"
+
+	#
+	# 1. Try GPT/MBR partition label using sgdisk
+	#
 	result=$(sgdisk -p "$disk" 2>/dev/null | awk -v label="$label" -v devname="$devname" '
-	    /^  *[0-9]/ {
+	    /^ *[0-9]/ {
 		if ($7 == label) {
-		    if (devname ~ /^(mmcblk|nvme|loop)/) {
-			print devname "p" $1
-		    } else {
-			print devname $1
-		    }
-		    exit 0
+		    if (devname ~ /^(mmcblk|nvme|loop)/)
+			print devname "p" $1;
+		    else
+			print devname $1;
+		    exit 0;
 		}
 	    }
 	')
@@ -122,7 +128,30 @@ find_partition_by_label()
 	    echo "$result"
 	    return 0
 	fi
+
+	#
+	# 2. Fallback: Check if the whole disk is an ext4/ext2/ext3 filesystem
+	#
+
+	# Check for ext4/ext2/ext3 magic number (0xEF53) at offset 1080 (1024+56).
+	magic_number=$(dd if="$disk" bs=1 skip=1080 count=2 2>/dev/null | od -t x2 -A n | tr -d ' \n')
+
+	# Check for both Little-Endian ('53ef') and Big-Endian ('ef53') interpretations of 0xEF53.
+	# This supports bi-endian architectures like MIPS that may run in BE mode,
+	# as well as the LE mode which is standard for RISC-V and ext filesystems.
+	if [ "$magic_number" = "ef53" ] || [ "$magic_number" = "53ef" ]; then
+
+	    # Read the volume label from offset 1144 (1024+120)
+	    fslabel=$(dd if="$disk" bs=1 skip=1144 count=16 2>/dev/null | tr -d '\000')
+	    logger $opt -p user.notice -t "$nm" "Found label $fslabel on disk $disk ..."
+
+	    if [ "$fslabel" = "$label" ]; then
+		echo "$devname"
+		return 0
+	    fi
+	fi
     done
+
     return 1
 }
 
@@ -273,6 +302,9 @@ mount_rw()
     # If something is already setup, leave it be.
     mountpoint -q "/$1" && return 0
 
+    # If partition doesn't exist (var is optional), signal caller.
+    find_partition_by_label "$1" >/dev/null || return 1
+
     # Check if /var has been resized to fill the sdcard/eMMC
     if [ "$1" = "var" ] && is_mmc; then
 	if [ -f /mnt/aux/resized ] || [ -f /mnt/aux/resized.failed ]; then
@@ -289,8 +321,10 @@ mount_rw()
 
     # TODO: Also look for UBI partitions
 
-    # 
-    tune2fs -c 0 -i 0 LABEL="$1" 2>/dev/null 
+    # Disable periodic fsck, yet keeping safety checks on ext4
+    if grep "LABEL=$label" /etc/fstab |grep -q ext4; then
+	tune2fs -c 0 -i 0 LABEL="$1" 2>/dev/null
+    fi
     mount LABEL="$1" 2>/dev/null && return 0
 
     return 1

src/confd/src/core.c

@@ -8,16 +8,9 @@
 struct confd confd;
 
 
-int core_startup_save(sr_session_ctx_t *session, uint32_t sub_id, const char *module,
-		      const char *xpath, sr_event_t event, unsigned request_id, void *priv)
+static int startup_save(sr_session_ctx_t *session, uint32_t sub_id, const char *model,
+			const char *xpath, sr_event_t event, unsigned request_id, void *priv)
 {
-	sr_event_t last_event = -1;
-	static unsigned int last_request = -1;
-	if (last_event == event && last_request == request_id)
-		return SR_ERR_OK;
-	last_event = event;
-	last_request = request_id;
-
 	/* skip in bootstrap, triggered by load script to initialize startup datastore */
 	if (systemf("runlevel >/dev/null 2>&1"))
 		return SR_ERR_OK;
@@ -33,9 +26,10 @@ static confd_dependency_t add_dependencies(struct lyd_node **diff, const char *x
 	struct lyd_node *new_node = NULL;
 	struct lyd_node *target = NULL;
 	struct lyd_node *root = NULL;
-	int rc;
 
 	if (!lydx_get_xpathf(*diff, "%s", xpath)) {
+		int rc;
+
 		/* Create the path, potentially creating a new tree */
 		rc = lyd_new_path(NULL, LYD_CTX(*diff), xpath, value, LYD_NEW_PATH_UPDATE, &new_node);
 		if (rc != LY_SUCCESS || !new_node) {
@@ -147,7 +141,7 @@ static confd_dependency_t handle_dependencies(struct lyd_node **diff, struct lyd
 	return result;
 }
 
-static int change_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *module_name,
+static int change_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *model_name,
 		     const char *xpath, sr_event_t event, uint32_t request_id, void *_confd)
 {
 	struct lyd_node *diff = NULL, *config = NULL;
@@ -258,16 +252,20 @@ static int change_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *mod
 
 		AUDIT("The new configuration has been applied.");
 	}
+
 free_diff:
-      lyd_free_tree(diff);
-      return rc;
+	lyd_free_tree(diff);
+	return rc;
 }
 
-static inline int subscribe_module(char *model, struct confd *confd, int flags) {
-	return sr_module_change_subscribe(confd->session, model, "//.", change_cb, confd,
-					  CB_PRIO_PRIMARY, SR_SUBSCR_CHANGE_ALL_MODULES | SR_SUBSCR_DEFAULT | flags, &confd->sub) &&
-		sr_module_change_subscribe(confd->startup, model, "//.", core_startup_save, NULL,
-					   CB_PRIO_PASSIVE, SR_SUBSCR_PASSIVE | SR_SUBSCR_CHANGE_ALL_MODULES, &confd->sub);
+static inline int subscribe_model(char *model, struct confd *confd, int flags)
+{
+	return  sr_module_change_subscribe(confd->session, model, "//.", change_cb, confd,
+					   CB_PRIO_PRIMARY, SR_SUBSCR_CHANGE_ALL_MODULES |
+					   SR_SUBSCR_DEFAULT | flags, &confd->sub) ||
+		sr_module_change_subscribe(confd->startup, model, "//.", startup_save, NULL,
+					   CB_PRIO_PASSIVE, SR_SUBSCR_CHANGE_ALL_MODULES |
+					   SR_SUBSCR_PASSIVE, &confd->sub);
 }
 
 int sr_plugin_init_cb(sr_session_ctx_t *session, void **priv)
@@ -295,7 +293,7 @@ int sr_plugin_init_cb(sr_session_ctx_t *session, void **priv)
 	if (!confd.conn)
 		goto err;
 
-	/* The startup datastore is used for the core_startup_save() hook */
+	/* The startup datastore is used for the startup_save() hook */
 	rc = sr_session_start(confd.conn, SR_DS_STARTUP, &confd.startup);
 	if (rc)
 		goto err;
@@ -314,69 +312,69 @@ int sr_plugin_init_cb(sr_session_ctx_t *session, void **priv)
 	 */
 	confd.ifquirks = json_load_file("/etc/product/interface-quirks.json", 0, NULL);
 
-	rc = subscribe_module("ietf-interfaces", &confd, 0);
+	rc = subscribe_model("ietf-interfaces", &confd, 0);
 	if (rc) {
 		ERROR("Failed to subscribe to ietf-interfaces");
 		goto err;
 	}
-	rc = subscribe_module("ietf-netconf-acm", &confd, 0);
+	rc = subscribe_model("ietf-netconf-acm", &confd, 0);
 	if (rc) {
 		ERROR("Failed to subscribe to ietf-netconf-acm");
 		goto err;
 	}
-	rc = subscribe_module("infix-dhcp-client", &confd, 0);
+	rc = subscribe_model("infix-dhcp-client", &confd, 0);
 	if (rc) {
 		ERROR("Failed to subscribe to infix-dhcp-client");
 		goto err;
 	}
-	rc = subscribe_module("ietf-keystore", &confd, SR_SUBSCR_UPDATE);
+	rc = subscribe_model("ietf-keystore", &confd, SR_SUBSCR_UPDATE);
 	if (rc) {
 		ERROR("Failed to subscribe to ietf-keystore");
 		goto err;
 	}
-	rc = subscribe_module("infix-services", &confd, 0);
+	rc = subscribe_model("infix-services", &confd, 0);
 	if (rc) {
 		ERROR("Failed to subscribe to infix-services");
 		goto err;
 	}
-	rc = subscribe_module("ietf-system", &confd, 0);
+	rc = subscribe_model("ietf-system", &confd, 0);
 	if (rc) {
 		ERROR("Failed to subscribe to ietf-system");
 		goto err;
 	}
-	rc = subscribe_module("ieee802-dot1ab-lldp", &confd, 0);
+	rc = subscribe_model("ieee802-dot1ab-lldp", &confd, 0);
 	if (rc) {
 		ERROR("Failed to subscribe to ieee802-dot1ab-lldp");
 		goto err;
 	}
 #ifdef CONTAINERS
-	rc = subscribe_module("infix-containers", &confd, 0);
+	rc = subscribe_model("infix-containers", &confd, 0);
 	if (rc) {
 		ERROR("Failed to subscribe to infix-containers");
 		goto err;
 	}
 #endif
-	rc = subscribe_module("infix-dhcp-server", &confd, 0);
+	rc = subscribe_model("infix-dhcp-server", &confd, 0);
 	if (rc) {
 		ERROR("Failed to subscribe to infix-dhcp-server");
 		goto err;
 	}
-	rc = subscribe_module("ietf-routing", &confd, 0);
+	rc = subscribe_model("ietf-routing", &confd, 0);
 	if (rc) {
 		ERROR("Failed to subscribe to ietf-routing");
 		goto err;
 	}
-	rc = subscribe_module("ietf-hardware", &confd, 0);
+	rc = subscribe_model("ietf-hardware", &confd, 0);
 	if (rc) {
 		ERROR("Failed to subscribe to ietf-hardware");
 		goto err;
 	}
-	rc = subscribe_module("infix-firewall", &confd, 0);
+	rc = subscribe_model("infix-firewall", &confd, 0);
 	if (rc) {
 		ERROR("Failed to subscribe to infix-firewall");
 		goto err;
 	}
-	rc = subscribe_module("infix-meta", &confd, SR_SUBSCR_UPDATE);
+	rc = subscribe_model("infix-meta", &confd, SR_SUBSCR_UPDATE);
 	if (rc) {
 		ERROR("Failed to subscribe to infix-meta");
 		goto err;

src/confd/src/core.h

@@ -135,7 +135,6 @@ struct confd {
 	struct dagger		netdag;
 };
 
-int      core_startup_save (sr_session_ctx_t *, uint32_t, const char *, const char *, sr_event_t, unsigned, void *);
 
 static inline int register_change(sr_session_ctx_t *session, const char *module, const char *xpath,
 	int flags, sr_module_change_cb cb, void *arg, sr_subscription_ctx_t **sub)