omniosorg · citrus-it · Sep 18, 2025 · Sep 8, 2025 · Sep 8, 2025 · Sep 8, 2025
@@ -44,6 +44,59 @@
 # PKG_SUCCESS_ON_NOP - when an operation completes with nothing to do, exit with
 #                      the success code (0) instead of the NOP one (4).
 
+# Support re-execing using pieces from an alternate mounted boot environment to
+# aid recovery.
+#
+# For example:
+#
+# beadm mount 20250902
+# Mounted successfully on: '/tmp/tmp.miaO0W'
+# pkg --with-be /tmp/tmp.miaO0W update
+#
+# Deliberately use minimal dependencies as we may be in a somewhat broken
+# python environment. We hope at least that these core modules are intact.
+import os, sys, sysconfig
+
+
+def altbe():
+    argv = sys.argv[1:]
+
+    be = None
+    rest = None
+
+    if argv:
+        if argv[0] == "--with-be" and len(argv) >= 2:
+            be = argv[1]
+            rest = argv[2:]
+        elif argv[0].startswith("--with-be="):
+            be = argv[0].split("=", 1)[1]
+            rest = argv[1:]
+
+    if be is None:
+        return
+
+    exe = sysconfig.get_config_var("EXENAME")
+    pyver = sysconfig.get_config_var("py_version_short")
+    libdir = sysconfig.get_config_var("LIBDIR")
+    destlib = sysconfig.get_config_var("DESTLIB")
+    pkglib = f"/usr/lib/pkg/python{pyver}"
+
+    env = os.environ.copy()
+    env["LD_LIBRARY_PATH"] = f"{be}{libdir}"
+    env["PYTHONPATH"] = f"{be}{pkglib}"
+    env["PYTHONPATH"] += f":{be}{destlib}/vendor-packages"
+
+    try:
+        os.execvpe(
+            f"{be}/{exe}", [exe, f"{be}/usr/bin/pkg"] + (rest or []), env
+        )
+    except OSError as e:
+        sys.stderr.write(f"error: failed to exec alt be pkg from '{be}': {e}\n")
+    sys.exit(127)
+
+
+altbe()
+
 try:
     import pkg.site_paths
 except ImportError:
@@ -72,10 +125,8 @@
     import itertools
     import locale
     import logging
-    import os
     import re
     import socket
-    import sys
     import tempfile
     import textwrap
     import time

@@ -1,7 +1,7 @@
 .\" Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
 .\" Copyright 2024 Oxide Computer Company
 .\" Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
-.Dd June 25, 2025
+.Dd September 8, 2025
 .Dt PKG 1
 .Os
 .Sh NAME
@@ -650,6 +650,12 @@ is
 See the
 .Sx Environment Variables
 section for more information.
+.It Fl \&-with-be Ar path
+Run using python components from a boot environment mounted at
+.Ar path .
+This is useful to recover from a situation where
+.Nm
+does not run due to a problem with python modules.
 .El
 .\"
 .Sh SUB-COMMANDS
@@ -4297,6 +4303,12 @@ and display verbose result.
 .Bd -literal
     $ pkg verify -v -p /usr/bin/ls
 .Ed
+.It Sy Example 38 No Update using python pieces in a different BE
+.Pp
+.Bd -literal
+    $ beadm mount <old be> /be
+    $ pkg --with-be /be update
+.Ed
 .El
 .Sh ENVIRONMENT VARIABLES
 .Bl -tag -width Ds

@@ -1,18 +1,18 @@
 #
 # This file was automatically produced by tools/updatereqs
-# Generated on Mon Aug 11 20:36:20 UTC 2025
+# Generated on Mon Sep  8 14:24:53 UTC 2025
 # Do not edit directly
 #
 autocommand==2.2.2
 cheroot==10.0.1
 CherryPy==18.10.0
 jaraco.collections==5.2.1
 jaraco.context==6.0.1
-jaraco.functools==4.2.1
+jaraco.functools==4.3.0
 jaraco.text==4.0.0
 Mako==1.3.10
 MarkupSafe==3.0.2
-more-itertools==10.7.0
+more-itertools==10.8.0
 ply==3.11
 portend==3.2.1
 prettytable==3.16.0

@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-zFg3dV8BCPE32txOujeT3NgLO/Cd4Q==
+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
+f2ITcfl8GIp26Qj1f3xdhkRSjjFDghE=
 -----END PRIVATE KEY-----
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-AQCqyPw8K+UdDAB672/rIM3mriokvIb1wAIKzcV6Bq9WDzSu/sMKh3t/NYCDZArE
-xIasuVxfSLyWso4TysaWjlfyjWqURS/uKY8jK9OFPhHrTKdSjbDDdDN+Kss1rTMQ
-LDpK10TzneAUBO0oVUqqsJgkVaLMJOJEcRyXda2DetJmPV/0OtZgsOglSoRlNILo
-7EbQAvM//FACWZOuNfhY6TomuCBjUhAvKx4MxhzqEylizQJrksfXiALcBBJf7OXm
-DKmoG/o3KWU2Q11rFo1T7NAw0bPiO0rJJf9D6eMyWLLAxpBiYDuD1KgvqPb/PeDd
-0pNarHlL8zqboRmvha7sdTeNB69CRAym61s5NCHnJ28K16+8GoYwhHTj36D9U/3h
-hEgRpVpc285BsiXQuMc8e6tXJc+STDnZwZwyEvMCNDAJaALvUatwO+1HGDMkKssn
-Tz7/kag7Usn6VaFqiBmwpGHT5rYUMVFz5n518ikLzC75Z+e2wyRiXgxQIzze9p30
-72Um51RwgmtPL6fGyfWVZBSxZdOBm6YrKsSloxPHMjNrI9qiiNJEca00P1X0OlDH
-3RJzfvT3xzQAaihYtVP8ScGODUT5mYuFpwk/YBTRPPPy3oneoW8/KQ1jA50c4xNr
-Cw0u+oj30dZXpxTqQDQv4+GuOC+HX7cVDyFoNfYrIeykDwIDAQABoyUwIzAhBgMq
+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
-AQBbTVer4DaLeADDzD1fY6RUVT7s+Y0efSC63fGJ2cVzGwTHz8cmA6UAXefRfW3N
-gq0yM8XCljtzxYL5r7w2JkOOOvt7yTIU7h0D57iYjhQpL2Zk4ntXIJlARpP75ujR
-d+pOuzhzWFoSoiByBgrxAtGWHb6j+LO7hM/I+YOBBS1P71Gu/Khzs34dfkemPQVd
-M952iV6eQEX8dgAF2WOl2ovXNh8l1l7a7KzEslshsz2MKM7TCKkURZtiuRfdV1TN
-UF+qFa29BdSdB01HQBeljsjzVQu3zzLa9s8tlWQ8IvAcZcVIQ5ujCbILvlalbcZZ
-KHHL5aWOe23huPo70VkBloX2Z2FlLGOTotewchELAFbcd5ZLqihAddVygBW/84D/
-iQgxrW8aB1be22fmfMfu2MR5rJtm9yMe/buGJObE4dXSvZCRtvo2t5W4wTcO+HhA
-GhMBfkZ8WZxfst6AgrCOx+wBNYKnltJwydzjfAtX8bxTXQMd9oeba9VCDQXkJGIr
-2hhPImaaiHuXGlCKDk8ldNzau7sMOVLpkmZmlpvEHd21JfHKG1XH43vBY4YYt6D2
-pZVQ4wFd/QqEZUq+9c0z1oyhZIijqIt81z07EEvxMckU8WZ58OqVKThqyAxsITCu
-KbqHOC+t8TS0KWYKL0nCSgmVqnvtWEVxyfQWqzBnGRBJTQ==
+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
 -----END CERTIFICATE-----
@@ -80,7 +80,7 @@ main(int argc __unused, char **argv __unused)
 	}
 
 	X509_set_version(cert, 2);
-	ASN1_INTEGER_set(X509_get_serialNumber(cert), 0);
+	ASN1_INTEGER_set(X509_get_serialNumber(cert), 1);
 	X509_gmtime_adj(X509_get_notBefore(cert), 0);
 	X509_gmtime_adj(X509_get_notAfter(cert), (long)60*60*24*365);
 	X509_set_pubkey(cert, pkey);