Add OMV 4 module dependencies and a workaround for ram2log that OMV can make use ZRAM powered ramlog. It is also helpful in case of sudden crash. Nginx can't start without log places into its subdir. We create them on start.

2025-03-16 11:51:36 +00:00 · 2018-07-04 14:19:50 +00:00 · 2018-07-04 14:19:50 +00:00 · cf40fda60a
commit cf40fda60a
parent 1815b18cef
35 changed files with 48 additions and 38 deletions
--- a/config/kernel/linux-cubox-dev.config
+++ b/config/kernel/linux-cubox-dev.config
@ -3252,7 +3252,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_DA9052_WATCHDOG is not set
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
--- a/config/kernel/linux-cubox-next.config
+++ b/config/kernel/linux-cubox-next.config
@ -3252,7 +3252,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_DA9052_WATCHDOG is not set
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
--- a/config/kernel/linux-meson-default.config
+++ b/config/kernel/linux-meson-default.config
@ -2605,7 +2605,7 @@ CONFIG_WATCHDOG_CORE=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_DW_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set

--- a/config/kernel/linux-meson64-default.config
+++ b/config/kernel/linux-meson64-default.config
@ -2804,7 +2804,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
--- a/config/kernel/linux-meson64-dev.config
+++ b/config/kernel/linux-meson64-dev.config
@ -2809,7 +2809,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
--- a/config/kernel/linux-meson64-next.config
+++ b/config/kernel/linux-meson64-next.config
@ -2814,7 +2814,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
--- a/config/kernel/linux-mvebu-dev.config
+++ b/config/kernel/linux-mvebu-dev.config
@ -3045,7 +3045,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
--- a/config/kernel/linux-mvebu-next.config
+++ b/config/kernel/linux-mvebu-next.config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.40 Kernel Configuration
+# Linux/arm 4.14.53 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@ -1170,6 +1170,9 @@ CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TABLES_IPV6=m
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
+CONFIG_NFT_REDIR_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@ -1177,10 +1180,7 @@ CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
 CONFIG_NF_NAT_IPV6=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
 CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@ -3061,7 +3061,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
--- a/config/kernel/linux-odroidc1-default.config
+++ b/config/kernel/linux-odroidc1-default.config
@ -2573,7 +2573,7 @@ CONFIG_WATCHDOG_CORE=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_DW_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set

--- a/config/kernel/linux-odroidc1-dev.config
+++ b/config/kernel/linux-odroidc1-dev.config
@ -3386,7 +3386,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 CONFIG_DA9063_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 CONFIG_XILINX_WATCHDOG=y
--- a/config/kernel/linux-odroidxu4-default.config
+++ b/config/kernel/linux-odroidxu4-default.config
@ -2035,7 +2035,7 @@ CONFIG_WATCHDOG_CORE=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_ARM_SP805_WATCHDOG is not set
 CONFIG_HAVE_S3C2410_WATCHDOG=y
 CONFIG_S3C2410_WATCHDOG=m
--- a/config/kernel/linux-odroidxu4-dev.config
+++ b/config/kernel/linux-odroidxu4-dev.config
@ -2875,7 +2875,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
--- a/config/kernel/linux-odroidxu4-next.config
+++ b/config/kernel/linux-odroidxu4-next.config
@ -2857,7 +2857,7 @@ CONFIG_WATCHDOG_CORE=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
--- a/config/kernel/linux-rk3328-default.config
+++ b/config/kernel/linux-rk3328-default.config
@ -2786,7 +2786,7 @@ CONFIG_WATCHDOG=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ARM_SP805_WATCHDOG is not set
--- a/config/kernel/linux-rk3328-dev.config
+++ b/config/kernel/linux-rk3328-dev.config
@ -2469,7 +2469,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
--- a/config/kernel/linux-rk3399-default.config
+++ b/config/kernel/linux-rk3399-default.config
@ -2392,7 +2392,7 @@ CONFIG_WATCHDOG=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ARM_SP805_WATCHDOG is not set
--- a/config/kernel/linux-rockchip-default.config
+++ b/config/kernel/linux-rockchip-default.config
@ -2569,7 +2569,7 @@ CONFIG_WATCHDOG_CORE=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ARM_SP805_WATCHDOG is not set
--- a/config/kernel/linux-rockchip-dev.config
+++ b/config/kernel/linux-rockchip-dev.config
@ -2668,7 +2668,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
--- a/config/kernel/linux-rockchip-next.config
+++ b/config/kernel/linux-rockchip-next.config
@ -2680,7 +2680,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
--- a/config/kernel/linux-s5p6818-default.config
+++ b/config/kernel/linux-s5p6818-default.config
@ -2169,7 +2169,7 @@ CONFIG_WATCHDOG_CORE=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ARM_SP805_WATCHDOG is not set
--- a/config/kernel/linux-s5p6818-dev.config
+++ b/config/kernel/linux-s5p6818-dev.config
@ -2515,7 +2515,7 @@ CONFIG_WATCHDOG_CORE=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
--- a/config/kernel/linux-s5p6818-next.config
+++ b/config/kernel/linux-s5p6818-next.config
@ -2226,7 +2226,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
--- a/config/kernel/linux-sun4i-default.config
+++ b/config/kernel/linux-sun4i-default.config
@ -2112,7 +2112,7 @@ CONFIG_WATCHDOG=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_ARM_SP805_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
--- a/config/kernel/linux-sun7i-default.config
+++ b/config/kernel/linux-sun7i-default.config
@ -2285,7 +2285,7 @@ CONFIG_WATCHDOG=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_ARM_SP805_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
 # CONFIG_MPCORE_WATCHDOG is not set
--- a/config/kernel/linux-sun8i-default.config
+++ b/config/kernel/linux-sun8i-default.config
@ -2199,7 +2199,7 @@ CONFIG_WATCHDOG=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_DW_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
 CONFIG_SUNXI_WDT=y
--- a/config/kernel/linux-sun8i-dev.config
+++ b/config/kernel/linux-sun8i-dev.config
@ -2981,7 +2981,7 @@ CONFIG_WATCHDOG_CORE=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 CONFIG_DA9062_WATCHDOG=m
 CONFIG_GPIO_WATCHDOG=m
 # CONFIG_XILINX_WATCHDOG is not set
--- a/config/kernel/linux-sunxi-dev.config
+++ b/config/kernel/linux-sunxi-dev.config
@ -3291,7 +3291,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_DA9052_WATCHDOG is not set
 # CONFIG_DA9055_WATCHDOG is not set
 # CONFIG_DA9063_WATCHDOG is not set
--- a/config/kernel/linux-sunxi-next.config
+++ b/config/kernel/linux-sunxi-next.config
@ -3091,7 +3091,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 CONFIG_GPIO_WATCHDOG=m
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
--- a/config/kernel/linux-sunxi64-dev.config
+++ b/config/kernel/linux-sunxi64-dev.config
@ -2770,7 +2770,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
--- a/config/kernel/linux-sunxi64-next.config
+++ b/config/kernel/linux-sunxi64-next.config
@ -2871,7 +2871,7 @@ CONFIG_WATCHDOG_SYSFS=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
--- a/config/kernel/linux-udoo-default.config
+++ b/config/kernel/linux-udoo-default.config
@ -2145,7 +2145,7 @@ CONFIG_WATCHDOG=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_DA9052_WATCHDOG is not set
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
--- a/config/kernel/linux-udoo-dev.config
+++ b/config/kernel/linux-udoo-dev.config
@ -2522,7 +2522,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_DA9052_WATCHDOG is not set
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
--- a/config/kernel/linux-udoo-neo-default.config
+++ b/config/kernel/linux-udoo-neo-default.config
@ -2051,7 +2051,7 @@ CONFIG_WATCHDOG=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
--- a/config/kernel/linux-udoo-next.config
+++ b/config/kernel/linux-udoo-next.config
@ -2367,7 +2367,7 @@ CONFIG_WATCHDOG_CORE=y
 #
 # Watchdog Device Drivers
 #
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
 # CONFIG_DA9052_WATCHDOG is not set
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
--- a/packages/bsp/common/usr/lib/armbian/armbian-ramlog
+++ b/packages/bsp/common/usr/lib/armbian/armbian-ramlog
@ -26,6 +26,15 @@ isSafe () {
    [ -d $HDD_LOG ] || exit 1
 }

+RecreateLogs (){
+	# in case of crash those services doesn't start if there are no dirs & logs
+	[ ! -d /var/log/proftpd ] && mkdir -p /var/log/proftpd
+	[ ! -d /var/log/nginx ] && mkdir -p /var/log/nginx
+	[ ! -f /var/log/proftpd/controls.log ] && touch /var/log/proftpd/controls.log
+	[ ! -f /var/log/nginx/access.log ] && touch /var/log/nginx/access.log
+	[ ! -f /var/log/nginx/error.log ] && touch /var/log/nginx/error.log
+}
+
 syncToDisk () {
    isSafe

@ -61,6 +70,7 @@ case "$1" in
 		mount -t tmpfs -o nosuid,noexec,nodev,mode=0755,size=$SIZE armbian-ramlog $RAM_LOG | $LOG_OUTPUT
      fi
      syncFromDisk
+	  RecreateLogs
      ;;

  stop)