From: Daan De Meyer Date: Thu, 5 Jun 2025 13:02:57 +0000 (+0200) Subject: test: Make sure lvm doesn't try to modify /etc X-Git-Tag: v26~197^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82341ae8bb31c00faa8423984f296219d2f1b2f0;p=thirdparty%2Fmkosi.git test: Make sure lvm doesn't try to modify /etc --- diff --git a/tests/test_initrd.py b/tests/test_initrd.py index 843fa8638..6d80abb7e 100644 --- a/tests/test_initrd.py +++ b/tests/test_initrd.py @@ -71,11 +71,11 @@ def test_initrd_lvm(config: ImageConfig) -> None: run(["sfdisk", "--label", "gpt", lodev], input="type=E6D6D379-F507-44C2-A23C-238F2A3DF928 bootable") run(["lvm", "pvcreate", f"{lodev}p1"]) run(["lvm", "pvs"]) - run(["lvm", "vgcreate", "vg_mkosi", f"{lodev}p1"]) + run(["lvm", "vgcreate", "-An", "vg_mkosi", f"{lodev}p1"]) run(["lvm", "vgchange", "-ay", "vg_mkosi"]) run(["lvm", "vgs"]) stack.callback(lambda: run(["vgchange", "-an", "vg_mkosi"])) - run(["lvm", "lvcreate", "-l", "100%FREE", "-n", "lv0", "vg_mkosi"]) + run(["lvm", "lvcreate", "-An", "-l", "100%FREE", "-n", "lv0", "vg_mkosi"]) run(["lvm", "lvs"]) run(["udevadm", "wait", "--timeout=30", "/dev/vg_mkosi/lv0"]) run([f"mkfs.{image.config.distribution.filesystem()}", "-L", "root", "/dev/vg_mkosi/lv0"]) @@ -183,11 +183,11 @@ def test_initrd_luks_lvm(config: ImageConfig, passphrase: Path) -> None: luks_uuid = run(["cryptsetup", "luksUUID", f"{lodev}p1"], stdout=subprocess.PIPE).stdout.strip() run(["lvm", "pvcreate", "/dev/mapper/lvm_root"]) run(["lvm", "pvs"]) - run(["lvm", "vgcreate", "vg_mkosi", "/dev/mapper/lvm_root"]) + run(["lvm", "vgcreate", "-An", "vg_mkosi", "/dev/mapper/lvm_root"]) run(["lvm", "vgchange", "-ay", "vg_mkosi"]) run(["lvm", "vgs"]) stack.callback(lambda: run(["vgchange", "-an", "vg_mkosi"])) - run(["lvm", "lvcreate", "-l", "100%FREE", "-n", "lv0", "vg_mkosi"]) + run(["lvm", "lvcreate", "-An", "-l", "100%FREE", "-n", "lv0", "vg_mkosi"]) run(["lvm", "lvs"]) run(["udevadm", "wait", "--timeout=30", "/dev/vg_mkosi/lv0"]) run([f"mkfs.{image.config.distribution.filesystem()}", "-L", "root", "/dev/vg_mkosi/lv0"])