]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge branch 'next'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 10 Feb 2024 11:43:56 +0000 (11:43 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 10 Feb 2024 11:43:56 +0000 (11:43 +0000)
config/rootfiles/oldcore/183/filelists/aarch64/glibc [new symlink]
config/rootfiles/oldcore/183/filelists/libhtp [new symlink]
config/rootfiles/oldcore/183/filelists/riscv64/glibc [new symlink]
config/rootfiles/oldcore/183/filelists/suricata [new symlink]
config/rootfiles/oldcore/183/filelists/x86_64/glibc [new symlink]
config/rootfiles/oldcore/183/update.sh

diff --git a/config/rootfiles/oldcore/183/filelists/aarch64/glibc b/config/rootfiles/oldcore/183/filelists/aarch64/glibc
new file mode 120000 (symlink)
index 0000000..d13849f
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/aarch64/glibc
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/183/filelists/libhtp b/config/rootfiles/oldcore/183/filelists/libhtp
new file mode 120000 (symlink)
index 0000000..676e2c5
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libhtp
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/183/filelists/riscv64/glibc b/config/rootfiles/oldcore/183/filelists/riscv64/glibc
new file mode 120000 (symlink)
index 0000000..36b731f
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/riscv64/glibc
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/183/filelists/suricata b/config/rootfiles/oldcore/183/filelists/suricata
new file mode 120000 (symlink)
index 0000000..f671f69
--- /dev/null
@@ -0,0 +1 @@
+../../../common/suricata
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/183/filelists/x86_64/glibc b/config/rootfiles/oldcore/183/filelists/x86_64/glibc
new file mode 120000 (symlink)
index 0000000..1119099
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/x86_64/glibc
\ No newline at end of file
index 77446311a00334500a6a1802412246852decd3a0..6d1e1fd2538a5d4115787cacb3dcbd14e4c28911 100644 (file)
@@ -113,6 +113,9 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Relaunch init
+telinit u
+
 # Apply local configuration to sshd_config
 /usr/local/bin/sshctrl
 
@@ -143,7 +146,7 @@ fi
 if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
        /etc/rc.d/init.d/ipsec start
 fi
-
+/etc/init.d/suricata restart
 
 # Rebuild initial ramdisks
 dracut --regenerate-all --force