proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 11:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13360 from LabNConsulting/chopps/munet-fixes

Browse Source
This commit is contained in:
Donald Sharp 2023-04-23 07:18:07 -04:00 committed by GitHub
commit 51108db198
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/topotests/munet/base.py
View File

@ -1976,9 +1976,9 @@ class LinuxNamespace(Commander, InterfaceMixin):
if unet and unet.nsenter_fork: if unet and unet.nsenter_fork:
assert not unet.unshare_inline assert not unet.unshare_inline
# Need child pid of p.pid # Need child pid of p.pid
pgrep = roothost.get_exec_path("pgrep") pgrep = unet.rootcmd.get_exec_path("pgrep")
# a sing fork was done # a sing fork was done
child_pid = roothost.cmd_raises([pgrep, "-o", "-P", str(p.pid)]) child_pid = unet.rootcmd.cmd_raises([pgrep, "-o", "-P", str(p.pid)])
self.pid = int(child_pid.strip()) self.pid = int(child_pid.strip())
self.logger.debug("%s: child of namespace process: %s", self, pid) self.logger.debug("%s: child of namespace process: %s", self, pid)
@ -2172,10 +2172,9 @@ class LinuxNamespace(Commander, InterfaceMixin):
# this will fail if running inside the namespace with PID # this will fail if running inside the namespace with PID
if pid: if pid:
o = self.cmd_status_nsonly("ls -l /proc/1/ns") o = self.cmd_nostatus_nsonly("ls -l /proc/1/ns")
else: else:
o = self.cmd_nostatus_nsonly(cmd=shlex.split("/usr/bin/ls -l /proc/self")) o = self.cmd_nostatus_nsonly("ls -l /proc/self/ns")
o = self.cmd_nostatus_nsonly(cmd=shlex.split("ls -l /proc/self/ns"))
self.logger.debug("namespaces:\n %s", o) self.logger.debug("namespaces:\n %s", o)
@ -2536,10 +2535,21 @@ class BaseMunet(LinuxNamespace):
if not self.isolated: if not self.isolated:
self.rootcmd = commander self.rootcmd = commander
elif not pid:
nsflags = (
f"--mount={self.proc_path / '1/ns/mnt'}",
f"--net={self.proc_path / '1/ns/net'}",
f"--uts={self.proc_path / '1/ns/uts'}",
# f"--ipc={self.proc_path / '1/ns/ipc'}",
# f"--time={self.proc_path / '1/ns/time'}",
# f"--cgroup={self.proc_path / '1/ns/cgroup'}",
)
self.rootcmd = SharedNamespace("root", pid=1, nsflags=nsflags)
else: else:
# XXX user # XXX user
nsflags = ( nsflags = (
f"--pid={self.proc_path / '1/ns/pid_for_children'}", # XXX Backing up PID namespace just doesn't work.
# f"--pid={self.proc_path / '1/ns/pid_for_children'}",
f"--mount={self.proc_path / '1/ns/mnt'}", f"--mount={self.proc_path / '1/ns/mnt'}",
f"--net={self.proc_path / '1/ns/net'}", f"--net={self.proc_path / '1/ns/net'}",
f"--uts={self.proc_path / '1/ns/uts'}", f"--uts={self.proc_path / '1/ns/uts'}",