From c6ad4bc546ea68af7134950efb45fe896c8361de Mon Sep 17 00:00:00 2001 From: Sven Giermann Date: Mon, 23 Nov 2015 12:19:49 +0100 Subject: [PATCH 1/3] Add Default-Stop to init script Enabling the debian init-script reports the following warning: > update-rc.d: warning: default stop runlevel arguments (0 1 6) do not match ebusd Default-Stop values (none) This change tells update-rc.d to stop this service on shutdown. --- contrib/etc/init.d/ebusd.debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/etc/init.d/ebusd.debian b/contrib/etc/init.d/ebusd.debian index 87113bc1..628a6f64 100755 --- a/contrib/etc/init.d/ebusd.debian +++ b/contrib/etc/init.d/ebusd.debian @@ -5,7 +5,7 @@ # Required-Start: $network $remote_fs $syslog # Required-Stop: $network $remote_fs $syslog # Default-Start: 2 3 4 5 -# Default-Stop: +# Default-Stop: 0 1 6 # Short-Description: Start ebusd ### END INIT INFO From 349c73b7cfcb7993ab7243c020ed525d3de7d05c Mon Sep 17 00:00:00 2001 From: Sven Giermann Date: Tue, 24 Nov 2015 20:00:37 +0100 Subject: [PATCH 2/3] Fix return definition in writes Add 3 more commas to skip field2 definition before defining result type. Print empty field1 definition if len[i]<=0. --- contrib/scripts/makegrabcsv.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/scripts/makegrabcsv.sh b/contrib/scripts/makegrabcsv.sh index 2cc46f89..1943fed6 100755 --- a/contrib/scripts/makegrabcsv.sh +++ b/contrib/scripts/makegrabcsv.sh @@ -52,8 +52,10 @@ END { printf substr(id,1,idlen*2) ",,," zz "," pbsb "," substr(id,1,idlen*2) if (length(id)/2>idlen) printf ",data,,HEX:" (length(id)/2-idlen) + else + printf ",,," if (len[i]>1) - printf ",result,s,HEX:" (len[i]-1) + printf ",,,,result,s,HEX:" (len[i]-1) print "" } else { printf "r,unknown" zz "," From baf03e634872e7c4ada9fc71a96d9850e9535683 Mon Sep 17 00:00:00 2001 From: Sven Giermann Date: Tue, 24 Nov 2015 20:02:12 +0100 Subject: [PATCH 3/3] Sort lines before uniq Uniq needs sorted lines, so sort them first. --- contrib/scripts/makegrabcsv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/scripts/makegrabcsv.sh b/contrib/scripts/makegrabcsv.sh index 1943fed6..1e8b3a0d 100755 --- a/contrib/scripts/makegrabcsv.sh +++ b/contrib/scripts/makegrabcsv.sh @@ -65,4 +65,4 @@ END { } } } -'|uniq +'|sort|uniq