Skip to content

Commit 99c87d0

Browse files
authored
Merge pull request #1165 from kernelkit/misc
Misc fixes
2 parents 2f13fc7 + 3a164e2 commit 99c87d0

File tree

56 files changed

+350
-1529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+350
-1529
lines changed

board/common/rootfs/etc/bash.bashrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ log()
3535
{
3636
local fn="/var/log/syslog"
3737
[ -n "$1" ] && fn="/var/log/$1"
38-
less +G "$fn"
38+
less +G -r "$fn"
3939
}
4040

4141
follow()
4242
{
4343
local fn="/var/log/syslog"
4444
[ -n "$1" ] && fn="/var/log/$1"
45-
tail -F "$fn"
45+
less +F -r "$fn"
4646
}
4747

4848
_logfile_completions()
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
service name:netopeer notify:none log env:/etc/default/confd \
2+
[12345] <pid/confd> netopeer2-server -F -t $CONFD_TIMEOUT -v 1 \
3+
-- NETCONF server
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Use <pid/syslogd> as barrier for other system tasks and service that
22
# rely on modules, firmware, and device nodes to be ready.
33
service if:udevd nowarn env:-/etc/default/sysklogd <run/udevadm:post/success> \
4-
[S0123456789] syslogd -F $SYSLOGD_ARGS -- System log daemon
4+
[S0123456789] syslogd -8 -F $SYSLOGD_ARGS -- System log daemon
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../available/netconf.conf

board/common/rootfs/usr/bin/pager

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
# -K :: exit immediately when an interrupt character (usually ^C) is typed
66
# -R :: Almost raw control charachters, only ANSI color escape sequences and
77
# OSC 8 hyperlink sequences are output. Allows veritcal scrolling
8+
# -r :: Causes "raw" control characters to be displayed, including unicode.
89
# -X :: No termcap initialization and deinitialization set to the terminal.
910
# This is what leaves the contents of the output on screen.
1011

1112
export LESS="-P %f (press h for help or q to quit)"
1213
export LANG=en_US.UTF-8
1314

14-
less -RIKd -FX "$@"
15+
less -rIKd -FX "$@"

doc/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ All notable changes to the project are documented in this file.
1717
- Add neofetch system information tool for system introspection, issue #1143
1818
- Add mtr and iperf3 network diagnostic tools, issue #1144
1919
- Improve default bash settings with better history handling and tab completion
20+
- cli: new `terminal reset` and `terminal resize` convenience commands
2021

2122
### Fixes
2223
- Fix #1100: Reduce DHCP client logging verbosity by 70% and include interface
2324
names in log messages for easier troubleshooting
2425
- Fix #1119: CLI UX regression, restore proper behavior for `no enabled` command
2526
- Fix #1155: `show ospf` commands regression
2627
- Fix #1150: show-legacy wrapper permissions
28+
- Fixes for unicode translation in log and pager outputs as well as `syslogd`
2729

2830
[BPI-R3]: https://wiki.banana-pi.org/Banana_Pi_BPI-R3
2931

package/confd/confd.conf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,3 @@ run name:failure log:prio:user.crit norestart env:/etc/default/confd \
2525
run name:error :2 log:console norestart \
2626
if:<run/failure/failure> \
2727
[S] /usr/libexec/confd/error --
28-
29-
service name:netopeer notify:none log env:/etc/default/confd \
30-
[12345] <pid/confd> netopeer2-server -F -t $CONFD_TIMEOUT -v 1 \
31-
-- NETCONF server

package/nghttp2-asio/Config.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ config BR2_PACKAGE_NGHTTP2_ASIO
55
select BR2_PACKAGE_BOOST
66
help
77
C++ bindings for nghttp2
8+
9+
This is the CESNET fork of nghttp2-asio, introduced here:
10+
https://github.com/CESNET/rousette/commit/fff3429
11+
12+
https://github.com/CESNET/nghttp2-asio
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# Locally calculated
22
sha256 6b94f3abc1aabd0c72a7c7d92a77f79dda7c8a0cb3df839a97890b4116a2de2a COPYING
3-
sha256 d971c538a31eae5714d2434d90f86794f267615e85e8d2bb0c383e83c300e1ce nghttp2-asio-e877868abe06a83ed0a6ac6e245c07f6f20866b5-git4.tar.gz
4-
3+
sha256 883af672c1d210398170749a8ccda30103b2894bcd4eccd80f36771aad0b15c3 nghttp2-asio-2173b82e6caa85950c769eecc5da6809faadf61a-git4.tar.gz

package/nghttp2-asio/nghttp2-asio.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55
################################################################################
66

7-
NGHTTP2_ASIO_VERSION = e877868abe06a83ed0a6ac6e245c07f6f20866b5
8-
NGHTTP2_ASIO_SITE = https://github.com/kernelkit/nghttp2-asio.git
7+
NGHTTP2_ASIO_VERSION = 2173b82e6caa85950c769eecc5da6809faadf61a
8+
NGHTTP2_ASIO_SITE = https://github.com/CESNET/nghttp2-asio
99
NGHTTP2_ASIO_SITE_METHOD = git
1010
NGHTTP2_ASIO_LICENSE = MIT
1111
NGHTTP2_ASIO_LICENSE_FILES = COPYING

0 commit comments

Comments
 (0)