diff --git a/board/common/xattrs b/board/common/xattrs index 89db8732..b38f8f61 100644 --- a/board/common/xattrs +++ b/board/common/xattrs @@ -1,5 +1,3 @@ # Allow users in wheel group to reboot and perform a factory reset /sbin/initctl f 4750 root wheel - - - - - /sbin/factory f 4750 root wheel - - - - - - -/var/lib/avahi-autoipd d 0755 avahi avahi - - - - - diff --git a/board/netconf/post-build.sh b/board/netconf/post-build.sh new file mode 100755 index 00000000..a5beb06a --- /dev/null +++ b/board/netconf/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh +. "$BR2_CONFIG" + +# Drop Buildroot default symlink to /tmp +if [ -L "$TARGET_DIR/var/lib/avahi-autoipd" ]; then + rm "$TARGET_DIR/var/lib/avahi-autoipd" + mkdir "$TARGET_DIR/var/lib/avahi-autoipd" +fi diff --git a/board/netconf/xattrs b/board/netconf/xattrs new file mode 100644 index 00000000..dbe17d74 --- /dev/null +++ b/board/netconf/xattrs @@ -0,0 +1 @@ +/var/lib/avahi-autoipd d 0755 avahi avahi - - - - - diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index 264400b0..20db0709 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_HOSTNAME="infix" BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit" BR2_INIT_FINIT=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt ${BR2_EXTERNAL_INFIX_PATH}/board/common/xattrs" +BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt ${BR2_EXTERNAL_INFIX_PATH}/board/common/xattrs ${BR2_EXTERNAL_INFIX_PATH}/board/netconf/xattrs" BR2_SYSTEM_BIN_SH_BASH=y BR2_TARGET_GENERIC_GETTY_TERM="linux" BR2_SYSTEM_DHCP="eth0" @@ -20,8 +20,8 @@ BR2_ENABLE_LOCALE_WHITELIST="C en_US en_CA" BR2_GENERATE_LOCALE="en_US en_CA" BR2_TARGET_TZ_INFO=y BR2_ROOTFS_USERS_TABLES="${BR2_EXTERNAL_INFIX_PATH}/board/common/users" -BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/rootfs" -BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh" +BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/netconf/rootfs"" +BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/netconf/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y @@ -120,12 +120,7 @@ BR2_PACKAGE_FINIT_PLUGIN_MODPROBE=y BR2_PACKAGE_FINIT_PLUGIN_RTC=y BR2_PACKAGE_FINIT_PLUGIN_TTY=y BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y -BR2_PACKAGE_IFUPDOWN_NG=y BR2_PACKAGE_KLINFIX=y BR2_PACKAGE_NET=y -BR2_PACKAGE_P_NET=y -BR2_PACKAGE_P_NET_MAX_SUBSLOTS=12 -BR2_PACKAGE_P_NET_MAX_PHYSICAL_PORTS=10 -BR2_PACKAGE_PROFETH=y BR2_PACKAGE_TETRIS=y BR2_PACKAGE_QUERIERD=y diff --git a/configs/amd64_defconfig b/configs/amd64_defconfig index 85caad47..a9d93264 100644 --- a/configs/amd64_defconfig +++ b/configs/amd64_defconfig @@ -11,7 +11,7 @@ BR2_TARGET_GENERIC_HOSTNAME="infix" BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit" BR2_INIT_FINIT=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt ${BR2_EXTERNAL_INFIX_PATH}/board/common/xattrs" +BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt ${BR2_EXTERNAL_INFIX_PATH}/board/common/xattrs ${BR2_EXTERNAL_INFIX_PATH}/board/netconf/xattrs" BR2_SYSTEM_BIN_SH_BASH=y BR2_TARGET_GENERIC_GETTY_TERM="linux" BR2_SYSTEM_DHCP="eth0" @@ -19,8 +19,8 @@ BR2_ENABLE_LOCALE_WHITELIST="C en_US en_CA" BR2_GENERATE_LOCALE="en_US en_CA" BR2_TARGET_TZ_INFO=y BR2_ROOTFS_USERS_TABLES="${BR2_EXTERNAL_INFIX_PATH}/board/common/users" -BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/amd64/rootfs" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh" +BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/amd64/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/netconf/rootfs" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/netconf/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y @@ -125,12 +125,7 @@ BR2_PACKAGE_FINIT_PLUGIN_MODPROBE=y BR2_PACKAGE_FINIT_PLUGIN_RTC=y BR2_PACKAGE_FINIT_PLUGIN_TTY=y BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y -BR2_PACKAGE_IFUPDOWN_NG=y BR2_PACKAGE_KLINFIX=y BR2_PACKAGE_NET=y -BR2_PACKAGE_P_NET=y -BR2_PACKAGE_P_NET_MAX_SUBSLOTS=12 -BR2_PACKAGE_P_NET_MAX_PHYSICAL_PORTS=10 -BR2_PACKAGE_PROFETH=y BR2_PACKAGE_TETRIS=y BR2_PACKAGE_QUERIERD=y