Skip to content

Commit 84a9626

Browse files
citrus-itcitrus-it
authored
Merge pull request #521 from citrus-it/pymod
Add --with-be to allow using pkg pieces from alternative BE
2 parents ea56344 + e62f5ea commit 84a9626

File tree

7 files changed

+170
-107
lines changed

7 files changed

+170
-107
lines changed

‎src/client.py‎

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,59 @@
4444
# PKG_SUCCESS_ON_NOP - when an operation completes with nothing to do, exit with
4545
# the success code (0) instead of the NOP one (4).
4646

47+
# Support re-execing using pieces from an alternate mounted boot environment to
48+
# aid recovery.
49+
#
50+
# For example:
51+
#
52+
# beadm mount 20250902
53+
# Mounted successfully on: '/tmp/tmp.miaO0W'
54+
# pkg --with-be /tmp/tmp.miaO0W update
55+
#
56+
# Deliberately use minimal dependencies as we may be in a somewhat broken
57+
# python environment. We hope at least that these core modules are intact.
58+
import os, sys, sysconfig
59+
60+
61+
def altbe():
62+
argv = sys.argv[1:]
63+
64+
be = None
65+
rest = None
66+
67+
if argv:
68+
if argv[0] == "--with-be" and len(argv) >= 2:
69+
be = argv[1]
70+
rest = argv[2:]
71+
elif argv[0].startswith("--with-be="):
72+
be = argv[0].split("=", 1)[1]
73+
rest = argv[1:]
74+
75+
if be is None:
76+
return
77+
78+
exe = sysconfig.get_config_var("EXENAME")
79+
pyver = sysconfig.get_config_var("py_version_short")
80+
libdir = sysconfig.get_config_var("LIBDIR")
81+
destlib = sysconfig.get_config_var("DESTLIB")
82+
pkglib = f"/usr/lib/pkg/python{pyver}"
83+
84+
env = os.environ.copy()
85+
env["LD_LIBRARY_PATH"] = f"{be}{libdir}"
86+
env["PYTHONPATH"] = f"{be}{pkglib}"
87+
env["PYTHONPATH"] += f":{be}{destlib}/vendor-packages"
88+
89+
try:
90+
os.execvpe(
91+
f"{be}/{exe}", [exe, f"{be}/usr/bin/pkg"] + (rest or []), env
92+
)
93+
except OSError as e:
94+
sys.stderr.write(f"error: failed to exec alt be pkg from '{be}': {e}\n")
95+
sys.exit(127)
96+
97+
98+
altbe()
99+
47100
try:
48101
import pkg.site_paths
49102
except ImportError:
@@ -72,10 +125,8 @@
72125
import itertools
73126
import locale
74127
import logging
75-
import os
76128
import re
77129
import socket
78-
import sys
79130
import tempfile
80131
import textwrap
81132
import time

‎src/man/pkg.1‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
22
.\" Copyright 2024 Oxide Computer Company
33
.\" Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
4-
.Dd June 25, 2025
4+
.Dd September 8, 2025
55
.Dt PKG 1
66
.Os
77
.Sh NAME
@@ -650,6 +650,12 @@ is
650650
See the
651651
.Sx Environment Variables
652652
section for more information.
653+
.It Fl \&-with-be Ar path
654+
Run using python components from a boot environment mounted at
655+
.Ar path .
656+
This is useful to recover from a situation where
657+
.Nm
658+
does not run due to a problem with python modules.
653659
.El
654660
.\"
655661
.Sh SUB-COMMANDS
@@ -4297,6 +4303,12 @@ and display verbose result.
42974303
.Bd -literal
42984304
$ pkg verify -v -p /usr/bin/ls
42994305
.Ed
4306+
.It Sy Example 38 No Update using python pieces in a different BE
4307+
.Pp
4308+
.Bd -literal
4309+
$ beadm mount <old be> /be
4310+
$ pkg --with-be /be update
4311+
.Ed
43004312
.El
43014313
.Sh ENVIRONMENT VARIABLES
43024314
.Bl -tag -width Ds

‎src/requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
#
22
# This file was automatically produced by tools/updatereqs
3-
# Generated on Mon Aug 11 20:36:20 UTC 2025
3+
# Generated on Mon Sep 8 14:24:53 UTC 2025
44
# Do not edit directly
55
#
66
autocommand==2.2.2
77
cheroot==10.0.1
88
CherryPy==18.10.0
99
jaraco.collections==5.2.1
1010
jaraco.context==6.0.1
11-
jaraco.functools==4.2.1
11+
jaraco.functools==4.3.0
1212
jaraco.text==4.0.0
1313
Mako==1.3.10
1414
MarkupSafe==3.0.2
15-
more-itertools==10.7.0
15+
more-itertools==10.8.0
1616
ply==3.11
1717
portend==3.2.1
1818
prettytable==3.16.0

‎src/tests/ro_data/signing_certs/produced/code_signing_certs/cust_cert.pem‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
-----BEGIN CERTIFICATE-----
2-
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
3131
-----END CERTIFICATE-----

‎src/tests/ro_data/signing_certs/produced/keys/cust_key.pem‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
-----BEGIN PRIVATE KEY-----
2-
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
51-
zFg3dV8BCPE32txOujeT3NgLO/Cd4Q==
2+
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
51+
f2ITcfl8GIp26Qj1f3xdhkRSjjFDghE=
5252
-----END PRIVATE KEY-----

‎src/tests/ro_data/signing_certs/produced/trust_anchors/cust_cert.pem‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
-----BEGIN CERTIFICATE-----
2-
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
3131
-----END CERTIFICATE-----

‎src/util/mkcert/mkcert.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ main(int argc __unused, char **argv __unused)
8080
}
8181

8282
X509_set_version(cert, 2);
83-
ASN1_INTEGER_set(X509_get_serialNumber(cert), 0);
83+
ASN1_INTEGER_set(X509_get_serialNumber(cert), 1);
8484
X509_gmtime_adj(X509_get_notBefore(cert), 0);
8585
X509_gmtime_adj(X509_get_notAfter(cert), (long)60*60*24*365);
8686
X509_set_pubkey(cert, pkey);

0 commit comments

Comments
 (0)