From 537bfce2bda471c92caabd388589230200891509 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 3 Jul 2026 19:53:18 +0200 Subject: New upstream version 1.58~rc1 --- tools/nm-guest-data/systemd-dhcp-host.service.in | 14 -------------- tools/nm-in-container | 1 - tools/nm-in-vm | 5 +---- tools/test-networkmanager-service.py | 24 +++++++++++++++++++++--- 4 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 tools/nm-guest-data/systemd-dhcp-host.service.in (limited to 'tools') diff --git a/tools/nm-guest-data/systemd-dhcp-host.service.in b/tools/nm-guest-data/systemd-dhcp-host.service.in deleted file mode 100644 index 844e766c..00000000 --- a/tools/nm-guest-data/systemd-dhcp-host.service.in +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=dhclient service to get connectivity with the host -After=network.target - -[Service] -Type=simple -Restart=on-failure -User=root -RestartSec=5 -ExecStart=dhclient -d host_net -ExecStop=dhclient -r host_net - -[Install] -WantedBy=multi-user.target diff --git a/tools/nm-in-container b/tools/nm-in-container index e4ee8b94..359c5e96 100755 --- a/tools/nm-in-container +++ b/tools/nm-in-container @@ -204,7 +204,6 @@ RUN dnf install -y \\ cscope \\ dbus-devel \\ dbus-x11 \\ - dhclient \\ dnsmasq \\ firewalld-filesystem \\ gcc-c++ \\ diff --git a/tools/nm-in-vm b/tools/nm-in-vm index cf42b038..ce72859d 100755 --- a/tools/nm-in-vm +++ b/tools/nm-in-vm @@ -124,7 +124,6 @@ do_build() { "home-gdb_history:/root/.gdb_history" "home-behaverc:/root/.behaverc" "systemd-10-host-net.link:/etc/systemd/network/10-host-net.link" - "systemd-dhcp-host.service:/etc/systemd/system/dhcp-host.service" "systemd-20-nm.override:/etc/systemd/system/NetworkManager.service.d/20-nm.override" ) @@ -286,9 +285,7 @@ do_build() { --edit "/etc/systemd/journald.conf:s/.*RateLimitBurst=.*/RateLimitBurst=0/" \ --delete "/etc/NetworkManager/system-connections/*" \ --append-line "/etc/bashrc:. /etc/bashrc.my" \ - --run-command "updatedb" \ - --append-line "/etc/dhcp/dhclient.conf:send host-name = gethostname();" \ - --firstboot-command "systemctl enable --now dhcp-host" + --run-command "updatedb" virt-install \ --name "$VM" \ diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index 0a13f2bd..b6308b3d 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -1046,6 +1046,18 @@ class Device(ExportedObj): PRP_DEVICE_DHCP6_CONFIG, ExportedObj.to_path(self.dhcp6_config), ) + if Util.random_int(self.path, 100) > 80: + self.ip4_config._dbus_property_set( + IFACE_IP4_CONFIG, PRP_IP4_CONFIG_CLAT_ADDRESS, "192.0.0.1" + ) + self.ip6_config._dbus_property_set( + IFACE_IP6_CONFIG, + PRP_IP6_CONFIG_CLAT_ADDRESS, + "2002:aaaa::2c0d:1e71:ef87:fac7", + ) + self.ip6_config._dbus_property_set( + IFACE_IP6_CONFIG, PRP_IP6_CONFIG_CLAT_PREF64, "64:ff9b::/96" + ) def stop(self): self._dbus_property_set( @@ -2069,10 +2081,10 @@ class NetworkManager(ExportedObj): d = self.find_device_first(path=path, require=TestError) self.remove_device(d) - @dbus.service.method(IFACE_TEST, in_signature="sss", out_signature="o") - def AddWifiAp(self, ident, ssid, bssid): + @dbus.service.method(IFACE_TEST, in_signature="sssu", out_signature="o") + def AddWifiAp(self, ident, ssid, bssid, freq): d = self.find_device_first(ident=ident, require=TestError) - ap = WifiAp(ssid, bssid) + ap = WifiAp(ssid, bssid=bssid, freq=freq) return ExportedObj.to_path(d.add_ap(ap)) @dbus.service.method(IFACE_TEST, in_signature="so", out_signature="") @@ -2446,6 +2458,7 @@ PRP_IP4_CONFIG_SEARCHES = "Searches" PRP_IP4_CONFIG_DNSOPTIONS = "DnsOptions" PRP_IP4_CONFIG_DNSPRIORITY = "DnsPriority" PRP_IP4_CONFIG_WINSSERVERS = "WinsServers" +PRP_IP4_CONFIG_CLAT_ADDRESS = "ClatAddress" class IP4Config(ExportedObj): @@ -2624,6 +2637,7 @@ class IP4Config(ExportedObj): PRP_IP4_CONFIG_WINSSERVERS: dbus.Array( [dbus.UInt32(Util.ip4_addr_be32(n)) for n in winsservers], "u" ), + PRP_IP4_CONFIG_CLAT_ADDRESS: dbus.String(""), } def props_regenerate(self, generate_seed): @@ -2648,6 +2662,8 @@ PRP_IP6_CONFIG_DOMAINS = "Domains" PRP_IP6_CONFIG_SEARCHES = "Searches" PRP_IP6_CONFIG_DNSOPTIONS = "DnsOptions" PRP_IP6_CONFIG_DNSPRIORITY = "DnsPriority" +PRP_IP6_CONFIG_CLAT_ADDRESS = "ClatAddress" +PRP_IP6_CONFIG_CLAT_PREF64 = "ClatPref64" class IP6Config(ExportedObj): @@ -2814,6 +2830,8 @@ class IP6Config(ExportedObj): PRP_IP6_CONFIG_SEARCHES: dbus.Array(searches, "s"), PRP_IP6_CONFIG_DNSOPTIONS: dbus.Array(dnsoptions, "s"), PRP_IP6_CONFIG_DNSPRIORITY: dbus.Int32(dnspriority), + PRP_IP6_CONFIG_CLAT_ADDRESS: dbus.String(""), + PRP_IP6_CONFIG_CLAT_PREF64: dbus.String(""), } def props_regenerate(self, generate_seed): -- cgit 1.3.0-6-gf8a5