depot/pkgs/by-name/di/distrobuilder/nixos-generator.patch

diff --git a/distrobuilder/lxc.generator b/distrobuilder/lxc.generator
index dc5b506..0265da8 100644
--- a/distrobuilder/lxc.generator
+++ b/distrobuilder/lxc.generator
@@ -21,16 +21,6 @@ is_incus_vm() {
 	[ -e /dev/virtio-ports/org.linuxcontainers.incus ]
 }
 
-# is_in_path succeeds if the given file exists in on of the paths
-is_in_path() {
-	# Don't use $PATH as that may not include all relevant paths
-	for path in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin; do
-		[ -e "${path}/$1" ] && return 0
-	done
-
-	return 1
-}
-
 ## Fix functions
 # fix_ro_paths avoids udevd issues with /sys and /proc being writable
 fix_ro_paths() {
@@ -42,38 +32,6 @@ fix_ro_paths() {
 		EOF
 }
 
-# fix_nm_link_state forces the network interface to a DOWN state ahead of NetworkManager starting up
-fix_nm_link_state() {
-	[ -e "/sys/class/net/$1" ] || return 0
-	ip_path=
-	if [ -f /sbin/ip ]; then
-		ip_path=/sbin/ip
-	elif [ -f /bin/ip ]; then
-		ip_path=/bin/ip
-	else
-		return 0
-	fi
-	cat <<-EOF > /run/systemd/system/network-device-down.service
-		# This file was created by distrobuilder
-		[Unit]
-		Description=Turn off network device
-		Before=NetworkManager.service
-		Before=systemd-networkd.service
-
-		[Service]
-		# do not turn off if there is a default route to 169.254.0.1, i.e. the device is a routed nic
-		ExecCondition=/bin/sh -c '! /usr/bin/grep -qs 00000000.0100FEA9 /proc/net/route'
-		ExecStart=-${ip_path} link set $1 down
-		Type=oneshot
-		RemainAfterExit=true
-
-		[Install]
-		WantedBy=default.target
-		EOF
-	mkdir -p /run/systemd/system/default.target.wants
-	ln -sf /run/systemd/system/network-device-down.service /run/systemd/system/default.target.wants/network-device-down.service
-}
-
 # fix_systemd_override_unit generates a unit specific override
 fix_systemd_override_unit() {
 	dropin_dir="/run/systemd/${1}.d"
@@ -113,16 +71,7 @@ fix_systemd_mask() {
 # fix_systemd_udev_trigger overrides the systemd-udev-trigger.service to match the latest version
 # of the file which uses "ExecStart=-" instead of "ExecStart=".
 fix_systemd_udev_trigger() {
-	cmd=
-	if [ -f /usr/bin/udevadm ]; then
-		cmd=/usr/bin/udevadm
-	elif [ -f /sbin/udevadm ]; then
-		cmd=/sbin/udevadm
-	elif [ -f /bin/udevadm ]; then
-		cmd=/bin/udevadm
-	else
-		return 0
-	fi
+	cmd=udevadm
 
 	mkdir -p /run/systemd/system/systemd-udev-trigger.service.d
 	cat <<-EOF > /run/systemd/system/systemd-udev-trigger.service.d/zzz-lxc-override.conf
@@ -134,38 +83,13 @@ fix_systemd_udev_trigger() {
 		EOF
 }
 
-# fix_systemd_sysctl overrides the systemd-sysctl.service to use "ExecStart=-" instead of "ExecStart=".
-fix_systemd_sysctl() {
-	cmd=/usr/lib/systemd/systemd-sysctl
-	! [ -e "${cmd}" ] && cmd=/lib/systemd/systemd-sysctl
-	mkdir -p /run/systemd/system/systemd-sysctl.service.d
-	cat <<-EOF > /run/systemd/system/systemd-sysctl.service.d/zzz-lxc-override.conf
-		# This file was created by distrobuilder
-		[Service]
-		ExecStart=
-		ExecStart=-${cmd}
-		EOF
-}
-
 ## Main logic
-# Nothing to do in Incus VM but deployed in case it is later converted to a container
-is_incus_vm && exit 0
 
 # Exit immediately if not an Incus/LXC container
 is_lxc_container || exit 0
 
-# Check for NetworkManager
-nm_exists=0
-
-is_in_path NetworkManager && nm_exists=1
-
 # Determine systemd version
-for path in /usr/lib/systemd/systemd /lib/systemd/systemd; do
-	[ -x "${path}" ] || continue
-
-	systemd_version="$("${path}" --version | head -n1 | cut -d' ' -f2 | cut -d'~' -f1)"
-	break
-done
+systemd_version="$(systemd --version | head -n1 | cut -d' ' -f2)"
 
 # Determine distro name and release
 ID=""
@@ -196,7 +120,6 @@ fi
 
 # Ignore failures on some units.
 fix_systemd_udev_trigger
-fix_systemd_sysctl
 
 # Mask some units.
 fix_systemd_mask dev-hugepages.mount
@@ -226,11 +149,6 @@ if [ -d /etc/udev ]; then
 		EOF
 fi
 
-# Workarounds for NetworkManager in containers
-if [ "${nm_exists}" -eq 1 ]; then
-	fix_nm_link_state eth0
-fi
-
 # Allow masking units created by the lxc system-generator.
 for d in /etc/systemd/system /usr/lib/systemd/system /lib/systemd/system; do
 	if ! [ -d "${d}" ]; then