cli: add 'show boot-order' and 'set boot-order a b c' commands

Fixes #1032

Signed-off-by: Joachim Wiberg <[email protected]>

Author: troglobit

doc/ChangeLog.md

@@ -38,6 +38,9 @@ All notable changes to the project are documented in this file.
   kernel default (*inherit*), which in turn fixes reported issues with dropped
   OSPF Hello frames in GRE tunnels
 - [Document][bpi-r3-emmc-documentation] how to go from SD card to eMMC on bpi-r3
+- Add CLI commands for managing boot partition order: `show boot-order` and
+  `set boot-order` allow viewing and changing the boot order from the CLI,
+  complementing the existing YANG RPC support, issue #1032
 
 ### Fixes
 

doc/upgrade.md

@@ -23,6 +23,79 @@ YANG support for upgrading Infix, inspecting and _modifying_ the
 boot-order, is defined in [infix-system-software][2].
 
 
+## Changing Boot Order
+
+The boot order can be manually changed using the `set boot-order` command.
+This is useful for rolling back to a previous version or changing the
+preferred boot source.
+
+The command accepts one to three boot targets as separate arguments, in the
+desired boot order. Valid boot targets are:
+
+- `primary` - The primary partition
+- `secondary` - The secondary partition
+- `net` - Network boot (if supported by bootloader)
+
+The CLI provides tab-completion for boot targets, making it easy to enter
+valid values.
+
+Example: View current boot order and change it:
+
+```
+admin@example:/> show boot-order
+primary secondary net
+admin@example:/> set boot-order secondary primary net
+admin@example:/> show boot-order
+secondary primary net
+admin@example:/>
+```
+
+Example: Set boot order to only try primary partition:
+
+```
+admin@example:/> show boot-order
+secondary primary net
+admin@example:/> set boot-order primary
+admin@example:/> show boot-order
+primary
+admin@example:/>
+```
+
+Example: Using tab-completion (press TAB to see available options):
+
+```
+admin@example:/> set boot-order <TAB>
+net        primary    secondary
+admin@example:/> set boot-order secondary <TAB>
+net        primary    secondary
+admin@example:/> set boot-order secondary primary
+admin@example:/> show boot-order
+secondary primary
+admin@example:/>
+```
+
+The new boot order takes effect on the next reboot and can be verified
+with `show boot-order` or `show software`:
+
+```
+admin@example:/> show software
+BOOT ORDER
+secondary primary
+
+NAME      STATE     VERSION                DATE
+primary   booted    v25.01.0               2025-04-25T10:15:00+00:00
+secondary inactive  v25.01.0               2025-04-25T10:07:20+00:00
+admin@example:/>
+```
+
+> [!NOTE]
+> The boot order is automatically updated when performing an upgrade.
+> The newly installed image will be set as the first boot target.
+>
+> Duplicate boot targets are not allowed. The CLI will reject attempts to
+> specify the same target multiple times.
+
+
 ## Upgrading
 
 Upgrading Infix is done one partition at a time. If the system has

src/klish-plugin-infix/src/infix.c

@@ -263,6 +263,89 @@ int infix_shell(kcontext_t *ctx)
 	return rc;
 }
 
+static const char *boot_targets[] = {
+	"primary",
+	"secondary",
+	"net",
+	NULL
+};
+
+int infix_boot_targets(kcontext_t *ctx)
+{
+	size_t i;
+
+	(void)ctx;
+
+	for (i = 0; boot_targets[i]; i++)
+		puts(boot_targets[i]);
+
+	return 0;
+}
+
+static const char *valid_boot_target(const kparg_t *parg)
+{
+	const char *target;
+	size_t i;
+
+	if (!parg)
+		return NULL;
+
+	target = kparg_value(parg);
+	for (i = 0; boot_targets[i]; i++) {
+		if (!strcmp(target, boot_targets[i]))
+			return target;
+	}
+
+	return NULL;
+}
+
+int infix_set_boot_order(kcontext_t *ctx)
+{
+	char tmpfile[] = "/tmp/boot-order-XXXXXX";
+	kpargv_t *pargv = kcontext_pargv(ctx);
+	const char *targets[3];
+	int fd, rc = 0;
+	FILE *fp;
+
+	targets[0] = valid_boot_target(kpargv_find(pargv, "first"));
+	targets[1] = valid_boot_target(kpargv_find(pargv, "second"));
+	targets[2] = valid_boot_target(kpargv_find(pargv, "third"));
+
+	if (!targets[0]) {
+		fprintf(stderr, ERRMSG "missing boot target\n");
+		return -1;
+	}
+
+	fd = mkstemp(tmpfile);
+	if (fd == -1)
+		goto fail;
+
+	fp = fdopen(fd, "w");
+	if (!fp) {
+		close(fd);
+		unlink(tmpfile);
+	fail:
+		fprintf(stderr, ERRMSG "failed creating temporary file\n");
+		return -1;
+	}
+
+	fputs("{\"infix-system:set-boot-order\":{\"boot-order\":[", fp);
+	for (size_t i = 0; i < NELEMS(targets); i++) {
+		if (!targets[i])
+			continue;
+
+		fprintf(fp, "%s\"%s\"", i > 0 ? "," : "", targets[i]);
+	}
+	fputs("]}}", fp);
+
+	fclose(fp);
+
+	rc = systemf("sysrepocfg -R %s -fjson 2>&1", tmpfile);
+	unlink(tmpfile);
+
+	return rc;
+}
+
 int kplugin_infix_fini(kcontext_t *ctx)
 {
 	(void)ctx;
@@ -274,6 +357,7 @@ int kplugin_infix_init(kcontext_t *ctx)
 {
 	kplugin_t *plugin = kcontext_plugin(ctx);
 
+	kplugin_add_syms(plugin, ksym_new("boot_targets", infix_boot_targets));
 	kplugin_add_syms(plugin, ksym_new("copy", infix_copy));
 	kplugin_add_syms(plugin, ksym_new("datastore", infix_datastore));
 	kplugin_add_syms(plugin, ksym_new("erase", infix_erase));
@@ -282,6 +366,7 @@ int kplugin_infix_init(kcontext_t *ctx)
 	kplugin_add_syms(plugin, ksym_new("firewall_zones", infix_firewall_zones));
 	kplugin_add_syms(plugin, ksym_new("firewall_policies", infix_firewall_policies));
 	kplugin_add_syms(plugin, ksym_new("firewall_services", infix_firewall_services));
+	kplugin_add_syms(plugin, ksym_new("set_boot_order", infix_set_boot_order));
 	kplugin_add_syms(plugin, ksym_new("shell", infix_shell));
 
 	return 0;

src/klish-plugin-infix/xml/infix.xml

@@ -134,6 +134,13 @@
   <ACTION sym="STRING"/>
 </PTYPE>
 
+<PTYPE name="BOOT_TARGET">
+  <COMPL>
+    <ACTION sym="boot_targets@infix"/>
+  </COMPL>
+  <ACTION sym="STRING"/>
+</PTYPE>
+
 <VIEW name="main">
   <HOTKEY key="^D" cmd="exit"/>
 
@@ -243,6 +250,13 @@
     <PARAM name="current-datetime" ptype="/STRING" help="yyyy-mm-ddThh:mm:ss(Z|+/-hh:mm)"/>
     <ACTION sym="srp_rpc@sysrepo">/ietf-system:set-current-datetime</ACTION>
   </COMMAND>
+
+  <COMMAND name="boot-order" help="Set boot partition order">
+    <PARAM name="first" ptype="/BOOT_TARGET" help="First boot target"/>
+    <PARAM name="second" ptype="/BOOT_TARGET" help="Second boot target" min="0"/>
+    <PARAM name="third" ptype="/BOOT_TARGET" help="Third boot target" min="0"/>
+    <ACTION sym="set_boot_order@infix"/>
+  </COMMAND>
 </COMMAND>
 
 <COMMAND name="dhcp-server" help="DHCP server tools" mode="switch">
@@ -353,6 +367,12 @@
     </ACTION>
   </COMMAND>
 
+  <COMMAND name="boot-order" help="Show boot partition order">
+    <ACTION sym="script">
+      show boot-order
+    </ACTION>
+  </COMMAND>
+
   <COMMAND name="system" help="Show system overview">
     <ACTION sym="script" in="tty" out="tty" interrupt="true">
       show system |pager

src/show/show.py

@@ -142,6 +142,19 @@ def software(args: List[str]) -> None:
     else:
         print("Too many arguments provided. Only one name is expected.")
 
+def boot_order(args: List[str]) -> None:
+    data = run_sysrepocfg("/ietf-system:system-state/infix-system:software")
+    if not data:
+        print("No software data retrieved.")
+        return
+
+    try:
+        boot_order_list = data.get("ietf-system:system-state", {}).get("infix-system:software", {}).get("boot-order", [])
+        if boot_order_list:
+            print(" ".join(boot_order_list))
+    except (KeyError, TypeError):
+        print("No boot order data available.")
+
 def services(args: List[str]) -> None:
     data = run_sysrepocfg("/ietf-system:system-state/infix-system:services")
     if not data:
@@ -425,6 +438,7 @@ def human_readable(kib_val):
 def execute_command(command: str, args: List[str]):
     command_mapping = {
         'bfd': bfd,
+        'boot-order': boot_order,
         'dhcp': dhcp,
         'hardware': hardware,
         'interface': interface,