From 9bd2546a0c633a16e9b658e3dc5f1d600ce82642 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 19 Sep 2023 16:02:49 -0500 Subject: [PATCH] rootfs: NetworkManager: ignore eth1 Signed-off-by: Robert Nelson --- .gitignore | 1 + 06_generate_debian_console_root.sh | 3 +++ 06_generate_ubuntu_console_root.sh | 3 +++ rootfs/etc/NetworkManager/conf.d/local-ignore-eth1.conf | 2 ++ 4 files changed, 9 insertions(+) create mode 100644 rootfs/etc/NetworkManager/conf.d/local-ignore-eth1.conf diff --git a/.gitignore b/.gitignore index 5c26048..2510621 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.gitlab-runner deploy/images/ deploy/input/ deploy/hss-payload-generator diff --git a/06_generate_debian_console_root.sh b/06_generate_debian_console_root.sh index e33419c..e168bbd 100755 --- a/06_generate_debian_console_root.sh +++ b/06_generate_debian_console_root.sh @@ -59,6 +59,9 @@ echo '/dev/mmcblk0p2 /boot/firmware/ auto defaults 0 2' >> ./ignore/.root/et echo '/dev/mmcblk0p3 / auto errors=remount-ro 0 1' >> ./ignore/.root/etc/fstab echo 'debugfs /sys/kernel/debug debugfs mode=755,uid=root,gid=gpio,defaults 0 0' >> ./ignore/.root/etc/fstab +#Network-Manager, ignore eth1 +cp -v ./rootfs/etc/NetworkManager/conf.d/*.conf ./ignore/.root/etc/NetworkManager/conf.d/ + # setuid root ping+ping6 chmod u+s ./ignore/.root/usr/bin/ping ./ignore/.root/usr/bin/ping6 diff --git a/06_generate_ubuntu_console_root.sh b/06_generate_ubuntu_console_root.sh index 5e77617..bd658ab 100755 --- a/06_generate_ubuntu_console_root.sh +++ b/06_generate_ubuntu_console_root.sh @@ -59,6 +59,9 @@ echo '/dev/mmcblk0p2 /boot/firmware/ auto defaults 0 2' >> ./ignore/.root/et echo '/dev/mmcblk0p3 / auto errors=remount-ro 0 1' >> ./ignore/.root/etc/fstab echo 'debugfs /sys/kernel/debug debugfs mode=755,uid=root,gid=gpio,defaults 0 0' >> ./ignore/.root/etc/fstab +#Network-Manager, ignore eth1 +cp -v ./rootfs/etc/NetworkManager/conf.d/*.conf ./ignore/.root/etc/NetworkManager/conf.d/ + # setuid root ping+ping6 chmod u+s ./ignore/.root/usr/bin/ping ./ignore/.root/usr/bin/ping6 diff --git a/rootfs/etc/NetworkManager/conf.d/local-ignore-eth1.conf b/rootfs/etc/NetworkManager/conf.d/local-ignore-eth1.conf new file mode 100644 index 0000000..845b45d --- /dev/null +++ b/rootfs/etc/NetworkManager/conf.d/local-ignore-eth1.conf @@ -0,0 +1,2 @@ +[keyfile] +unmanaged-devices=interface-name:eth1