Skip to content

Commit

Permalink
Fix bug in timeout call introduced in v1.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
aw committed Jan 20, 2021
1 parent ac1e4fa commit 6f2b7d5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 1.11.1 (2021-01-20)

* [bugfix] Fix bug in timeout call introduced in v1.11.0

## 1.11.0 (2021-01-19)

* Add backward compatible bugfix for newer versions of Busybox 'timeout'
Expand Down
2 changes: 1 addition & 1 deletion module.l
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[de MODULE_INFO
("name" "tinycore-network")
("version" "1.11.0")
("version" "1.11.1")
("summary" "TinyCore static/dhcp networking")
("source" "https://on-premises.com")
("author" "Alexander Williams")
Expand Down
4 changes: 2 additions & 2 deletions network.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# MIT License
# Copyright (c) 2015-2021 Alexander Williams, Unscramble <license@unscramble.jp>
#
# VERSION: 1.11.0
# VERSION: 1.11.1

. /etc/init.d/tc-functions
set -a
Expand Down Expand Up @@ -36,7 +36,7 @@ set_ntpdate() {
if [ "$?" = 1 ]; then
dasht=""
fi
/usr/bin/timeout "$dasht" $ntpretry /usr/sbin/ntpd -d -n -q -p "$ntpserver" >>/var/log/ntp.log 2>&1 || set_ntpdate
/usr/bin/timeout $dasht $ntpretry /usr/sbin/ntpd -d -n -q -p "$ntpserver" >>/var/log/ntp.log 2>&1 || set_ntpdate
else
return 1
fi
Expand Down

0 comments on commit 6f2b7d5

Please sign in to comment.