Skip to contentSkip to conversation

busybox: add watchdog daemon startup script

PATCH Superseded Fabio Porcedda 2 participants 3 messages Feb 13, 2012 – Feb 23, 2012

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Fabio Porcedda

author
#0 lore raw

PATCH v4 1/1 busybox: add watchdog daemon startup script

Signed-off-by Fabio Porcedda <[email protected]>

---
Changes for v4:
- Add the config modifier to force-enable the watchdog daemon, as asked by Arnout Vandecappelle.

Changes for v3:
- Changed the default value in the script, as asked by Jean-Christophe.

Changes for v2:
- Add the option to set the reset frequency, as asked by Arnout Vandecappelle.

 package/busybox/Config.in   |   17 +++++++++++++++++
 package/busybox/S15watchdog |   20 ++++++++++++++++++++
 package/busybox/busybox.mk  |   15 +++++++++++++++
 3 files changed, 52 insertions(+), 0 deletions(-)
 create mode 100644 package/busybox/S15watchdog
package/busybox/Config.in +17 -0
index 4176020..a12f9b8 100644
@@ -62,6 +62,23 @@ config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	  Show packages in menuconfig that are potentially also provided
 	  by busybox.
 
+config BR2_PACKAGE_BUSYBOX_WATCHDOG
+	bool "Install the watchdog daemon startup script"
+	help
+	  Install the watchdog daemon startup script,
+	  that just start at the boot the busybox watchdog daemon.
+
+if BR2_PACKAGE_BUSYBOX_WATCHDOG
+
+config BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD
+	int "Delay between reset"
+	default "5"
+	help
+	  Select the number of seconds between each
+	  reset of the watchdog (default 5)
+
+endif
+
 endif
 
 if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else
package/busybox/S15watchdog new file +20 -0
new file mode 100644
index 0000000..7f1110c
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Start watchdog
+#
+
+case "$1" in
+ start)
+	echo "Starting watchdog..."
+	watchdog -t PERIOD /dev/watchdog
+	;;
+  stop)
+	;;
+  restart|reload)
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?
package/busybox/busybox.mk +15 -0
index 59448d5..1d988f8 100644
@@ -142,6 +142,19 @@ define BUSYBOX_INSTALL_LOGGING_SCRIPT
 	else rm -f $(TARGET_DIR)/etc/init.d/S01logging; fi
 endef
 
+ifeq ($(BR2_PACKAGE_BUSYBOX_WATCHDOG),y)
+define BUSYBOX_SET_WATCHDOG
+        $(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG,$(BUSYBOX_BUILD_CONFIG))
+endef
+define BUSYBOX_INSTALL_WATCHDOG_SCRIPT
+	[ -f $(TARGET_DIR)/etc/init.d/S15watchdog ] || \
+		install -D -m 0755 package/busybox/S15watchdog \
+			$(TARGET_DIR)/etc/init.d/S15watchdog && \
+		sed -i s/PERIOD/$(BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD)/ \
+			$(TARGET_DIR)/etc/init.d/S15watchdog
+endef
+endif
+
 # We do this here to avoid busting a modified .config in configure
 BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG
 

@@ -155,6 +168,7 @@ define BUSYBOX_CONFIGURE_CMDS
 	$(BUSYBOX_NETKITTELNET)
 	$(BUSYBOX_INTERNAL_SHADOW_PASSWORDS)
 	$(BUSYBOX_DISABLE_MMU_APPLETS)
+	$(BUSYBOX_SET_WATCHDOG)
 	@yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \
 		-C $(@D) oldconfig
 endef

@@ -172,6 +186,7 @@ define BUSYBOX_INSTALL_TARGET_CMDS
 	$(BUSYBOX_INSTALL_MDEV_SCRIPT)
 	$(BUSYBOX_INSTALL_MDEV_CONF)
 	$(BUSYBOX_INSTALL_LOGGING_SCRIPT)
+	$(BUSYBOX_INSTALL_WATCHDOG_SCRIPT)
 endef
 
 define BUSYBOX_UNINSTALL_TARGET_CMDS
Signature · 1 line
1.7.9
#1 lore raw

PATCH v4 1/1 busybox: add watchdog daemon startup script

Quoted 1 line · On Monday 13 February 2012 10:54:53 Fabio Porcedda wrote:
Signed-off-by Fabio Porcedda <[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Nice!

Regards,
Arnout

Signature · 9 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20120214/1b8f2da2/attachment-0001.html>
author
#2 lore raw

PATCH v4 1/1 busybox: add watchdog daemon startup script

Quoted 8 lines · Arnout Vandecappelle
Quoted 1 line · On Monday 13 February 2012 10:54:53 Fabio Porcedda wrote:
Signed-off-by Fabio Porcedda <[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Nice!

Thanks for the review and the acknowledgement.

There is some hope that this patch is included in the branch next?

Best regards

Signature · 10 lines
Fabio Porcedda
Software Developer - R&D Cagliari

Telit Communications S.p.A.
Loc. Sa Illetta, SS 195, Km 2.300
09122 Cagliari - Italy
Phone: +39 070 4603 247
Fax:   +39 070 4603 250
Skype: fabiopo_telit
http://www.telit.com