Skip to content

Commit 197bb15

Browse files
authored
Merge pull request #1159 from kernelkit/misc
Misc fixes
2 parents 1989eff + b18a719 commit 197bb15

File tree

18 files changed

+259
-20
lines changed

18 files changed

+259
-20
lines changed

.github/workflows/trigger.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
- ci-work
1010
workflow_dispatch:
1111

12+
concurrency:
13+
group: ci-${{ github.event.pull_request.number || github.ref }}
14+
cancel-in-progress: true
15+
1216
jobs:
1317
build-x86_64:
1418
if: startsWith(github.repository, 'kernelkit/')

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ high-throughput network appliances.
148148
<br />Infix development is sponsored by <a href="https://wires.se">Wires</a>
149149
</div>
150150
151+
![Alt](https://repobeats.axiom.co/api/embed/5ce7a2a67edc923823afa0f60c327a6e8575b6e9.svg "Repobeats analytics image")
152+
151153
[1]: https://buildroot.org/ "Buildroot Homepage"
152154
[2]: https://www.sysrepo.org/ "Sysrepo Homepage"
153155
[3]: https://kernelkit.org/infix/latest/cli/introduction/

board/common/rootfs/etc/bash.bashrc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,22 @@ export PROMPT_COMMAND=prompt_command
1515
# update the values of LINES and COLUMNS.
1616
shopt -s checkwinsize
1717

18+
# don't put duplicate lines or lines starting with space in the history.
19+
export HISTCONTROL=ignoreboth
20+
21+
# append to the history file, don't overwrite it
22+
shopt -s histappend
23+
24+
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
25+
export HISTSIZE=1000
26+
export HISTFILESIZE=2000
27+
28+
# case-insensitive filename completion
29+
bind "set completion-ignore-case on"
30+
31+
# show all completions immediately instead of ringing bell
32+
bind "set show-all-if-ambiguous on"
33+
1834
log()
1935
{
2036
local fn="/var/log/syslog"

board/common/rootfs/etc/inputrc

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# /etc/inputrc - global inputrc for libreadline
2+
3+
# Be 8 bit clean.
4+
set input-meta on
5+
set output-meta on
6+
7+
# To allow the use of 8bit-characters like the german umlauts, uncomment
8+
# the line below. However this makes the meta key not work as a meta key,
9+
# which is annoying to those which don't need to type in 8-bit characters.
10+
11+
# set convert-meta off
12+
13+
# try to enable the application keypad when it is called. Some systems
14+
# need this to enable the arrow keys.
15+
# set enable-keypad on
16+
17+
# see /usr/share/doc/bash/inputrc.arrows for other codes of arrow keys
18+
19+
# do not bell on tab-completion
20+
# set bell-style none
21+
# set bell-style visible
22+
23+
# some defaults / modifications for the emacs mode
24+
$if mode=emacs
25+
26+
# allow the use of the Home/End keys
27+
"\e[1~": beginning-of-line
28+
"\e[4~": end-of-line
29+
30+
# allow the use of the Delete/Insert keys
31+
"\e[3~": delete-char
32+
"\e[2~": quoted-insert
33+
34+
# mappings for "page up" and "page down" to step to the beginning/end
35+
# of the history
36+
# "\e[5~": beginning-of-history
37+
# "\e[6~": end-of-history
38+
39+
# alternate mappings for "page up" and "page down" to search the history
40+
"\e[5~": history-search-backward
41+
"\e[6~": history-search-forward
42+
43+
# mappings for Ctrl-left-arrow and Ctrl-right-arrow for word moving
44+
"\e[1;5C": forward-word
45+
"\e[1;5D": backward-word
46+
"\e[5C": forward-word
47+
"\e[5D": backward-word
48+
"\e\e[C": forward-word
49+
"\e\e[D": backward-word
50+
51+
$if term=rxvt
52+
"\e[7~": beginning-of-line
53+
"\e[8~": end-of-line
54+
"\eOc": forward-word
55+
"\eOd": backward-word
56+
$endif
57+
58+
# for non RH/Debian xterm, can't hurt for RH/Debian xterm
59+
# "\eOH": beginning-of-line
60+
# "\eOF": end-of-line
61+
62+
# for freebsd console
63+
# "\e[H": beginning-of-line
64+
# "\e[F": end-of-line
65+
66+
$endif

board/common/rootfs/usr/bin/show-legacy

100644100755
File mode changed.

board/common/rootfs/usr/share/udhcpc/default.script

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,22 @@ fi
2323

2424
log()
2525
{
26-
logger -I $$ -t udhcpc -p user.notice "$*"
26+
logger -I $$ -t udhcpc -p user.notice "${interface}: $*"
27+
}
28+
29+
dbg()
30+
{
31+
logger -I $$ -t udhcpc -p user.debug "${interface}: $*"
32+
}
33+
34+
err()
35+
{
36+
logger -I $$ -t udhcpc -p user.err "${interface}: $*"
2737
}
2838

2939
wait_for_ipv6_default_route()
3040
{
31-
log "waiting for IPv6 default route to be installed."
41+
dbg "waiting for IPv6 default route to be installed."
3242
while [ $IF_WAIT_DELAY -gt 0 ]; do
3343
if ip -6 route list proto dhcp dev $interface | grep -q default; then
3444
return
@@ -37,7 +47,7 @@ wait_for_ipv6_default_route()
3747
printf "."
3848
: $((IF_WAIT_DELAY -= 1))
3949
done
40-
log "Timed out witing for IPv6 default route!"
50+
err "Timed out waiting for IPv6 default route!"
4151
}
4252

4353
# RFC3442: If the DHCP server returns both a Classless
@@ -50,7 +60,7 @@ set_dhcp_routes()
5060
# format: dest1/mask gw1 ... destn/mask gwn
5161
set -- $staticroutes
5262
while [ -n "$1" -a -n "$2" ]; do
53-
log "adding route $1 via $2 metric $metric tag 100"
63+
dbg "adding route $1 via $2 metric $metric tag 100"
5464
echo "ip route $1 $2 $metric tag 100" >> "$NEXT"
5565
shift 2
5666
done
@@ -69,7 +79,7 @@ set_dhcp_routes()
6979

7080
clr_dhcp_routes()
7181
{
72-
log "deleting DHCP routes from $interface"
82+
log "deleting DHCP routes"
7383
[ -f "$NAME" ] || return
7484
rm "$NAME"
7585

@@ -84,7 +94,7 @@ clr_dhcp_addresses()
8494
for addr in $addrs; do
8595
ip="$(echo "$addr" | jq -r '."local"')"
8696
prefix="$(echo "$addr" | jq -r '."prefixlen"')"
87-
log "removing $ip/$prefix from $interface"
97+
log "removing $ip/$prefix"
8898
ip addr del "$ip/$prefix" dev "$interface"
8999
done
90100
}
@@ -142,20 +152,20 @@ case "$ACTION" in
142152
fi
143153

144154
if [ -n "$search_list" ]; then
145-
log "adding search $search_list"
155+
dbg "adding search $search_list"
146156
echo "search $search_list # $interface" >> $RESOLV_CONF
147157
fi
148158

149159
for i in $dns ; do
150-
log "adding dns $i"
160+
dbg "adding dns $i"
151161
echo "nameserver $i # $interface" >> $RESOLV_CONF
152162
resolvconf -u
153163
done
154164

155165
if [ -n "$ntpsrv" ]; then
156166
truncate -s 0 "$NTPFILE"
157167
for srv in $ntpsrv; do
158-
log "got NTP server $srv"
168+
dbg "got NTP server $srv"
159169
echo "server $srv iburst" >> "$NTPFILE"
160170
done
161171
chronyc reload sources >/dev/null

configs/aarch64_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,13 @@ BR2_PACKAGE_ETHTOOL=y
7575
BR2_PACKAGE_FPING=y
7676
BR2_PACKAGE_FRR=y
7777
# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
78+
BR2_PACKAGE_IPERF3=y
7879
BR2_PACKAGE_IPROUTE2=y
7980
BR2_PACKAGE_IPTABLES_NFTABLES=y
8081
BR2_PACKAGE_IPUTILS=y
8182
BR2_PACKAGE_LLDPD=y
8283
BR2_PACKAGE_MSTPD=y
84+
BR2_PACKAGE_MTR=y
8385
BR2_PACKAGE_NETCALC=y
8486
BR2_PACKAGE_NETCAT_OPENBSD=y
8587
BR2_PACKAGE_NETSNMP=y
@@ -99,6 +101,7 @@ BR2_PACKAGE_TRACEROUTE=y
99101
BR2_PACKAGE_ULOGD=y
100102
BR2_PACKAGE_WHOIS=y
101103
BR2_PACKAGE_BASH_COMPLETION=y
104+
BR2_PACKAGE_NEOFETCH=y
102105
BR2_PACKAGE_SUDO=y
103106
BR2_PACKAGE_TTYD=y
104107
BR2_PACKAGE_GETENT=y

configs/r2s_defconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ BR2_PACKAGE_STRESS_NG=y
4444
BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
4545
BR2_PACKAGE_JQ=y
4646
BR2_PACKAGE_E2FSPROGS=y
47+
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
4748
BR2_PACKAGE_LINUX_FIRMWARE=y
4849
BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61=y
4950
BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
@@ -65,6 +66,7 @@ BR2_PACKAGE_GPTFDISK_SGDISK=y
6566
BR2_PACKAGE_INPUT_EVENT_DAEMON=y
6667
BR2_PACKAGE_MDIO_TOOLS=y
6768
BR2_PACKAGE_RNG_TOOLS=y
69+
BR2_PACKAGE_UBOOT_TOOLS=y
6870
BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT=y
6971
BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
7072
BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y
@@ -91,10 +93,12 @@ BR2_PACKAGE_ETHTOOL=y
9193
BR2_PACKAGE_FPING=y
9294
BR2_PACKAGE_FRR=y
9395
# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
96+
BR2_PACKAGE_IPERF3=y
9497
BR2_PACKAGE_IPROUTE2=y
9598
BR2_PACKAGE_IPTABLES_NFTABLES=y
9699
BR2_PACKAGE_IPUTILS=y
97100
BR2_PACKAGE_LLDPD=y
101+
BR2_PACKAGE_MTR=y
98102
BR2_PACKAGE_NETCALC=y
99103
BR2_PACKAGE_NETCAT_OPENBSD=y
100104
BR2_PACKAGE_NETSNMP=y
@@ -117,6 +121,7 @@ BR2_PACKAGE_WIRELESS_REGDB=y
117121
BR2_PACKAGE_WIRELESS_TOOLS=y
118122
BR2_PACKAGE_WPA_SUPPLICANT=y
119123
BR2_PACKAGE_BASH_COMPLETION=y
124+
BR2_PACKAGE_NEOFETCH=y
120125
BR2_PACKAGE_SUDO=y
121126
BR2_PACKAGE_TTYD=y
122127
BR2_PACKAGE_HTOP=y

configs/riscv64_defconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,16 @@ BR2_PACKAGE_GPTFDISK=y
6060
BR2_PACKAGE_GPTFDISK_SGDISK=y
6161
BR2_PACKAGE_MDIO_TOOLS=y
6262
BR2_PACKAGE_RNG_TOOLS=y
63+
BR2_PACKAGE_UBOOT_TOOLS=y
6364
BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT=y
6465
BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
6566
BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y
6667
BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y
6768
BR2_PACKAGE_PYTHON3=y
6869
BR2_PACKAGE_PYTHON_GUNICORN=y
70+
BR2_PACKAGE_LIBSSH_OPENSSL=y
6971
BR2_PACKAGE_LIBSSH2=y
72+
BR2_PACKAGE_LIBSSH2_OPENSSL=y
7073
BR2_PACKAGE_LIBOPENSSL_BIN=y
7174
BR2_PACKAGE_LIBINPUT=y
7275
BR2_PACKAGE_LIBCURL_CURL=y
@@ -85,11 +88,13 @@ BR2_PACKAGE_ETHTOOL=y
8588
BR2_PACKAGE_FPING=y
8689
BR2_PACKAGE_FRR=y
8790
# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
91+
BR2_PACKAGE_IPERF3=y
8892
BR2_PACKAGE_IPROUTE2=y
8993
BR2_PACKAGE_IPTABLES_NFTABLES=y
9094
BR2_PACKAGE_IPUTILS=y
9195
BR2_PACKAGE_LLDPD=y
9296
BR2_PACKAGE_MSTPD=y
97+
BR2_PACKAGE_MTR=y
9398
BR2_PACKAGE_NETCALC=y
9499
BR2_PACKAGE_NETCAT_OPENBSD=y
95100
BR2_PACKAGE_NETSNMP=y
@@ -109,6 +114,7 @@ BR2_PACKAGE_TRACEROUTE=y
109114
BR2_PACKAGE_ULOGD=y
110115
BR2_PACKAGE_WHOIS=y
111116
BR2_PACKAGE_BASH_COMPLETION=y
117+
BR2_PACKAGE_NEOFETCH=y
112118
BR2_PACKAGE_SUDO=y
113119
BR2_PACKAGE_TTYD=y
114120
BR2_PACKAGE_GETENT=y

configs/x86_64_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,13 @@ BR2_PACKAGE_ETHTOOL=y
7373
BR2_PACKAGE_FPING=y
7474
BR2_PACKAGE_FRR=y
7575
# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
76+
BR2_PACKAGE_IPERF3=y
7677
BR2_PACKAGE_IPROUTE2=y
7778
BR2_PACKAGE_IPTABLES_NFTABLES=y
7879
BR2_PACKAGE_IPUTILS=y
7980
BR2_PACKAGE_LLDPD=y
8081
BR2_PACKAGE_MSTPD=y
82+
BR2_PACKAGE_MTR=y
8183
BR2_PACKAGE_NETCALC=y
8284
BR2_PACKAGE_NETCAT_OPENBSD=y
8385
BR2_PACKAGE_NETSNMP=y
@@ -97,6 +99,7 @@ BR2_PACKAGE_TRACEROUTE=y
9799
BR2_PACKAGE_ULOGD=y
98100
BR2_PACKAGE_WHOIS=y
99101
BR2_PACKAGE_BASH_COMPLETION=y
102+
BR2_PACKAGE_NEOFETCH=y
100103
BR2_PACKAGE_SUDO=y
101104
BR2_PACKAGE_TTYD=y
102105
BR2_PACKAGE_GETENT=y

0 commit comments

Comments
 (0)