feat: enhance guest network configuration and recovery process for UVM

tests/test_install.py

@@ -158,6 +158,7 @@ class InstallerArchitectureTests(unittest.TestCase):
         for verified, marker, force in (
             (True, _ROOTFS_RECIPE, False), (False, _ROOTFS_RECIPE, False),
             (True, "", False), (True, "uvm-ubuntu-jammy-v1\n", False), (True, _ROOTFS_RECIPE, True),
+            (True, "uvm-ubuntu-jammy-v2\n", False),
         ):
             with self.subTest(verified=verified, marker=marker, force=force), tempfile.TemporaryDirectory() as temporary:
                 settings = Settings(base=Path(temporary))
@@ -335,7 +336,7 @@ class UbuntuRootfsBuildTests(unittest.TestCase):
                 self.assertRegex(guest("stat /usr/bin/sudo").stdout, r"Mode:\s+0?4755")
                 self.assertEqual(guest("cat /etc/uvm-image").stdout, _ROOTFS_RECIPE)
                 self.assertIn("nameserver 1.1.1.1", guest("cat /etc/resolv.conf").stdout)
-                self.assertIn("KeepConfiguration=static", guest("cat /etc/systemd/network/10-uvm.network").stdout)
+                self.assertIn("KeepConfiguration=yes", guest("cat /etc/systemd/network/10-uvm.network").stdout)
                 self.assertIn("jammy-security main universe", guest("cat /etc/apt/sources.list").stdout)
                 for path in ("/usr/sbin/policy-rc.d", "/etc/ssh/ssh_host_rsa_key"):
                     self.assertIn("File not found", guest(f"stat {path}").stderr)