Skip to content

Commit 6f2b7d5

Browse files
committed
Fix bug in timeout call introduced in v1.11.0
1 parent ac1e4fa commit 6f2b7d5

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 1.11.1 (2021-01-20)
4+
5+
* [bugfix] Fix bug in timeout call introduced in v1.11.0
6+
37
## 1.11.0 (2021-01-19)
48

59
* Add backward compatible bugfix for newer versions of Busybox 'timeout'

module.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[de MODULE_INFO
22
("name" "tinycore-network")
3-
("version" "1.11.0")
3+
("version" "1.11.1")
44
("summary" "TinyCore static/dhcp networking")
55
("source" "https://on-premises.com")
66
("author" "Alexander Williams")

network.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# MIT License
66
# Copyright (c) 2015-2021 Alexander Williams, Unscramble <license@unscramble.jp>
77
#
8-
# VERSION: 1.11.0
8+
# VERSION: 1.11.1
99

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

0 commit comments

Comments
 (0)