pyrox.dev
nixos/lxc/generator: remove sysctl error handling
+24
-3
pkgs/tools/virtualization/distrobuilder/nixos-generator.patch
+24
-3
pkgs/tools/virtualization/distrobuilder/nixos-generator.patch
···
1
1
diff --git a/distrobuilder/lxc.generator b/distrobuilder/lxc.generator
2
-
index 0ad81d1..69dbfe7 100644
2
+
index 0ad81d1..21ddb39 100644
3
3
--- a/distrobuilder/lxc.generator
4
4
+++ b/distrobuilder/lxc.generator
5
5
@@ -25,16 +25,6 @@ is_incus_vm() {
···
73
73
74
74
mkdir -p /run/systemd/system/systemd-udev-trigger.service.d
75
75
cat <<-EOF > /run/systemd/system/systemd-udev-trigger.service.d/zzz-lxc-override.conf
76
-
@@ -145,24 +97,12 @@ EOF
76
+
@@ -132,37 +84,13 @@ ExecStart=-${cmd} trigger --type=devices --action=add
77
+
EOF
77
78
}
78
79
80
+
-# fix_systemd_sysctl overrides the systemd-sysctl.service to use "ExecStart=-" instead of "ExecStart=".
81
+
-fix_systemd_sysctl() {
82
+
- cmd=/usr/lib/systemd/systemd-sysctl
83
+
- ! [ -e "${cmd}" ] && cmd=/lib/systemd/systemd-sysctl
84
+
- mkdir -p /run/systemd/system/systemd-sysctl.service.d
85
+
- cat <<-EOF > /run/systemd/system/systemd-sysctl.service.d/zzz-lxc-override.conf
86
+
-[Service]
87
+
-ExecStart=
88
+
-ExecStart=-${cmd}
89
+
-EOF
90
+
-}
91
+
-
79
92
## Main logic
80
93
-# Nothing to do in Incus VM but deployed in case it is later converted to a container
81
94
-is_incus_vm || is_lxd_vm && exit 0
···
99
112
100
113
# Determine distro name and release
101
114
ID=""
102
-
@@ -222,11 +162,6 @@ ACTION=="add|change|move", ENV{ID_NET_DRIVER}=="veth", ENV{INTERFACE}=="eth[0-9]
115
+
@@ -192,7 +120,6 @@ fi
116
+
117
+
# Ignore failures on some units.
118
+
fix_systemd_udev_trigger
119
+
-fix_systemd_sysctl
120
+
121
+
# Mask some units.
122
+
fix_systemd_mask dev-hugepages.mount
123
+
@@ -222,11 +149,6 @@ ACTION=="add|change|move", ENV{ID_NET_DRIVER}=="veth", ENV{INTERFACE}=="eth[0-9]
103
124
EOF
104
125
fi
105
126