From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e8a73cfe948a45b1d34224acacf629a61ed17b0d Date: Thu, 18 May 2023 09:47:07 +0000 Message-ID: <4QMQ9l2bVGz2xyV@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4300934943817746888==" List-Id: --===============4300934943817746888== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via e8a73cfe948a45b1d34224acacf629a61ed17b0d (commit) via 3a96d482f6a3fd08414e98818b2322c55575fd98 (commit) via 95dc3f86d8317e9b19016978554862d00a90adb7 (commit) via 3c90d6432fa6be31a383ef22ffda517b4e3df981 (commit) from 94d883abe736a89837ad4aa3516b85ee49160c3b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e8a73cfe948a45b1d34224acacf629a61ed17b0d Author: Peter M=C3=BCller Date: Thu May 18 09:46:41 2023 +0000 initscripts: Remove re-added lvmetad initscript from rootfiles =20 Signed-off-by: Peter M=C3=BCller commit 3a96d482f6a3fd08414e98818b2322c55575fd98 Author: Jonatan Schlag Date: Sat Apr 8 10:10:05 2023 +0200 initscripts: Sort rootfiles =20 This simply sorts the rootfiles. Everything should be sorted :-). =20 Signed-off-by: Jonatan Schlag Reviewed-by: Michael Tremer commit 95dc3f86d8317e9b19016978554862d00a90adb7 Author: Jonatan Schlag Date: Sat Apr 8 10:10:04 2023 +0200 initscript: sort by startup =20 As the list of symbolic links was not sorted at all I sorted it now by the order of start or stop. This seems to be the most useful way as you can now understand the startup sequence from this file and add/remove scripts at a useful place. =20 Signed-off-by: Jonatan Schlag Reviewed-by: Michael Tremer commit 3c90d6432fa6be31a383ef22ffda517b4e3df981 Author: Jonatan Schlag Date: Sat Apr 8 10:10:03 2023 +0200 lfs/initscripts: improve indention =20 As some lines are already now to long, this increase the indention to improve readablitity. =20 Signed-off-by: Jonatan Schlag Reviewed-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/initscripts | 2 +- config/rootfiles/common/riscv64/initscripts | 4 +- config/rootfiles/common/x86_64/initscripts | 4 +- lfs/initscripts | 183 ++++++++++++++------------= -- 4 files changed, 98 insertions(+), 95 deletions(-) Difference in files: diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/c= ommon/aarch64/initscripts index e2a8a11d5..d9f80e6b2 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -10,10 +10,10 @@ etc/rc.d/helper/oci-setup #etc/rc.d/init.d etc/rc.d/init.d/acpid etc/rc.d/init.d/apache -etc/rc.d/init.d/cloud-init etc/rc.d/init.d/beep etc/rc.d/init.d/checkfs etc/rc.d/init.d/cleanfs +etc/rc.d/init.d/cloud-init etc/rc.d/init.d/collectd etc/rc.d/init.d/connectd etc/rc.d/init.d/conntrackd diff --git a/config/rootfiles/common/riscv64/initscripts b/config/rootfiles/c= ommon/riscv64/initscripts index 0c12af138..a4865aa29 100644 --- a/config/rootfiles/common/riscv64/initscripts +++ b/config/rootfiles/common/riscv64/initscripts @@ -10,10 +10,10 @@ etc/rc.d/helper/oci-setup #etc/rc.d/init.d etc/rc.d/init.d/acpid etc/rc.d/init.d/apache -etc/rc.d/init.d/cloud-init etc/rc.d/init.d/beep etc/rc.d/init.d/checkfs etc/rc.d/init.d/cleanfs +etc/rc.d/init.d/cloud-init etc/rc.d/init.d/collectd etc/rc.d/init.d/connectd etc/rc.d/init.d/conntrackd @@ -119,6 +119,7 @@ etc/rc.d/rc0.d/S99halt #etc/rc.d/rc3.d etc/rc.d/rc3.d/S01vnstat etc/rc.d/rc3.d/S10sysklogd +etc/rc.d/rc3.d/S11unbound etc/rc.d/rc3.d/S12acpid etc/rc.d/rc3.d/S15fireinfo #etc/rc.d/rc3.d/S15messagebus @@ -126,7 +127,6 @@ etc/rc.d/rc3.d/S15fireinfo etc/rc.d/rc3.d/S19smartenabler etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network -etc/rc.d/rc3.d/S11unbound etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S22conntrackd etc/rc.d/rc3.d/S24cyrus-sasl diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/co= mmon/x86_64/initscripts index 0c12af138..a4865aa29 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -10,10 +10,10 @@ etc/rc.d/helper/oci-setup #etc/rc.d/init.d etc/rc.d/init.d/acpid etc/rc.d/init.d/apache -etc/rc.d/init.d/cloud-init etc/rc.d/init.d/beep etc/rc.d/init.d/checkfs etc/rc.d/init.d/cleanfs +etc/rc.d/init.d/cloud-init etc/rc.d/init.d/collectd etc/rc.d/init.d/connectd etc/rc.d/init.d/conntrackd @@ -119,6 +119,7 @@ etc/rc.d/rc0.d/S99halt #etc/rc.d/rc3.d etc/rc.d/rc3.d/S01vnstat etc/rc.d/rc3.d/S10sysklogd +etc/rc.d/rc3.d/S11unbound etc/rc.d/rc3.d/S12acpid etc/rc.d/rc3.d/S15fireinfo #etc/rc.d/rc3.d/S15messagebus @@ -126,7 +127,6 @@ etc/rc.d/rc3.d/S15fireinfo etc/rc.d/rc3.d/S19smartenabler etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network -etc/rc.d/rc3.d/S11unbound etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S22conntrackd etc/rc.d/rc3.d/S24cyrus-sasl diff --git a/lfs/initscripts b/lfs/initscripts index 0312d8ae4..19b79a474 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -91,96 +91,99 @@ $(TARGET) : install -v -m 755 $$i /etc/rc.d/helper/; \ done =20 - ln -sf ../init.d/sysklogd /etc/rc.d/rc0.d/K90sysklogd - ln -sf ../init.d/sendsignals /etc/rc.d/rc0.d/S60sendsignals - ln -sf ../init.d/localnet /etc/rc.d/rc0.d/S70localnet - ln -sf ../init.d/mountfs /etc/rc.d/rc0.d/S80mountfs - ln -sf ../init.d/swap /etc/rc.d/rc0.d/S90swap - ln -sf ../init.d/halt /etc/rc.d/rc0.d/S99halt - ln -sf ../init.d/sysklogd /etc/rc.d/rc3.d/S10sysklogd - ln -sf ../init.d/smartenabler /etc/rc.d/rc3.d/S19smartenabler - ln -sf ../init.d/messagebus /etc/rc.d/rc3.d/S15messagebus - ln -sf ../init.d/messagebus /etc/rc.d/rc0.d/K85messagebus - ln -sf ../init.d/messagebus /etc/rc.d/rc6.d/K85messagebus - ln -sf ../init.d/cpufreq /etc/rc.d/rc3.d/S18cpufreq - ln -sf ../init.d/sysklogd /etc/rc.d/rc6.d/K90sysklogd - ln -sf ../init.d/sendsignals /etc/rc.d/rc6.d/S60sendsignals - ln -sf ../init.d/mountfs /etc/rc.d/rc6.d/S70mountfs - ln -sf ../init.d/swap /etc/rc.d/rc6.d/S80swap - ln -sf ../init.d/localnet /etc/rc.d/rc6.d/S90localnet - ln -sf ../init.d/reboot /etc/rc.d/rc6.d/S99reboot - ln -sf ../init.d/sshd /etc/rc.d/rc0.d/K30sshd - ln -sf ../init.d/sshd /etc/rc.d/rc3.d/S30sshd - ln -sf ../init.d/sshd /etc/rc.d/rc6.d/K30sshd - ln -sf ../init.d/apache /etc/rc.d/rc0.d/K28apache - ln -sf ../init.d/apache /etc/rc.d/rc3.d/S32apache - ln -sf ../init.d/apache /etc/rc.d/rc6.d/K28apache - ln -sf ../init.d/fcron /etc/rc.d/rc0.d/K08fcron - ln -sf ../init.d/fcron /etc/rc.d/rc3.d/S40fcron - ln -sf ../init.d/fcron /etc/rc.d/rc6.d/K08fcron - ln -sf ../init.d/suricata /etc/rc.d/rc0.d/K78suricata - ln -sf ../init.d/suricata /etc/rc.d/rc6.d/K78suricata - ln -sf ../init.d/network /etc/rc.d/rc0.d/K80network - ln -sf ../init.d/network /etc/rc.d/rc3.d/S20network - ln -sf ../init.d/network /etc/rc.d/rc6.d/K80network - ln -sf ../init.d/unbound /etc/rc.d/rc0.d/K86unbound - ln -sf ../init.d/unbound /etc/rc.d/rc3.d/S11unbound - ln -sf ../init.d/unbound /etc/rc.d/rc6.d/K86unbound - ln -sf ../../sysconfig/rc.local /etc/rc.d/rc3.d/S98rc.local - ln -sf ../init.d/client175 /etc/rc.d/rc0.d/K34client175 - ln -sf ../init.d/client175 /etc/rc.d/rc3.d/S66client175 - ln -sf ../init.d/client175 /etc/rc.d/rc6.d/K34client175 - ln -sf ../init.d/sslh /etc/rc.d/rc3.d/S98sslh - ln -sf ../init.d/sslh /etc/rc.d/rc0.d/K02sslh - ln -sf ../init.d/sslh /etc/rc.d/rc6.d/K02sslh - ln -sf ../init.d/vdradmin /etc/rc.d/rc3.d/S99vdradmin - ln -sf ../init.d/vdradmin /etc/rc.d/rc0.d/K01vdradmin - ln -sf ../init.d/vdradmin /etc/rc.d/rc6.d/K01vdradmin - ln -sf ../init.d/motion /etc/rc.d/rc3.d/S99motion - ln -sf ../init.d/motion /etc/rc.d/rc0.d/K01motion - ln -sf ../init.d/motion /etc/rc.d/rc6.d/K01motion - ln -sf ../init.d/imspetor /etc/rc.d/rc3.d/S99imspetor - ln -sf ../init.d/imspetor /etc/rc.d/rc0.d/K01imspetor - ln -sf ../init.d/imspetor /etc/rc.d/rc6.d/K01imspetor - ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc0.d/K49cyrus-sasl - ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl - ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc6.d/K49cyrus-sasl - ln -sf ../init.d/leds /etc/rc.d/rc0.d/K79leds - ln -sf ../init.d/leds /etc/rc.d/rc3.d/S21leds - ln -sf ../init.d/leds /etc/rc.d/rc6.d/K79leds - ln -sf ../init.d/fireinfo /etc/rc.d/rc3.d/S15fireinfo - ln -sf ../init.d/conntrackd /etc/rc.d/rc0.d/K77conntrackd - ln -sf ../init.d/conntrackd /etc/rc.d/rc3.d/S22conntrackd - ln -sf ../init.d/conntrackd /etc/rc.d/rc6.d/K77conntrackd - ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs - ln -sf ../init.d/sysctl /etc/rc.d/rcsysinit.d/S01sysctl - ln -sf ../init.d/modules /etc/rc.d/rcsysinit.d/S05modules - ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev - ln -sf ../init.d/waitdrives /etc/rc.d/rcsysinit.d/S19waitdrives - ln -sf ../init.d/partresize /etc/rc.d/rcsysinit.d/S25partresize - ln -sf ../init.d/checkfs /etc/rc.d/rcsysinit.d/S30checkfs - ln -sf ../init.d/mountfs /etc/rc.d/rcsysinit.d/S40mountfs - ln -sf ../init.d/swap /etc/rc.d/rcsysinit.d/S41swap - ln -sf ../init.d/fsresize /etc/rc.d/rcsysinit.d/S42fsresize - ln -sf ../init.d/mounttmpfs /etc/rc.d/rcsysinit.d/S43mounttmpfs - ln -sf ../init.d/smt /etc/rc.d/rcsysinit.d/S44smt - ln -sf ../init.d/udev_retry /etc/rc.d/rcsysinit.d/S45udev_retry - ln -sf ../init.d/cleanfs /etc/rc.d/rcsysinit.d/S50cleanfs - ln -sf ../init.d/setclock /etc/rc.d/rcsysinit.d/S60setclock - ln -sf ../init.d/setclock /etc/rc.d/rc0.d/K47setclock - ln -sf ../init.d/setclock /etc/rc.d/rc6.d/K47setclock - ln -sf ../init.d/console /etc/rc.d/rcsysinit.d/S70console - ln -sf ../init.d/pakfire /etc/rc.d/rcsysinit.d/S71pakfire - ln -sf ../init.d/cloud-init /etc/rc.d/rcsysinit.d/S74cloud-init - ln -sf ../init.d/firstsetup /etc/rc.d/rcsysinit.d/S75firstsetup - ln -sf ../init.d/localnet /etc/rc.d/rcsysinit.d/S80localnet - ln -sf ../init.d/firewall /etc/rc.d/rcsysinit.d/S85firewall - ln -sf ../init.d/vnstat /etc/rc.d/rc3.d/S01vnstat - ln -sf ../init.d/vnstat /etc/rc.d/rc0.d/K51vnstat - ln -sf ../init.d/vnstat /etc/rc.d/rc6.d/K51vnstat - ln -sf ../init.d/wlanclient /etc/rc.d/rc0.d/K82wlanclient - ln -sf ../init.d/wlanclient /etc/rc.d/rc3.d/S19wlanclient - ln -sf ../init.d/wlanclient /etc/rc.d/rc6.d/K82wlanclient + ln -sf ../init.d/imspetor /etc/rc.d/rc0.d/K01imspetor + ln -sf ../init.d/motion /etc/rc.d/rc0.d/K01motion + ln -sf ../init.d/vdradmin /etc/rc.d/rc0.d/K01vdradmin + ln -sf ../init.d/sslh /etc/rc.d/rc0.d/K02sslh + ln -sf ../init.d/fcron /etc/rc.d/rc0.d/K08fcron + ln -sf ../init.d/apache /etc/rc.d/rc0.d/K28apache + ln -sf ../init.d/sshd /etc/rc.d/rc0.d/K30sshd + ln -sf ../init.d/client175 /etc/rc.d/rc0.d/K34client175 + ln -sf ../init.d/setclock /etc/rc.d/rc0.d/K47setclock + ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc0.d/K49cyrus-sasl + ln -sf ../init.d/vnstat /etc/rc.d/rc0.d/K51vnstat + ln -sf ../init.d/conntrackd /etc/rc.d/rc0.d/K77conntrackd + ln -sf ../init.d/suricata /etc/rc.d/rc0.d/K78suricata + ln -sf ../init.d/leds /etc/rc.d/rc0.d/K79leds + ln -sf ../init.d/network /etc/rc.d/rc0.d/K80network + ln -sf ../init.d/wlanclient /etc/rc.d/rc0.d/K82wlanclient + ln -sf ../init.d/messagebus /etc/rc.d/rc0.d/K85messagebus + ln -sf ../init.d/unbound /etc/rc.d/rc0.d/K86unbound + ln -sf ../init.d/sysklogd /etc/rc.d/rc0.d/K90sysklogd + ln -sf ../init.d/sendsignals /etc/rc.d/rc0.d/S60sendsignals + ln -sf ../init.d/localnet /etc/rc.d/rc0.d/S70localnet + ln -sf ../init.d/mountfs /etc/rc.d/rc0.d/S80mountfs + ln -sf ../init.d/swap /etc/rc.d/rc0.d/S90swap + ln -sf ../init.d/halt /etc/rc.d/rc0.d/S99halt + + ln -sf ../init.d/vnstat /etc/rc.d/rc3.d/S01vnstat + ln -sf ../init.d/sysklogd /etc/rc.d/rc3.d/S10sysklogd + ln -sf ../init.d/unbound /etc/rc.d/rc3.d/S11unbound + ln -sf ../init.d/fireinfo /etc/rc.d/rc3.d/S15fireinfo + ln -sf ../init.d/messagebus /etc/rc.d/rc3.d/S15messagebus + ln -sf ../init.d/cpufreq /etc/rc.d/rc3.d/S18cpufreq + ln -sf ../init.d/smartenabler /etc/rc.d/rc3.d/S19smartenabler + ln -sf ../init.d/wlanclient /etc/rc.d/rc3.d/S19wlanclient + ln -sf ../init.d/network /etc/rc.d/rc3.d/S20network + ln -sf ../init.d/leds /etc/rc.d/rc3.d/S21leds + ln -sf ../init.d/conntrackd /etc/rc.d/rc3.d/S22conntrackd + ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl + ln -sf ../init.d/sshd /etc/rc.d/rc3.d/S30sshd + ln -sf ../init.d/apache /etc/rc.d/rc3.d/S32apache + ln -sf ../init.d/fcron /etc/rc.d/rc3.d/S40fcron + ln -sf ../init.d/client175 /etc/rc.d/rc3.d/S66client175 + ln -sf ../../sysconfig/rc.local /etc/rc.d/rc3.d/S98rc.local + ln -sf ../init.d/sslh /etc/rc.d/rc3.d/S98sslh + ln -sf ../init.d/imspetor /etc/rc.d/rc3.d/S99imspetor + ln -sf ../init.d/motion /etc/rc.d/rc3.d/S99motion + ln -sf ../init.d/vdradmin /etc/rc.d/rc3.d/S99vdradmin + + ln -sf ../init.d/imspetor /etc/rc.d/rc6.d/K01imspetor + ln -sf ../init.d/motion /etc/rc.d/rc6.d/K01motion + ln -sf ../init.d/vdradmin /etc/rc.d/rc6.d/K01vdradmin + ln -sf ../init.d/sslh /etc/rc.d/rc6.d/K02sslh + ln -sf ../init.d/fcron /etc/rc.d/rc6.d/K08fcron + ln -sf ../init.d/apache /etc/rc.d/rc6.d/K28apache + ln -sf ../init.d/sshd /etc/rc.d/rc6.d/K30sshd + ln -sf ../init.d/client175 /etc/rc.d/rc6.d/K34client175 + ln -sf ../init.d/setclock /etc/rc.d/rc6.d/K47setclock + ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc6.d/K49cyrus-sasl + ln -sf ../init.d/vnstat /etc/rc.d/rc6.d/K51vnstat + ln -sf ../init.d/conntrackd /etc/rc.d/rc6.d/K77conntrackd + ln -sf ../init.d/suricata /etc/rc.d/rc6.d/K78suricata + ln -sf ../init.d/leds /etc/rc.d/rc6.d/K79leds + ln -sf ../init.d/network /etc/rc.d/rc6.d/K80network + ln -sf ../init.d/wlanclient /etc/rc.d/rc6.d/K82wlanclient + ln -sf ../init.d/messagebus /etc/rc.d/rc6.d/K85messagebus + ln -sf ../init.d/unbound /etc/rc.d/rc6.d/K86unbound + ln -sf ../init.d/sysklogd /etc/rc.d/rc6.d/K90sysklogd + ln -sf ../init.d/sendsignals /etc/rc.d/rc6.d/S60sendsignals + ln -sf ../init.d/mountfs /etc/rc.d/rc6.d/S70mountfs + ln -sf ../init.d/swap /etc/rc.d/rc6.d/S80swap + ln -sf ../init.d/localnet /etc/rc.d/rc6.d/S90localnet + ln -sf ../init.d/reboot /etc/rc.d/rc6.d/S99reboot + + ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs + ln -sf ../init.d/sysctl /etc/rc.d/rcsysinit.d/S01sysctl + ln -sf ../init.d/modules /etc/rc.d/rcsysinit.d/S05modules + ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev + ln -sf ../init.d/waitdrives /etc/rc.d/rcsysinit.d/S19waitdrives + ln -sf ../init.d/partresize /etc/rc.d/rcsysinit.d/S25partresize + ln -sf ../init.d/checkfs /etc/rc.d/rcsysinit.d/S30checkfs + ln -sf ../init.d/mountfs /etc/rc.d/rcsysinit.d/S40mountfs + ln -sf ../init.d/swap /etc/rc.d/rcsysinit.d/S41swap + ln -sf ../init.d/fsresize /etc/rc.d/rcsysinit.d/S42fsresize + ln -sf ../init.d/mounttmpfs /etc/rc.d/rcsysinit.d/S43mounttmpfs + ln -sf ../init.d/smt /etc/rc.d/rcsysinit.d/S44smt + ln -sf ../init.d/udev_retry /etc/rc.d/rcsysinit.d/S45udev_retry + ln -sf ../init.d/cleanfs /etc/rc.d/rcsysinit.d/S50cleanfs + ln -sf ../init.d/setclock /etc/rc.d/rcsysinit.d/S60setclock + ln -sf ../init.d/console /etc/rc.d/rcsysinit.d/S70console + ln -sf ../init.d/pakfire /etc/rc.d/rcsysinit.d/S71pakfire + ln -sf ../init.d/cloud-init /etc/rc.d/rcsysinit.d/S74cloud-init + ln -sf ../init.d/firstsetup /etc/rc.d/rcsysinit.d/S75firstsetup + ln -sf ../init.d/localnet /etc/rc.d/rcsysinit.d/S80localnet + ln -sf ../init.d/firewall /etc/rc.d/rcsysinit.d/S85firewall =20 ln -sf ../../../../../usr/local/bin/qosctrl \ /etc/rc.d/init.d/networking/red.up/24-RS-qos hooks/post-receive -- IPFire 2.x development tree --===============4300934943817746888==--