Skip to content

Commit

Permalink
board/pluto/S41network: Fix udhcpd restart PID file issue
Browse files Browse the repository at this point in the history
In recent versions of busybox PID file creation is now optional.
(CONFIG_FEATURE_PIDFILE). This patch enables it and makes sure the
file is created by udhcpd. Also remove -b and -m options.

This fixes #38

Signed-off-by: Michael Hennerich <[email protected]>
  • Loading branch information
mhennerich authored and commodo committed May 29, 2019
1 parent c43b307 commit 3fd7ac0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions board/m2k/busybox-1.25.0.config
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ CONFIG_FEATURE_DEVPTS=y
CONFIG_FEATURE_CLEAN_UP=y
CONFIG_FEATURE_UTMP=y
CONFIG_FEATURE_WTMP=y
# CONFIG_FEATURE_PIDFILE is not set
CONFIG_PID_FILE_PATH=""
CONFIG_FEATURE_PIDFILE=y
CONFIG_PID_FILE_PATH="/var/run"
CONFIG_FEATURE_SUID=y
# CONFIG_FEATURE_SUID_CONFIG is not set
# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
Expand Down
2 changes: 1 addition & 1 deletion board/pluto/S41network
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ source /etc/device_config
case "$1" in
start)
echo -n "Starting dhcpd Daemon & httpd Server: "
start-stop-daemon -S -b -q -m -p /var/run/udhcpd.pid -x /usr/sbin/udhcpd -- $UDHCPD_CONF
start-stop-daemon -S -q -p /var/run/udhcpd.pid -x /usr/sbin/udhcpd -- $UDHCPD_CONF
httpd -h /www
[ $? = 0 ] && echo "OK" || echo "FAIL"
;;
Expand Down
4 changes: 2 additions & 2 deletions board/pluto/busybox-1.25.0.config
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ CONFIG_FEATURE_DEVPTS=y
CONFIG_FEATURE_CLEAN_UP=y
CONFIG_FEATURE_UTMP=y
CONFIG_FEATURE_WTMP=y
# CONFIG_FEATURE_PIDFILE is not set
CONFIG_PID_FILE_PATH=""
CONFIG_FEATURE_PIDFILE=y
CONFIG_PID_FILE_PATH="/var/run"
CONFIG_FEATURE_SUID=y
# CONFIG_FEATURE_SUID_CONFIG is not set
# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
Expand Down

0 comments on commit 3fd7ac0

Please sign in to comment.