From cf40fda60aa8a0d9bbc61bd6484313af9b453911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Wed, 4 Jul 2018 14:19:50 +0000 Subject: [PATCH] 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. --- config/kernel/linux-cubox-dev.config | 2 +- config/kernel/linux-cubox-next.config | 2 +- config/kernel/linux-meson-default.config | 2 +- config/kernel/linux-meson64-default.config | 2 +- config/kernel/linux-meson64-dev.config | 2 +- config/kernel/linux-meson64-next.config | 2 +- config/kernel/linux-mvebu-dev.config | 2 +- config/kernel/linux-mvebu-next.config | 10 +++++----- config/kernel/linux-odroidc1-default.config | 2 +- config/kernel/linux-odroidc1-dev.config | 2 +- config/kernel/linux-odroidxu4-default.config | 2 +- config/kernel/linux-odroidxu4-dev.config | 2 +- config/kernel/linux-odroidxu4-next.config | 2 +- config/kernel/linux-rk3328-default.config | 2 +- config/kernel/linux-rk3328-dev.config | 2 +- config/kernel/linux-rk3399-default.config | 2 +- config/kernel/linux-rockchip-default.config | 2 +- config/kernel/linux-rockchip-dev.config | 2 +- config/kernel/linux-rockchip-next.config | 2 +- config/kernel/linux-s5p6818-default.config | 2 +- config/kernel/linux-s5p6818-dev.config | 2 +- config/kernel/linux-s5p6818-next.config | 2 +- config/kernel/linux-sun4i-default.config | 2 +- config/kernel/linux-sun7i-default.config | 2 +- config/kernel/linux-sun8i-default.config | 2 +- config/kernel/linux-sun8i-dev.config | 2 +- config/kernel/linux-sunxi-dev.config | 2 +- config/kernel/linux-sunxi-next.config | 2 +- config/kernel/linux-sunxi64-dev.config | 2 +- config/kernel/linux-sunxi64-next.config | 2 +- config/kernel/linux-udoo-default.config | 2 +- config/kernel/linux-udoo-dev.config | 2 +- config/kernel/linux-udoo-neo-default.config | 2 +- config/kernel/linux-udoo-next.config | 2 +- packages/bsp/common/usr/lib/armbian/armbian-ramlog | 10 ++++++++++ 35 files changed, 48 insertions(+), 38 deletions(-) mode change 100755 => 100644 packages/bsp/common/usr/lib/armbian/armbian-ramlog diff --git a/config/kernel/linux-cubox-dev.config b/config/kernel/linux-cubox-dev.config index d1b5aee2de..18b5490dc1 100644 --- 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 diff --git a/config/kernel/linux-cubox-next.config b/config/kernel/linux-cubox-next.config index 9cd348ec98..4886ec2a3b 100644 --- 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 diff --git a/config/kernel/linux-meson-default.config b/config/kernel/linux-meson-default.config index 56ab875d5d..1485ee1155 100644 --- 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 diff --git a/config/kernel/linux-meson64-default.config b/config/kernel/linux-meson64-default.config index a257e8af00..5fc7005f9b 100644 --- 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 diff --git a/config/kernel/linux-meson64-dev.config b/config/kernel/linux-meson64-dev.config index fea28a8b3c..68518b530e 100644 --- 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 diff --git a/config/kernel/linux-meson64-next.config b/config/kernel/linux-meson64-next.config index 715343ac96..6740fa17a8 100644 --- 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 diff --git a/config/kernel/linux-mvebu-dev.config b/config/kernel/linux-mvebu-dev.config index 26a657e9aa..cda612c3ca 100644 --- 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 diff --git a/config/kernel/linux-mvebu-next.config b/config/kernel/linux-mvebu-next.config index 9cb8aface3..91fd60f9a3 100644 --- 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 diff --git a/config/kernel/linux-odroidc1-default.config b/config/kernel/linux-odroidc1-default.config index 580292ff5e..ca3c499f37 100644 --- 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 diff --git a/config/kernel/linux-odroidc1-dev.config b/config/kernel/linux-odroidc1-dev.config index a775b5e117..2a20ef3af5 100644 --- 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 diff --git a/config/kernel/linux-odroidxu4-default.config b/config/kernel/linux-odroidxu4-default.config index e7307c2531..8e7ace0d9f 100644 --- 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 diff --git a/config/kernel/linux-odroidxu4-dev.config b/config/kernel/linux-odroidxu4-dev.config index f930e7c47c..826dd797fa 100644 --- 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 diff --git a/config/kernel/linux-odroidxu4-next.config b/config/kernel/linux-odroidxu4-next.config index f5452d65c3..b3a17d044f 100644 --- 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 diff --git a/config/kernel/linux-rk3328-default.config b/config/kernel/linux-rk3328-default.config index 970f3343a1..75af5191ec 100644 --- 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 diff --git a/config/kernel/linux-rk3328-dev.config b/config/kernel/linux-rk3328-dev.config index eb38078657..01b2516e5a 100644 --- 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 diff --git a/config/kernel/linux-rk3399-default.config b/config/kernel/linux-rk3399-default.config index ac4b63d3c0..4b80ef8001 100644 --- 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 diff --git a/config/kernel/linux-rockchip-default.config b/config/kernel/linux-rockchip-default.config index 3dbb2072a0..827add3641 100644 --- 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 diff --git a/config/kernel/linux-rockchip-dev.config b/config/kernel/linux-rockchip-dev.config index ccbb2bc7d2..404aaaf5bb 100644 --- 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 diff --git a/config/kernel/linux-rockchip-next.config b/config/kernel/linux-rockchip-next.config index 458bdb36ce..fb5dbae9c4 100644 --- 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 diff --git a/config/kernel/linux-s5p6818-default.config b/config/kernel/linux-s5p6818-default.config index d015102707..c30b7d99dc 100644 --- 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 diff --git a/config/kernel/linux-s5p6818-dev.config b/config/kernel/linux-s5p6818-dev.config index 6504a5b055..17eb25825a 100644 --- 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 diff --git a/config/kernel/linux-s5p6818-next.config b/config/kernel/linux-s5p6818-next.config index 590121e384..d118c93b70 100644 --- 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 diff --git a/config/kernel/linux-sun4i-default.config b/config/kernel/linux-sun4i-default.config index 5978064d69..4b0b9a397b 100644 --- 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 diff --git a/config/kernel/linux-sun7i-default.config b/config/kernel/linux-sun7i-default.config index e0257a4640..58c32acec2 100644 --- 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 diff --git a/config/kernel/linux-sun8i-default.config b/config/kernel/linux-sun8i-default.config index 65a5f10518..ae6f31b138 100644 --- 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 diff --git a/config/kernel/linux-sun8i-dev.config b/config/kernel/linux-sun8i-dev.config index 71ea0430ed..0307298499 100644 --- 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 diff --git a/config/kernel/linux-sunxi-dev.config b/config/kernel/linux-sunxi-dev.config index f0aa4b4bd5..5ce0334902 100644 --- 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 diff --git a/config/kernel/linux-sunxi-next.config b/config/kernel/linux-sunxi-next.config index f61d5ec408..05f0fc086c 100644 --- 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 diff --git a/config/kernel/linux-sunxi64-dev.config b/config/kernel/linux-sunxi64-dev.config index e449ef087b..d8a5626ebb 100644 --- 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 diff --git a/config/kernel/linux-sunxi64-next.config b/config/kernel/linux-sunxi64-next.config index c80eff5f9c..afdfb7e739 100644 --- 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 diff --git a/config/kernel/linux-udoo-default.config b/config/kernel/linux-udoo-default.config index 7559e067af..77f0ba6a66 100644 --- 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 diff --git a/config/kernel/linux-udoo-dev.config b/config/kernel/linux-udoo-dev.config index b5b6fb8832..778684a78f 100644 --- 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 diff --git a/config/kernel/linux-udoo-neo-default.config b/config/kernel/linux-udoo-neo-default.config index e4ac7b724a..49e14246c7 100644 --- 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 diff --git a/config/kernel/linux-udoo-next.config b/config/kernel/linux-udoo-next.config index 13b3837c49..bb82565e70 100644 --- 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 diff --git a/packages/bsp/common/usr/lib/armbian/armbian-ramlog b/packages/bsp/common/usr/lib/armbian/armbian-ramlog old mode 100755 new mode 100644 index 4083f5663b..11e46e6762 --- 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)