From f4a604f63c21729f1175f135ad4d22304e7addfb Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 30 Nov 2023 10:37:59 +0100 Subject: [PATCH] Prevent non-essential services from running in runlevels > 6 In case failure-config fails to load, we park the system in runlevel 9. In this state, we only want the most essential services running. --- board/common/rootfs/etc/finit.d/available/rauc.conf | 2 +- package/confd/confd.conf | 4 ++-- package/klish/klish.svc | 2 +- .../skeleton/etc/finit.d/available/avahi-dnsconfd.conf | 2 +- .../skeleton/etc/finit.d/available/avahi.conf | 2 +- .../skeleton/etc/finit.d/available/chronyd.conf | 2 +- .../skeleton/etc/finit.d/available/conntrackd.conf | 2 +- .../skeleton/etc/finit.d/available/dnsmasq.conf | 2 +- .../skeleton/etc/finit.d/available/frr/babeld.conf | 2 +- .../skeleton/etc/finit.d/available/frr/bfdd.conf | 2 +- .../skeleton/etc/finit.d/available/frr/bgpd.conf | 2 +- .../skeleton/etc/finit.d/available/frr/eigrpd.conf | 2 +- .../skeleton/etc/finit.d/available/frr/isisd.conf | 2 +- .../skeleton/etc/finit.d/available/frr/ldpd.conf | 2 +- .../skeleton/etc/finit.d/available/frr/ospf6d.conf | 2 +- .../skeleton/etc/finit.d/available/frr/ospfd.conf | 2 +- .../skeleton/etc/finit.d/available/frr/pathd.conf | 2 +- .../skeleton/etc/finit.d/available/frr/pim6d.conf | 2 +- .../skeleton/etc/finit.d/available/frr/pimd.conf | 2 +- .../skeleton/etc/finit.d/available/frr/ripd.conf | 2 +- .../skeleton/etc/finit.d/available/frr/ripng.conf | 2 +- .../skeleton/etc/finit.d/available/frr/staticd.conf | 2 +- .../skeleton/etc/finit.d/available/frr/vrrpd.conf | 2 +- .../skeleton/etc/finit.d/available/frr/zebra.conf | 2 +- .../skeleton/etc/finit.d/available/lldpd.conf | 2 +- .../skeleton/etc/finit.d/available/mstpd.conf | 2 +- .../skeleton/etc/finit.d/available/querierd.conf | 2 +- .../skeleton/etc/finit.d/available/smcroute.conf | 2 +- package/statd/statd.conf | 2 +- 29 files changed, 30 insertions(+), 30 deletions(-) diff --git a/board/common/rootfs/etc/finit.d/available/rauc.conf b/board/common/rootfs/etc/finit.d/available/rauc.conf index 2e99d47df..9a87c4083 100644 --- a/board/common/rootfs/etc/finit.d/available/rauc.conf +++ b/board/common/rootfs/etc/finit.d/available/rauc.conf @@ -1,5 +1,5 @@ set G_MESSAGES_DEBUG=nocolor -service [2345789] \ +service [2345] \ env:-/etc/default/rauc log:prio:user.notice \ rauc service $RAUC_ARGS -- Software update service diff --git a/package/confd/confd.conf b/package/confd/confd.conf index 411d170fc..e0b166948 100644 --- a/package/confd/confd.conf +++ b/package/confd/confd.conf @@ -8,7 +8,7 @@ run name:error :1 log:console norestart if: \ [S] /usr/libexec/confd/error -- service name:confd log \ - [S12345789] sysrepo-plugind -f -p /run/confd.pid -n -v3 -- Configuration daemon + [S12345] sysrepo-plugind -f -p /run/confd.pid -n -v3 -- Configuration daemon # Bootstrap system with startup-config run name:startup log:prio:user.notice norestart \ @@ -24,7 +24,7 @@ run name:error :2 log:console norestart if: \ [S] /usr/libexec/confd/error -- service name:netopeer notify:none log \ - [12345789] netopeer2-server -F -t 60 \ + [12345] netopeer2-server -F -t 60 \ -- NETCONF server # Create initial /etc/resolv.conf after successful bootstrap diff --git a/package/klish/klish.svc b/package/klish/klish.svc index 3790777bd..6344c8a28 100644 --- a/package/klish/klish.svc +++ b/package/klish/klish.svc @@ -1 +1 @@ -service log [2345789] /usr/bin/klishd -d -- CLI backend daemon +service log [2345] /usr/bin/klishd -d -- CLI backend daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/avahi-dnsconfd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/avahi-dnsconfd.conf index cab9f7a47..e5877254d 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/avahi-dnsconfd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/avahi-dnsconfd.conf @@ -1 +1 @@ -service [2345789] avahi-dnsconfd -s -- Avahi unicast DNS configuration daemon +service [2345] avahi-dnsconfd -s -- Avahi unicast DNS configuration daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/avahi.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/avahi.conf index 7fdd150b3..eeb6cb2ac 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/avahi.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/avahi.conf @@ -1 +1 @@ -service [2345789] name:mdns avahi-daemon -s -- Avahi mDNS-SD daemon +service [2345] name:mdns avahi-daemon -s -- Avahi mDNS-SD daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/chronyd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/chronyd.conf index 618cb9a1e..f2fd16678 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/chronyd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/chronyd.conf @@ -1,2 +1,2 @@ # Requires /etc/chrony.conf to start, see https://chrony.tuxfamily.org/doc/3.4/chrony.conf.html -service [2345789] env:-/etc/default/chronyd chronyd -n $CHRONY_ARGS -- Chrony NTP v3/v4 daemon +service [2345] env:-/etc/default/chronyd chronyd -n $CHRONY_ARGS -- Chrony NTP v3/v4 daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/conntrackd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/conntrackd.conf index 5a5fbd4cc..a07671469 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/conntrackd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/conntrackd.conf @@ -1 +1 @@ -service [2345789] env:-/etc/default/conntrackd conntrackd $CONNTRACKD_ARGS -- Connection tracking daemon +service [2345] env:-/etc/default/conntrackd conntrackd $CONNTRACKD_ARGS -- Connection tracking daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/dnsmasq.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/dnsmasq.conf index 987d8045b..1d7900af1 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/dnsmasq.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/dnsmasq.conf @@ -1 +1 @@ -service [S12345789] dnsmasq -k -u root -- DHCP/DNS proxy +service [S12345] dnsmasq -k -u root -- DHCP/DNS proxy diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/babeld.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/babeld.conf index 73c970608..98757eac2 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/babeld.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/babeld.conf @@ -1 +1 @@ -service [2345789] log:null babled -A 127.0.0.1 -u frr -g frr -- Babel routing daemon +service [2345] log:null babled -A 127.0.0.1 -u frr -g frr -- Babel routing daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/bfdd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/bfdd.conf index 8a4b13d16..971de6290 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/bfdd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/bfdd.conf @@ -1 +1 @@ -service [2345789] log:null bfdd -A 127.0.0.1 -u frr -g frr -- BFD daemon +service [2345] log:null bfdd -A 127.0.0.1 -u frr -g frr -- BFD daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/bgpd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/bgpd.conf index d7aae3469..1fb9d1329 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/bgpd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/bgpd.conf @@ -1 +1 @@ -service [2345789] log:null bgpd -A 127.0.0.1 -u frr -g frr -- BGP daemon +service [2345] log:null bgpd -A 127.0.0.1 -u frr -g frr -- BGP daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/eigrpd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/eigrpd.conf index a7f5990e4..e52feb90c 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/eigrpd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/eigrpd.conf @@ -1 +1 @@ -service [2345789] log:null eigrpd -A 127.0.0.1 -u frr -g frr -- EIGRP daemon +service [2345] log:null eigrpd -A 127.0.0.1 -u frr -g frr -- EIGRP daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/isisd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/isisd.conf index 3126be62c..3fe6211f3 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/isisd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/isisd.conf @@ -1 +1 @@ -service [2345789] log:null isisd -A 127.0.0.1 -u frr -g frr -- IS-IS daemon +service [2345] log:null isisd -A 127.0.0.1 -u frr -g frr -- IS-IS daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ldpd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ldpd.conf index 435a0c19f..c509b6efb 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ldpd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ldpd.conf @@ -1 +1 @@ -service [2345789] log:null ldpd -A 127.0.0.1 -u frr -g frr -- LDP daemon +service [2345] log:null ldpd -A 127.0.0.1 -u frr -g frr -- LDP daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospf6d.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospf6d.conf index dbf300470..a31eaf4cb 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospf6d.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospf6d.conf @@ -1 +1 @@ -service [2345789] log:null ospf6d -A 127.0.0.1 -u frr -g frr -- OSPF IPv6 daemon +service [2345] log:null ospf6d -A 127.0.0.1 -u frr -g frr -- OSPF IPv6 daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospfd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospfd.conf index 8f2c86fca..acaa27fef 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospfd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospfd.conf @@ -1 +1 @@ -service [2345789] log:null ospfd -A 127.0.0.1 -u frr -g frr -f /etc/frr/ospfd.conf-- OSPF daemon +service [2345] log:null ospfd -A 127.0.0.1 -u frr -g frr -f /etc/frr/ospfd.conf-- OSPF daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/pathd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/pathd.conf index 668232fa3..0c0af421e 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/pathd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/pathd.conf @@ -1 +1 @@ -service [2345789] log:null pathd -A 127.0.0.1 -u frr -g frr -- PCEP daemon +service [2345] log:null pathd -A 127.0.0.1 -u frr -g frr -- PCEP daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/pim6d.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/pim6d.conf index 826dac23f..51716cf94 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/pim6d.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/pim6d.conf @@ -1 +1 @@ -service [2345789] log:null pim6d -A 127.0.0.1 -u frr -g frr -- PIM6 daemon +service [2345] log:null pim6d -A 127.0.0.1 -u frr -g frr -- PIM6 daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/pimd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/pimd.conf index 002e1dd84..1d867f264 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/pimd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/pimd.conf @@ -1 +1 @@ -service [2345789] log:null pimd -A 127.0.0.1 -u frr -g frr -- PIM daemon +service [2345] log:null pimd -A 127.0.0.1 -u frr -g frr -- PIM daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripd.conf index 2bcc5758f..5fbe09b03 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripd.conf @@ -1 +1 @@ -service [2345789] log:null ripd -A 127.0.0.1 -u frr -g frr -- RIP daemon +service [2345] log:null ripd -A 127.0.0.1 -u frr -g frr -- RIP daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripng.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripng.conf index 503b89bdd..5d80f4ca0 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripng.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripng.conf @@ -1 +1 @@ -service [2345789] log:null ripngd -A 127.0.0.1 -u frr -g frr -- RIP IPv6 daemon +service [2345] log:null ripngd -A 127.0.0.1 -u frr -g frr -- RIP IPv6 daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/staticd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/staticd.conf index 22b8e6db0..d6fae1ae1 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/staticd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/staticd.conf @@ -1 +1 @@ -service [2345789] log:null staticd -A 127.0.0.1 -u frr -g frr -f /etc/frr/staticd.conf -- Static routing daemon +service [2345] log:null staticd -A 127.0.0.1 -u frr -g frr -f /etc/frr/staticd.conf -- Static routing daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/vrrpd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/vrrpd.conf index f0685e522..c71e89d01 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/vrrpd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/vrrpd.conf @@ -1 +1 @@ -service [2345789] log:null vrrpd -A 127.0.0.1 -u frr -g frr -- VRRP daemon +service [2345] log:null vrrpd -A 127.0.0.1 -u frr -g frr -- VRRP daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/zebra.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/zebra.conf index d0c8d1411..85aa22fdc 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/zebra.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/zebra.conf @@ -1 +1 @@ -service [2345789] pid:!/run/frr/zebra.pid zebra -A 127.0.0.1 -u frr -g frr -- Zebra routing daemon +service [2345] pid:!/run/frr/zebra.pid zebra -A 127.0.0.1 -u frr -g frr -- Zebra routing daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/lldpd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/lldpd.conf index 8025d5d74..ccb202f7d 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/lldpd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/lldpd.conf @@ -1 +1 @@ -service [2345789] env:-/etc/default/lldpd lldpd -d $LLDPD_ARGS -- LLDP daemon (IEEE 802.1ab) +service [2345] env:-/etc/default/lldpd lldpd -d $LLDPD_ARGS -- LLDP daemon (IEEE 802.1ab) diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf index 7659b8116..bae2749be 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf @@ -1,4 +1,4 @@ # Make sure to configure the bridge to run on before starting mstpd # Note: all 'sysv' type services are handed an extra 'start' or 'stop' # argument when starting and stopping. -sysv name:mstpd [0123456789] pid:!/run/mstpd.pid bridge-stp br0 -- MSTP daemon +sysv name:mstpd [0123456] pid:!/run/mstpd.pid bridge-stp br0 -- MSTP daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/querierd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/querierd.conf index f55f8c690..000d34130 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/querierd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/querierd.conf @@ -1 +1 @@ -service [2345789] env:-/etc/default/querierd querierd -sn $QUERIERD_ARGS -- Multicast query daemon +service [2345] env:-/etc/default/querierd querierd -sn $QUERIERD_ARGS -- Multicast query daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/smcroute.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/smcroute.conf index 792262b21..9beb9ea37 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/smcroute.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/smcroute.conf @@ -1,2 +1,2 @@ -service [2345789] env:-/etc/default/smcrouted \ +service [2345] env:-/etc/default/smcrouted \ smcrouted -ns $SMCROUTE_OPTS $SMCROUTE_ARGS -- Static multicast routing daemon diff --git a/package/statd/statd.conf b/package/statd/statd.conf index e27ae03af..0af36ab0e 100644 --- a/package/statd/statd.conf +++ b/package/statd/statd.conf @@ -1 +1 @@ -service name:statd log [S12345789] statd -f -p /run/statd.pid -n -- Status daemon +service name:statd log [S12345] statd -f -p /run/statd.pid -n -- Status daemon