From 3199911ab78c9613285887f9d6d050ea6b7e6466 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Sat, 19 Apr 2025 17:13:04 +0200 Subject: [PATCH 1/2] Add new network configuration --- host_vars/xps/network.yml | 5 +++++ tasks/network.yml | 5 +++++ .../personal/xps/network/wlan0-frans.network.j2 | 16 ++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 templates/personal/xps/network/wlan0-frans.network.j2 diff --git a/host_vars/xps/network.yml b/host_vars/xps/network.yml index ecddca8..dbfa8ae 100644 --- a/host_vars/xps/network.yml +++ b/host_vars/xps/network.yml @@ -6,4 +6,9 @@ local_network_address: 192.168.2.9/24 local_network_dns: 192.168.2.254 local_network_gateway: 192.168.2.254 +frans_network_ssid: KPNDD1056 +frans_network_address: 192.168.2.9/24 +frans_network_dns: 192.168.2.254 +frans_network_gateway: 192.168.2.254 + hostname: xps diff --git a/tasks/network.yml b/tasks/network.yml index fa4a975..1c44670 100644 --- a/tasks/network.yml +++ b/tasks/network.yml @@ -78,8 +78,13 @@ loop: - src: 'templates/personal/xps/network/wlan0.link.j2' dest: '/etc/systemd/network/10-wlan0.link' + - src: 'templates/personal/xps/network/wlan0-local.network.j2' dest: '/etc/systemd/network/10-wireless.network' + + - src: 'templates/personal/xps/network/wlan0-frans.network.j2' + dest: '/etc/systemd/network/11-wireless.network' + - src: 'templates/personal/xps/network/wlan0.network.j2' dest: '/etc/systemd/network/20-wireless.network' diff --git a/templates/personal/xps/network/wlan0-frans.network.j2 b/templates/personal/xps/network/wlan0-frans.network.j2 new file mode 100644 index 0000000..fb19ae3 --- /dev/null +++ b/templates/personal/xps/network/wlan0-frans.network.j2 @@ -0,0 +1,16 @@ +# {{ ansible_managed }} + +[Match] +MACAddress={{ wireless_interface_mac }} +SSID={{ frans_network_ssid }} + +[Network] +Address={{ frans_network_address }} +DNS={{ frans_network_dns }} +Gateway={{ frans_network_gateway }} +DHCP=no +MulticastDNS=yes +LinkLocalAddressing=no +IPv6AcceptRA=no +IPv6SendRA=no +RequiredForOnline=routable From da68e6adc975437415e1de2a503c758b7f991d2a Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Sat, 19 Apr 2025 19:39:51 +0200 Subject: [PATCH 2/2] Use sd-encrypt hook to unlock encrypted partition --- templates/personal/xps/cmdline.j2 | 2 +- templates/personal/xps/mkinitcpio/2-hooks.conf.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/personal/xps/cmdline.j2 b/templates/personal/xps/cmdline.j2 index a2aab0b..90371ba 100644 --- a/templates/personal/xps/cmdline.j2 +++ b/templates/personal/xps/cmdline.j2 @@ -1 +1 @@ -cryptdevice=UUID=4483183a-4881-4bf6-b20c-3ba918642cc4:cryptlvm root=/dev/VolumeGroup/root rw resume=/dev/VolumeGroup/swap pcie_aspm=nommconf i915.fastboot=1 enable_fbc=1 enable_psr=1 disable_power_well=0 acpi_rev_override=1 bgrt_disable +rd.luks.name=4483183a-4881-4bf6-b20c-3ba918642cc4=cryptlvm root=/dev/VolumeGroup/root rw resume=/dev/VolumeGroup/swap pcie_aspm=nommconf acpi_rev_override=1 bgrt_disable diff --git a/templates/personal/xps/mkinitcpio/2-hooks.conf.j2 b/templates/personal/xps/mkinitcpio/2-hooks.conf.j2 index ab81af5..c3b6807 100644 --- a/templates/personal/xps/mkinitcpio/2-hooks.conf.j2 +++ b/templates/personal/xps/mkinitcpio/2-hooks.conf.j2 @@ -1,3 +1,3 @@ # {{ ansible_managed }} -HOOKS=(base udev autodetect microcode modconf kms keyboard keymap consolefont block encrypt lvm2 resume filesystems fsck) +HOOKS=(base systemd autodetect microcode modconf kms keyboard sd-vconsole block sd-encrypt lvm2 resume filesystems fsck)