From 90b35affe20597bc60add4ef5d0f49ff3932b9b3 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 2 Jun 2024 23:19:53 +0200 Subject: [PATCH] Drop augeas from system completely Signed-off-by: Joachim Wiberg --- board/common/rootfs/usr/share/udhcpc/default.script | 2 +- package/confd/Config.in | 1 - package/confd/confd.mk | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/board/common/rootfs/usr/share/udhcpc/default.script b/board/common/rootfs/usr/share/udhcpc/default.script index 1e5e9f75..3a59e67e 100755 --- a/board/common/rootfs/usr/share/udhcpc/default.script +++ b/board/common/rootfs/usr/share/udhcpc/default.script @@ -119,7 +119,7 @@ case "$ACTION" in if [ -n "$hostname" ]; then log "setting new hostname: $hostname" hostname "$hostname" - augtool -s "set /files/etc/hosts/*[ipaddr='127.0.1.1']/canonical $hostname" + sed -i -E "s/^(127\.0\.1\.1\s+).*/\1$hostname/" /etc/hosts fi # drop info from this interface diff --git a/package/confd/Config.in b/package/confd/Config.in index 629d5989..e1b8dfa1 100644 --- a/package/confd/Config.in +++ b/package/confd/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_CONFD bool "confd" - select BR2_PACKAGE_AUGEAS select BR2_PACKAGE_JANSSON select BR2_PACKAGE_LIBITE select BR2_PACKAGE_NETOPEER2 diff --git a/package/confd/confd.mk b/package/confd/confd.mk index 5cdbb72b..8b3c54cb 100644 --- a/package/confd/confd.mk +++ b/package/confd/confd.mk @@ -11,7 +11,7 @@ CONFD_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/confd CONFD_LICENSE = BSD-3-Clause CONFD_LICENSE_FILES = LICENSE CONFD_REDISTRIBUTE = NO -CONFD_DEPENDENCIES = host-sysrepo sysrepo netopeer2 augeas jansson libite sysrepo libsrx libglib2 +CONFD_DEPENDENCIES = host-sysrepo sysrepo netopeer2 jansson libite sysrepo libsrx libglib2 CONFD_AUTORECONF = YES CONFD_SYSREPO_SHM_PREFIX = sr_buildroot$(subst /,_,$(CONFIG_DIR))_confd