IPFire-SCM April 2024

ipfire-scm@lists.ipfire.org

1 participants
26 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 732199b11b6f85b33bd36dedf521e074e81d170d
by Arne Fitzenreiter 06 Apr '24

06 Apr '24

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 732199b11b6f85b33bd36dedf521e074e81d170d (commit) via 8b9f6c8b2f635a5455555764894ee5535ab1ee71 (commit) from 8b981e4d76fcb9d380ae1cbd4c9eeec1726e593e (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 732199b11b6f85b33bd36dedf521e074e81d170d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Apr 6 07:43:01 2024 +0000 kernel: enable CPUFREQ for Raspberry Pi Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 8b9f6c8b2f635a5455555764894ee5535ab1ee71 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Apr 6 07:42:21 2024 +0000 initskripts: update aarch64 rootfile Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 7 ++++--- config/rootfiles/common/aarch64/initscripts | 4 ++++ config/rootfiles/common/aarch64/linux | 4 +++- 3 files changed, 11 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 11a3ef593..6552e2a64 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.22-ipfire Kernel Configuration +# Linux/arm64 6.6.25-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -156,7 +156,7 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" -CONFIG_GCC11_NO_ARRAY_BOUNDS=y +CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_CGROUPS=y @@ -592,6 +592,7 @@ CONFIG_ARM_ARMADA_37XX_CPUFREQ=m CONFIG_ARM_ARMADA_8K_CPUFREQ=m CONFIG_ARM_IMX6Q_CPUFREQ=m CONFIG_ARM_IMX_CPUFREQ_DT=m +CONFIG_ARM_RASPBERRYPI_CPUFREQ=y CONFIG_ARM_SCMI_CPUFREQ=m CONFIG_QORIQ_CPUFREQ=m # end of CPU Frequency scaling @@ -7271,7 +7272,7 @@ CONFIG_COMMON_CLK_XGENE=y # CONFIG_COMMON_CLK_FIXED_MMIO is not set CONFIG_CLK_BCM2711_DVP=y CONFIG_CLK_BCM2835=y -# CONFIG_CLK_RASPBERRYPI is not set +CONFIG_CLK_RASPBERRYPI=y CONFIG_MXC_CLK=m CONFIG_MXC_CLK_SCU=m CONFIG_CLK_IMX8MM=m diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index a988b4abc..293e0496b 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -26,6 +26,7 @@ etc/rc.d/init.d/firewall etc/rc.d/init.d/firstsetup etc/rc.d/init.d/fsresize etc/rc.d/init.d/functions +etc/rc.d/init.d/grub-btrfsd etc/rc.d/init.d/halt etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds @@ -93,6 +94,7 @@ etc/rc.d/init.d/vnstat etc/rc.d/init.d/waitdrives etc/rc.d/init.d/wlanclient #etc/rc.d/rc0.d +etc/rc.d/rc0.d/K01grub-btrfsd #etc/rc.d/rc0.d/K01imspetor #etc/rc.d/rc0.d/K01motion #etc/rc.d/rc0.d/K01vdradmin @@ -136,10 +138,12 @@ etc/rc.d/rc3.d/S32apache etc/rc.d/rc3.d/S40fcron etc/rc.d/rc3.d/S98rc.local #etc/rc.d/rc3.d/S98sslh +etc/rc.d/rc3.d/S99grub-btrfsd #etc/rc.d/rc3.d/S99imspetor #etc/rc.d/rc3.d/S99motion #etc/rc.d/rc3.d/S99vdradmin #etc/rc.d/rc6.d +etc/rc.d/rc6.d/K01grub-btrfsd #etc/rc.d/rc6.d/K01imspetor #etc/rc.d/rc6.d/K01motion #etc/rc.d/rc6.d/K01vdradmin diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 57c93f242..5659c4c5f 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -7332,6 +7332,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARM_PMUV3 #lib/modules/KVER-ipfire/build/include/config/ARM_PMU_ACPI #lib/modules/KVER-ipfire/build/include/config/ARM_PSCI_FW +#lib/modules/KVER-ipfire/build/include/config/ARM_RASPBERRYPI_CPUFREQ #lib/modules/KVER-ipfire/build/include/config/ARM_RK3399_DMC_DEVFREQ #lib/modules/KVER-ipfire/build/include/config/ARM_SCMI_CPUFREQ #lib/modules/KVER-ipfire/build/include/config/ARM_SCMI_HAVE_MSG @@ -7696,6 +7697,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/CLK_LS1028A_PLLDIG #lib/modules/KVER-ipfire/build/include/config/CLK_PX30 #lib/modules/KVER-ipfire/build/include/config/CLK_QORIQ +#lib/modules/KVER-ipfire/build/include/config/CLK_RASPBERRYPI #lib/modules/KVER-ipfire/build/include/config/CLK_RK3308 #lib/modules/KVER-ipfire/build/include/config/CLK_RK3328 #lib/modules/KVER-ipfire/build/include/config/CLK_RK3368 @@ -8507,7 +8509,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/FW_LOADER_USER_HELPER #lib/modules/KVER-ipfire/build/include/config/GACT_PROB #lib/modules/KVER-ipfire/build/include/config/GARP -#lib/modules/KVER-ipfire/build/include/config/GCC11_NO_ARRAY_BOUNDS +#lib/modules/KVER-ipfire/build/include/config/GCC10_NO_ARRAY_BOUNDS #lib/modules/KVER-ipfire/build/include/config/GCC_ASM_GOTO_OUTPUT_WORKAROUND #lib/modules/KVER-ipfire/build/include/config/GCC_PLUGINS #lib/modules/KVER-ipfire/build/include/config/GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8b981e4d76fcb9d380ae1cbd4c9eeec1726e593e
by Arne Fitzenreiter 05 Apr '24

05 Apr '24

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 8b981e4d76fcb9d380ae1cbd4c9eeec1726e593e (commit) via 69031f7674295d6d95219a97063c718beecc1052 (commit) from 340f11ccbc855be7c8a2d46691d9ffef56aa00cc (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 8b981e4d76fcb9d380ae1cbd4c9eeec1726e593e Merge: 340f11ccbc 69031f7674 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 5 22:29:37 2024 +0200 Merge remote-tracking branch 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/suricata/suricata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml index fb4f9426b..5bec5cd01 100644 --- a/config/suricata/suricata.yaml +++ b/config/suricata/suricata.yaml @@ -351,7 +351,7 @@ nfq: bypass-mask: 1073741824 # route-queue: 2 # batchcount: 20 - fail-open: yes + fail-open: no ## ## Step 5: App Layer Protocol Configuration hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 340f11ccbc855be7c8a2d46691d9ffef56aa00cc
by Arne Fitzenreiter 05 Apr '24

05 Apr '24

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 340f11ccbc855be7c8a2d46691d9ffef56aa00cc (commit) from 2fc167d93bae4b61e127521f05d80848142ca4e0 (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 340f11ccbc855be7c8a2d46691d9ffef56aa00cc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 5 22:27:55 2024 +0200 kernel: update to 6.6.25 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.x86_64-ipfire | 2 +- lfs/linux | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index f6d9ede28..5ecc7f15b 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.24-ipfire Kernel Configuration +# Linux/x86 6.6.25-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/lfs/linux b/lfs/linux index f5ef18d62..e10ce532a 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.24 +VER = 6.6.25 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 0f4643c758bb3857396f08b0cc291e1cf7cc7d120fe53791ba8cdaa32f08f20822353e04464551b88e8de64e367de6900da01504e57bc684d47390b51d001285 +$(DL_FILE)_BLAKE2 = d744ef7ea55202d5cb9adad2d7b22bc8be81bb4b5a03fe52e063192557eadf28d5e62612b6a517ec3180441d8fcec3582a53383df644c32bb45f3e969298af56 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 69031f7674295d6d95219a97063c718beecc1052
by Michael Tremer 05 Apr '24

05 Apr '24

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, master has been updated via 69031f7674295d6d95219a97063c718beecc1052 (commit) from bb46f3bef8445a0dba2e92bbb614113a9a4adcaf (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 69031f7674295d6d95219a97063c718beecc1052 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 3 21:42:13 2024 +0100 suricata: Disable fail-open on NFQUEUE This change causes that if suricata crashes, the NFQUEUE will no longer fall into a mode where ALL packets are being accepted. This used the be the case before which opened the entire firewall. If suricata randomly crashes, we will fall back to the "bypass" mode where packets will bypass suricata, but nothing else. Fixes: #13642 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/suricata/suricata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml index fb4f9426b..5bec5cd01 100644 --- a/config/suricata/suricata.yaml +++ b/config/suricata/suricata.yaml @@ -351,7 +351,7 @@ nfq: bypass-mask: 1073741824 # route-queue: 2 # batchcount: 20 - fail-open: yes + fail-open: no ## ## Step 5: App Layer Protocol Configuration hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2fc167d93bae4b61e127521f05d80848142ca4e0
by Arne Fitzenreiter 04 Apr '24

04 Apr '24

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 2fc167d93bae4b61e127521f05d80848142ca4e0 (commit) via 05c31f4f144ce011a350aca1bc28cde3121b82ce (commit) via 7fdafdfbcef8505312d6d50a7b95153ea80e2032 (commit) from 62db0b5320a0958b1677191bc177e5dbdaa8d608 (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 2fc167d93bae4b61e127521f05d80848142ca4e0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 4 23:33:01 2024 +0200 kernel: update to 6.6.24 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 05c31f4f144ce011a350aca1bc28cde3121b82ce Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 4 18:26:55 2024 +0200 core186: add collectd to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 7fdafdfbcef8505312d6d50a7b95153ea80e2032 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 4 18:23:29 2024 +0200 collectd: fix cpufreq graph if virtual cores are offline the kernel doesn't allow to read the frequency of a offline virtual core if smt is disabled so now no error is reported in this case and NaN submited to the database. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.x86_64-ipfire | 4 ++-- config/rootfiles/common/x86_64/linux | 2 +- .../{oldcore/125 => core/186}/filelists/collectd | 0 lfs/collectd | 2 ++ lfs/linux | 4 ++-- .../collectd-4.10.9-cpufreq_skip_disabled_cores.patch | 18 ++++++++++++++++++ 6 files changed, 25 insertions(+), 5 deletions(-) copy config/rootfiles/{oldcore/125 => core/186}/filelists/collectd (100%) create mode 100644 src/patches/collectd/collectd-4.10.9-cpufreq_skip_disabled_cores.patch Difference in files: diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 9f7abd58f1..f6d9ede285 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.23-ipfire Kernel Configuration +# Linux/x86 6.6.24-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -176,7 +176,7 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" -CONFIG_GCC11_NO_ARRAY_BOUNDS=y +CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_CGROUPS=y diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index be499ef5f3..e74e1f98c2 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -8191,7 +8191,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/FW_LOADER_USER_HELPER #lib/modules/KVER-ipfire/build/include/config/GACT_PROB #lib/modules/KVER-ipfire/build/include/config/GARP -#lib/modules/KVER-ipfire/build/include/config/GCC11_NO_ARRAY_BOUNDS +#lib/modules/KVER-ipfire/build/include/config/GCC10_NO_ARRAY_BOUNDS #lib/modules/KVER-ipfire/build/include/config/GCC_ASM_GOTO_OUTPUT_WORKAROUND #lib/modules/KVER-ipfire/build/include/config/GCC_PLUGINS #lib/modules/KVER-ipfire/build/include/config/GCC_VERSION diff --git a/config/rootfiles/core/186/filelists/collectd b/config/rootfiles/core/186/filelists/collectd new file mode 120000 index 0000000000..871b32f14b --- /dev/null +++ b/config/rootfiles/core/186/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/lfs/collectd b/lfs/collectd index 5c4236b3af..24f5bc632e 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -103,12 +103,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0020-openvpn-Make-read-functions-robust-like-in-8516f9abb.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd/collectd-4.10.9-cpufreq_skip_disabled_cores.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10.9-xfs-compile-fix.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10-libiptc-build-fixes.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10-drop-linux-disk-module.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10.9-fix-glibc-headers.patch + cd $(DIR_APP) && autoupdate -v configure.in cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/lfs/linux b/lfs/linux index 9383a32968..f5ef18d622 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.23 +VER = 6.6.24 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = b00e2c084f9d7a4fcda0a9404fd897ca1fc90d660dd1063d699c8ec612c6a35c494ce14c91f458a1f77f2a70ce6612e019e5fc553b571ee669b5070f97841a02 +$(DL_FILE)_BLAKE2 = 0f4643c758bb3857396f08b0cc291e1cf7cc7d120fe53791ba8cdaa32f08f20822353e04464551b88e8de64e367de6900da01504e57bc684d47390b51d001285 install : $(TARGET) diff --git a/src/patches/collectd/collectd-4.10.9-cpufreq_skip_disabled_cores.patch b/src/patches/collectd/collectd-4.10.9-cpufreq_skip_disabled_cores.patch new file mode 100644 index 0000000000..e8851b6c7e --- /dev/null +++ b/src/patches/collectd/collectd-4.10.9-cpufreq_skip_disabled_cores.patch @@ -0,0 +1,18 @@ +diff -Naur collectd-4.10.9.org/src/cpufreq.c collectd-4.10.9/src/cpufreq.c +--- collectd-4.10.9.org/src/cpufreq.c 2013-04-08 08:26:17.000000000 +0200 ++++ collectd-4.10.9/src/cpufreq.c 2024-04-04 15:33:52.705372940 +0200 +@@ -104,12 +104,9 @@ + + if (fgets (buffer, 16, fp) == NULL) + { +- char errbuf[1024]; +- WARNING ("cpufreq: fgets: %s", +- sstrerror (errno, errbuf, +- sizeof (errbuf))); + fclose (fp); +- return (-1); ++ cpufreq_submit (i, NAN); ++ break; + } + + if (fclose (fp)) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 62db0b5320a0958b1677191bc177e5dbdaa8d608
by Arne Fitzenreiter 03 Apr '24

03 Apr '24

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 62db0b5320a0958b1677191bc177e5dbdaa8d608 (commit) via b25236acf75f47999bc01885c35a0fc80a782023 (commit) via e348f67fa68d34c35a9bab12bd9c8acfc2cadf0f (commit) via 6da6f5dbe2d31c920b4cd1e21d3c3abe0ed1f267 (commit) via ed91103e229b128288a9799a9bbbbe6cd1d7f32d (commit) from 5f04e70f746261430f4600de2e5bff6922a7a511 (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 62db0b5320a0958b1677191bc177e5dbdaa8d608 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 2 19:36:46 2024 +0000 core186: add grub-btrfs initskript changes to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b25236acf75f47999bc01885c35a0fc80a782023 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Mar 27 20:39:20 2024 +0100 grub-btrfsd: Drop redundant used PIDFILE mechanism This case is already covered by the PID mechanism of the used functions Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e348f67fa68d34c35a9bab12bd9c8acfc2cadf0f Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Mar 27 20:39:19 2024 +0100 grub-btrfsd: Adjust displayed starting message Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 6da6f5dbe2d31c920b4cd1e21d3c3abe0ed1f267 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Mar 27 20:39:18 2024 +0100 grub-btrfsd: Use generic volume_fs_type function for FS detection Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit ed91103e229b128288a9799a9bbbbe6cd1d7f32d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Mar 27 20:39:17 2024 +0100 initscripts: Add generic function to get the filesystem type of a volume Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/186/filelists/files | 5 +++++ src/initscripts/system/functions | 8 ++++++++ src/initscripts/system/grub-btrfsd | 21 ++++++++------------- 3 files changed, 21 insertions(+), 13 deletions(-) Difference in files: diff --git a/config/rootfiles/core/186/filelists/files b/config/rootfiles/core/186/filelists/files index 00198bcc3..86c9d666a 100644 --- a/config/rootfiles/core/186/filelists/files +++ b/config/rootfiles/core/186/filelists/files @@ -1 +1,6 @@ +etc/rc.d/init.d/functions +etc/rc.d/init.d/grub-btrfsd +etc/rc.d/rc0.d/K01grub-btrfsd +etc/rc.d/rc3.d/S99grub-btrfsd +etc/rc.d/rc6.d/K01grub-btrfsd srv/web/ipfire/cgi-bin/vulnerabilities.cgi diff --git a/src/initscripts/system/functions b/src/initscripts/system/functions index 5a26aef45..b610143ab 100644 --- a/src/initscripts/system/functions +++ b/src/initscripts/system/functions @@ -883,3 +883,11 @@ running_on_oci() { # We are not running on OCI return 1 } + +volume_fs_type() { + if [ ! -d "${1}" ]; then + return + fi + + stat -f --format="%T" ${1} +} diff --git a/src/initscripts/system/grub-btrfsd b/src/initscripts/system/grub-btrfsd index dc5e32ad4..49073a807 100644 --- a/src/initscripts/system/grub-btrfsd +++ b/src/initscripts/system/grub-btrfsd @@ -25,27 +25,22 @@ SNAPSHOTDIR="/.snapshots" PIDFILE="/run/grub-btrfsd.pid" -root_is_btrfs() { - [ "$(stat -f --format="%T" /)" == "btrfs" ] || return 1 - - return 0 -} - case "$1" in start) - root_is_btrfs || exit 0 + root_fs_type=$(volume_fs_type "/") - boot_mesg "Starting Grub/Btrfs snapshot manager..." - loadproc -b -p "$PIDFILE" /usr/bin/grub-btrfsd --syslog "$SNAPSHOTDIR" + case "$root_fs_type" in + btrfs) - # Store the gained PID to the defined pidfile - echo "$!" > "$PIDFILE" + boot_mesg "Starting GRUB/Btrfs Daemon..." + loadproc -b /usr/bin/grub-btrfsd --syslog "$SNAPSHOTDIR" + ;; + esac ;; stop) boot_mesg "Stopping grub-btrfsd..." - killproc -p "$PIDFILE" /usr/bin/grub-btrfsd - sleep 1; + killproc /usr/bin/grub-btrfsd ;; restart) hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM April 2024