diff --git a/package/confd/clean-etc b/package/confd/clean-etc deleted file mode 100755 index ef8504b2..00000000 --- a/package/confd/clean-etc +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -reserved() -{ - for svc in avahi dnsmasq getty klish lldpd nginx rauc ssdpd sshd sysklogd sysrepo; do - [ "$1" = "${svc}.conf" ] && return 0 - done - - return 1 -} - -for file in /etc/finit.d/enabled/*.conf; do - reserved "$(basename "$file")" && continue - rm "$file" -done diff --git a/package/confd/confd.mk b/package/confd/confd.mk index aa6992df..9b454cbf 100644 --- a/package/confd/confd.mk +++ b/package/confd/confd.mk @@ -21,10 +21,6 @@ define CONFD_INSTALL_EXTRA cp $(CONFD_PKGDIR)/sysrepo.conf $(FINIT_D)/available/ ln -sf ../available/sysrepo.conf $(FINIT_D)/enabled/sysrepo.conf cp $(CONFD_PKGDIR)/tmpfiles.conf $(TARGET_DIR)/etc/tmpfiles.d/confd.conf - mkdir -p $(TARGET_DIR)/usr/share/factory/cfg - cp $(CONFD_PKGDIR)/factory-config.cfg $(TARGET_DIR)/usr/share/factory/cfg/startup-config.cfg - mkdir -p $(TARGET_DIR)/lib/infix - cp $(CONFD_PKGDIR)/clean-etc $(TARGET_DIR)/lib/infix/ endef CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_EXTRA diff --git a/package/confd/factory-config.cfg b/package/confd/factory-config.cfg deleted file mode 100644 index 4c5e9fcf..00000000 --- a/package/confd/factory-config.cfg +++ /dev/null @@ -1,24 +0,0 @@ -{ - "ietf-interfaces:interfaces": { - "interface": [ - { - "name": "eth0", - "type": "iana-if-type:ethernetCsmacd", - "ietf-ip:ipv4": { - "infix-ip:autoconf": { - "enabled": true - } - }, - "ietf-ip:ipv6": { - "enabled": true, - "autoconf": { - "create-global-addresses": true - } - } - } - ] - }, - "ietf-system:system": { - "hostname": "infix" - } -}