From: Ian Kelling Date: Mon, 8 Aug 2022 03:11:46 +0000 (-0400) Subject: mostly t11 fixes X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=5c8530653c87af3757a2c649772e0405bcd143a0;p=distro-setup mostly t11 fixes --- diff --git a/brc b/brc index 7b01674..c3747cf 100644 --- a/brc +++ b/brc @@ -466,6 +466,10 @@ c() { } ccomp cd c +bwm() { + s bwm-ng -T avg -d + } + b() { local topb if (( ${#_iankdirb[@]} == 0 )); then @@ -1571,7 +1575,7 @@ resolvcat() { grep '^ *hosts:' /etc/nsswitch.conf if systemctl is-enabled systemd-resolved &>/dev/null || [[ $(systemctl is-active systemd-resolved ||:) != inactive ]]; then hr; m ser status systemd-resolved | cat || : - hr; m systemd-resolve --status | cat + hr; m resolvectl status | cat fi } diff --git a/brc2 b/brc2 index fdb2c06..3a5ab9d 100644 --- a/brc2 +++ b/brc2 @@ -1873,6 +1873,10 @@ servicepid() { sdnbash() { # systemd namespace bash local unit pid + if (( $# != 0 )); then + echo $0: error wrong number of args >&2 + return 1 + fi unit=$1 pid=$(servicepid $unit) m sudo nsenter -t $pid -n -m sudo -u $USER -i bash @@ -1880,6 +1884,10 @@ sdnbash() { # systemd namespace bash sdncmd() { # systemd namespace cmd local unit pid + if (( $# != 0 )); then + echo $0: error wrong number of args >&2 + return 1 + fi unit=$1 shift pid=$(servicepid $unit) diff --git a/btrbk-run b/btrbk-run index 1b6cec5..5d020d7 100644 --- a/btrbk-run +++ b/btrbk-run @@ -145,7 +145,7 @@ case $cmd_arg in # run it directly, eg: # time s btrbk -v archive /mnt/r7/amy/boot/btrbk ssh://bo/mnt/boot2/btrbk archive) - cmd=resume + cmd_arg=resume std_preserve="999h 999d 999w 999m" q_preserve="$std_preserve" preserve_arg=-p diff --git a/trusted-network b/trusted-network index 894815e..f396803 100755 --- a/trusted-network +++ b/trusted-network @@ -109,8 +109,9 @@ if [[ $gateway_if ]]; then m ifup $gateway_if fi - # at least on systemd 237 ifupdown it sets a global and this is not needed - systemd-resolve --interface=$gateway_if --revert + # At least on systemd 237 ifupdown it sets a global and this is not + # needed. we are way past that, but I dont think it hurts. + resolvectl revert $gateway_if else e $0: no gateway_if found fi