package/confd: drop clean-etc script, fix #74

This script has some seriously sharp edges.  Today two devs cut their
fingers on it trying to get new functionality in place.  One when, in a
attempt at, adding an innocent status daemon, and another setting up a
client repository with a custom, enabled-by-default, daemon.  In both
instances this script happily cleaned out the deamons from enabled/.

A better alternative, as described in issue #74, is to be stricter on
what is enabled by default, and for things we feel provide value in the
Classic build, maintain a separate list of symlinks in its meta board
definitiion instead.

Also, clean out previous attempt at factory-config.  Now that we have
the auto-factory support in place we don't need this.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2023-07-04 09:35:47 +02:00
committed by Richard Alpe
parent 72e388458d
commit 259239ce5b
3 changed files with 0 additions and 43 deletions
-15
View File
@@ -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
-4
View File
@@ -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
-24
View File
@@ -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"
}
}