Adding upstream version 4.23.0.upstream/4.23.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 51 insertions, 7 deletions

diff --git a/upstream/debian-unstable/man5/org.freedesktop.machine1.5 b/upstream/debian-unstable/man5/org.freedesktop.machine1.5
index a63a4960..3b35991c 100644
--- a/upstream/debian-unstable/man5/org.freedesktop.machine1.5
+++ b/upstream/debian-unstable/man5/org.freedesktop.machine1.5
@@ -1,5 +1,5 @@
 '\" t
-.TH "ORG\&.FREEDESKTOP\&.MACHINE1" "5" "" "systemd 255" "org.freedesktop.machine1"
+.TH "ORG\&.FREEDESKTOP\&.MACHINE1" "5" "" "systemd 256~rc3" "org.freedesktop.machine1"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -87,6 +87,9 @@ node /org/freedesktop/machine1 {
                   in  i signal);
       GetMachineAddresses(in  s name,
                           out a(iay) addresses);
+      GetMachineSSHInfo(in  s name,
+                        out s ssh_address,
+                        out s ssh_private_key_path);
       GetMachineOSRelease(in  s name,
                           out a{ss} fields);
       @org\&.freedesktop\&.systemd1\&.Privileged("true")
@@ -228,6 +231,7 @@ node /org/freedesktop/machine1 {
 
 
 
+
 .SS "Methods"
 .PP
 \fBGetMachine()\fR
@@ -300,6 +304,9 @@ retrieves the IP addresses of a container\&. This method returns an array of pai
 or
 \fBAF_INET6\fR) and a byte array containing the addresses\&. This is only supported for containers that make use of network namespacing\&.
 .PP
+\fBGetMachineSSHInfo()\fR
+retrieves the SSH information of a machine\&. This method returns two strings, the SSH address which can be used to tell SSH where to connect, and the path to the SSH private key required for the connection to succeed\&.
+.PP
 \fBGetMachineOSRelease()\fR
 retrieves the OS release information of a container\&. This method returns an array of key value pairs read from the
 \fBos-release\fR(5)
@@ -324,7 +331,7 @@ copies files or directories from a container into the host\&. It takes a contain
 does the opposite and copies files from a source directory on the host into a destination directory in the container\&.
 \fBCopyFromMachineWithFlags()\fR
 and
-\fBCopyToMachineWithFlags\fR
+\fBCopyToMachineWithFlags()\fR
 do the same but take an additional flags argument\&.
 .PP
 \fBRemoveImage()\fR
@@ -352,9 +359,9 @@ sets a per\-image quota limit\&.
 may be used to map UIDs/GIDs from the host user namespace to a container user namespace or vice versa\&.
 .SS "Signals"
 .PP
-\fBMachineNew\fR
+\fBMachineNew()\fR
 and
-\fBMachineRemoved\fR
+\fBMachineRemoved()\fR
 are sent whenever a new machine is registered or removed\&. These signals carry the machine name and the object path to the corresponding
 org\&.freedesktop\&.machine1\&.Machine
 interface (see below)\&.
@@ -381,6 +388,8 @@ node /org/freedesktop/machine1/machine/rawhide {
       Kill(in  s who,
            in  i signal);
       GetAddresses(out a(iay) addresses);
+      GetSSHInfo(out s ssh_address,
+                 out s ssh_private_key_path);
       GetOSRelease(out a{ss} fields);
       GetUIDShift(out u shift);
       OpenPTY(out h pty,
@@ -429,6 +438,12 @@ node /org/freedesktop/machine1/machine/rawhide {
       readonly s RootDirectory = \*(Aq\&.\&.\&.\*(Aq;
       @org\&.freedesktop\&.DBus\&.Property\&.EmitsChangedSignal("const")
       readonly ai NetworkInterfaces = [\&.\&.\&.];
+      @org\&.freedesktop\&.DBus\&.Property\&.EmitsChangedSignal("const")
+      readonly u VSockCID = \&.\&.\&.;
+      @org\&.freedesktop\&.DBus\&.Property\&.EmitsChangedSignal("const")
+      readonly s SSHAddress = \*(Aq\&.\&.\&.\*(Aq;
+      @org\&.freedesktop\&.DBus\&.Property\&.EmitsChangedSignal("const")
+      readonly s SSHPrivateKeyPath = \*(Aq\&.\&.\&.\*(Aq;
       @org\&.freedesktop\&.DBus\&.Property\&.EmitsChangedSignal("false")
       readonly s State = \*(Aq\&.\&.\&.\*(Aq;
   };
@@ -467,6 +482,10 @@ node /org/freedesktop/machine1/machine/rawhide {
 
 
 
+
+
+
+
 .SS "Methods"
 .PP
 \fBTerminate()\fR
@@ -478,11 +497,13 @@ and
 \fBKillMachine()\fR
 on the Manager interface, respectively\&.
 .PP
-\fBGetAddresses()\fR
+\fBGetAddresses()\fR,
+\fBGetSSHInfo()\fR
 and
 \fBGetOSRelease()\fR
-get the IP address and OS release information from the machine\&. These methods take the same arguments as
-\fBGetMachineAddresses()\fR
+get the IP address, SSH connection and OS release information from the machine\&. These methods take the same arguments as
+\fBGetMachineAddresses()\fR,
+\fBGetMachineSSHInfo()\fR
 and
 \fBGetMachineOSRelease()\fR
 of the Manager interface, respectively\&.
@@ -521,6 +542,19 @@ contains an array of network interface indices that point towards the container,
 \fBCreateMachineWithNetwork()\fR
 above\&.
 .PP
+\fIVSockCID\fR
+is the VSOCK CID of the VM if it is known, or
+\fBVMADDR_CID_ANY\fR
+otherwise\&.
+.PP
+\fISSHAddress\fR
+is the address of the VM in a format
+\fBssh\fR
+can understand if it is known or the empty string\&.
+.PP
+\fISSHPrivateKeyPath\fR
+is the path to the SSH private key of the VM if it is known or the empty string\&.
+.PP
 \fIState\fR
 is the state of the machine and is one of
 "opening",
@@ -568,12 +602,22 @@ These D\-Bus interfaces follow
 and
 \fBCopyToMachineWithFlags()\fR
 were added in version 252\&.
+.PP
+\fBGetMachineSSHInfo()\fR
+was added in version 256\&.
 .SS "Machine Objects"
 .PP
 \fBCopyFromWithFlags()\fR
 and
 \fBCopyToWithFlags()\fR
 were added in version 252\&.
+.PP
+\fBGetSSHInfo()\fR,
+\fIVSockCID\fR,
+\fISSHAddress\fR
+and
+\fISSHPrivateKeyPath\fR
+were added in version 256\&.
 .SH "NOTES"
 .IP " 1." 4
 New Control Group Interfaces