containers/ws: Eliminate /container/target-namespace link

We can just do this directly in label-run.
realk1ko · Jun 27, 2022 · d5f549a · d5f549a
1 parent 0b06e80
commit d5f549a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/containers/ws/install.sh b/containers/ws/install.sh
@@ -38,5 +38,4 @@ fi
 rm -rf /container/rpms || true
 
 # And the stuff that starts the container
-ln -s /host/proc/1 /container/target-namespace
 chmod -v +x /container/label-install /container/label-uninstall /container/label-run
diff --git a/containers/ws/label-run b/containers/ws/label-run
@@ -25,7 +25,8 @@ if [ -d /host ]; then
     fi
 
     # And run cockpit-ws
-    exec /usr/bin/nsenter --net=/container/target-namespace/ns/net --uts=/container/target-namespace/ns/uts -- /usr/libexec/cockpit-ws --local-ssh "$@"
+    TARGET_NS=/host/proc/1/ns
+    exec /usr/bin/nsenter --net=$TARGET_NS/net --uts=$TARGET_NS/uts -- /usr/libexec/cockpit-ws --local-ssh "$@"
 else
     # unprivileged mode