diff --git a/ansible-kvm-vms/roles/os_config/templates/microos_ignition.bu.j2 b/ansible-kvm-vms/roles/os_config/templates/microos_ignition.bu.j2 index 938fde2..48688c9 100644 --- a/ansible-kvm-vms/roles/os_config/templates/microos_ignition.bu.j2 +++ b/ansible-kvm-vms/roles/os_config/templates/microos_ignition.bu.j2 @@ -7,17 +7,6 @@ passwd: ssh_authorized_keys: - "{{ lookup('file', vm_ssh_public_key) | trim }}" storage: - disks: - - device: /dev/vdb - wipe_table: true - partitions: - - label: ext-data - number: 1 - filesystems: - - device: /dev/vdb1 - format: btrfs - label: ext-pool - wipe_filesystem: true files: - path: /etc/ssh/sshd_config.d/permit_root_login.conf mode: 0644 @@ -36,12 +25,12 @@ systemd: [Service] Type=oneshot - ExecStartPre=/usr/bin/mkdir -p /run/mnt-ext-init - ExecStartPre=/usr/bin/mount LABEL=ext-pool /run/mnt-ext-init + ExecStartPre=/usr/bin/mkdir -p /run/mnt-root-init + ExecStartPre=/usr/bin/mount -o subvolid=5 /dev/disk/by-label/ROOT /run/mnt-root-init # Hier werden die Subvolumes @home angelegt, falls sie nicht existieren - ExecStart=/usr/bin/bash -c "for sub in @home; do [ -d /run/mnt-ext-init/\$$sub ] || /usr/sbin/btrfs subvolume create /run/mnt-ext-init/$$sub; done" - ExecStartPost=/usr/bin/umount /run/mnt-ext-init - ExecStartPost=/usr/bin/rmdir /run/mnt-ext-init + ExecStart=/usr/bin/bash -c "for sub in @home; do [ -d /run/mnt-root-init/\$$sub ] || /usr/sbin/btrfs subvolume create /run/mnt-root-init/$$sub; done" + ExecStartPost=/usr/bin/umount /run/mnt-root-init + ExecStartPost=/usr/bin/rmdir /run/mnt-root-init RemainAfterExit=true [Install] @@ -55,7 +44,7 @@ systemd: Before=local-fs.target [Mount] - What=LABEL=ext-pool + What=/dev/disk/by-label/ROOT Where=/home Type=btrfs Options=defaults,subvol=@home