From e1df0e61d70bd2caa291ca723c5faa6089238af0 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Thu, 9 Jul 2026 18:31:41 +0000 Subject: [PATCH] armbian_rootenc_setup: improve edit_initramfs_conf() --- scripts/armbian_rootenc_setup.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/armbian_rootenc_setup.sh b/scripts/armbian_rootenc_setup.sh index 2d10926..aeca85c 100755 --- a/scripts/armbian_rootenc_setup.sh +++ b/scripts/armbian_rootenc_setup.sh @@ -1169,15 +1169,17 @@ edit_extlinux_conf() { edit_initramfs_conf() { local file="$TARGET_ROOT/etc/initramfs-tools/initramfs.conf" dev=$eth_dev [ "$USB_GADGET" ] && dev='usb0' - ed $file <<-'EOF' - g/^\s*IP=/s/^/# / + ed --loose-exit-status $file <<-'EOF' + g/^\s*IP=/d g/^\s*DEVICE=/d + g/^\s*MODULES=list/d wq EOF + [ "$ADD_ALL_MODS" ] && echo 'MODULES=list' >> $file + [ "$IP_ADDRESS" == 'none' ] || echo "DEVICE=$dev" >> $file [ "$IP_ADDRESS" == 'dhcp' -o "$IP_ADDRESS" == 'none' ] || { echo "IP=$IP_ADDRESS:::$NETMASK::$dev:off" >> $file } - [ "$IP_ADDRESS" == 'none' ] || echo "DEVICE=$dev" >> $file _display_file $file }