summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Magnusson <mikma@users.sourceforge.net>2024-01-13 02:48:17 +0100
committerMikael Magnusson <mikma@users.sourceforge.net>2024-01-13 02:48:17 +0100
commit28e0c7f0cb1e37d3762e219ac927b677d4e0def8 (patch)
treea7ef60b9aa31efaaf0ba12399be29de1dd27648a
parentda526690c40d668720035dd916f0c982d2d9bd2d (diff)
upgrade: remove procd-jailHEADmaster
It can't be used on LXD instances.
-rw-r--r--scripts/upgrade.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/upgrade.py b/scripts/upgrade.py
index 088647c..012f10f 100644
--- a/scripts/upgrade.py
+++ b/scripts/upgrade.py
@@ -176,6 +176,8 @@ def main(argv):
print("Start", new_name)
new.start(wait=True)
+ # Can't use ujail on LXD instances
+ new.opkg_remove(['procd-ujail'])
print("Ping downloads.openwrt.org")
new.ping('downloads.openwrt.org')
@@ -191,6 +193,7 @@ def main(argv):
del_set = orig_set.difference(old_set)
add_set = old_set.difference(orig_set)
del_packages = list(del_set)
+ del_packages.append('procd-ujail')
add_packages = list(add_set.difference(['iw']))
if len(del_packages) > 0: