From dce9fd7e6023976f6e9622f035d5cab34479a68d Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Wed, 12 Jun 2024 16:27:46 -0400 Subject: [PATCH] t12 related changes --- README | 4 ++ dnsmasq-end-lease | 57 ++++++++++++++++++ fai/config/basefiles/mk-basefile | 1 + fai/config/class/FAIBASE.var | 2 +- .../distro-install-common/ethusb-static | 9 ++- .../etc/apt/preferences.d/aramo-noble/ARAMO | 3 + .../etc/apt/preferences.d/noble-mint/NOBLE | 11 ++++ .../etc/apt/sources.list.d/noble.list/NOBLE | 1 + fai/config/hooks/updatebase.UBUNTU | 33 +++++++--- fai/config/package_config/STANDARD | 4 +- fai/config/package_config/UBUNTU_UP.gpg | Bin 18331 -> 2228 bytes fai/config/scripts/IANK/11-iank | 22 ++++++- wrt-setup | 4 +- wrt-setup-local | 8 ++- 14 files changed, 141 insertions(+), 18 deletions(-) create mode 100644 dnsmasq-end-lease create mode 100644 fai/config/files/etc/apt/preferences.d/aramo-noble/ARAMO create mode 100644 fai/config/files/etc/apt/preferences.d/noble-mint/NOBLE diff --git a/README b/README index 5e01bb4..84a733e 100644 --- a/README +++ b/README @@ -109,6 +109,10 @@ Also, setup dns in /p/c/host-info and firewall redirects in wrt-setup-local. After install, btrbk to setup data, and then distro-begin && distro end. See notes in distro-begin for other configuration. +# Per distro install/config + +./fai/config/package_config/CLASS.gpg + # Prerequesites: diff --git a/dnsmasq-end-lease b/dnsmasq-end-lease new file mode 100644 index 0000000..0787335 --- /dev/null +++ b/dnsmasq-end-lease @@ -0,0 +1,57 @@ +#!/bin/bash +# I, Ian Kelling, follow the GNU license recommendations at +# https://www.gnu.org/licenses/license-recommendations.en.html. They +# recommend that small programs, < 300 lines, be licensed under the +# Apache License 2.0. This file contains or is part of one or more small +# programs. If a small program grows beyond 300 lines, I plan to change +# to a recommended GPL license. + +# Copyright 2024 Ian Kelling + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# usage: wrt-reip PATTERN +# Removes pattern from dnsmasq leases file and restart dnsmasq. +# PATTERN should generally be an ip or a mac. + +pattern=$1 + +exit_code=0 + +m() { + printf "%s\n" "$*"; + "$@" +} + +m /etc/init.d/dnsmasq stop + +tmp=/tmp/dhcp.leases.iank +sed "/$pattern/d" /tmp/dhcp.leases >$tmp + +if (( $(wc -l /tmp/dhcp.leases | awk '{print $1}') - 1 == $(wc -l $tmp | awk '{print $1}') )); then + echo "info: found one less line after removing $pattern. installing new leases file" + cp /tmp/dhcp.leases /tmp/dhcp.leases.iank-backup + cat $tmp >/tmp/dhcp.leases + m rm -f $tmp +else + exit_code=1 + cat <&2; exit 1; fi shopt -s inherit_errexit 2>/dev/null ||: # ignore fail in bash < 4.4 set -eE -o pipefail @@ -213,9 +215,14 @@ fi if ! type -p dig &>/dev/null; then - apt-get install dig + apt-get -y install dig +fi + +if ! type -p ethtool &>/dev/null; then + apt-get -y install ethtool fi + get-cur ## end common setup / detection ## diff --git a/fai/config/files/etc/apt/preferences.d/aramo-noble/ARAMO b/fai/config/files/etc/apt/preferences.d/aramo-noble/ARAMO new file mode 100644 index 0000000..4e12926 --- /dev/null +++ b/fai/config/files/etc/apt/preferences.d/aramo-noble/ARAMO @@ -0,0 +1,3 @@ +Package: * +Pin: release n=noble,o=Ubuntu +Pin-Priority: -100 diff --git a/fai/config/files/etc/apt/preferences.d/noble-mint/NOBLE b/fai/config/files/etc/apt/preferences.d/noble-mint/NOBLE new file mode 100644 index 0000000..a2644a7 --- /dev/null +++ b/fai/config/files/etc/apt/preferences.d/noble-mint/NOBLE @@ -0,0 +1,11 @@ +Package: firefox firefox-* +Pin: release o=linuxmint +Pin-Priority: 500 + +Package: firefox firefox-* +Pin: release o=ubuntu +Pin-Priority: -20 + +Package: * +Pin: release o=linuxmint +Pin-Priority: -20 diff --git a/fai/config/files/etc/apt/sources.list.d/noble.list/NOBLE b/fai/config/files/etc/apt/sources.list.d/noble.list/NOBLE index cda7d9c..140df90 100644 --- a/fai/config/files/etc/apt/sources.list.d/noble.list/NOBLE +++ b/fai/config/files/etc/apt/sources.list.d/noble.list/NOBLE @@ -12,3 +12,4 @@ deb http://archive.ubuntu.com/ubuntu/ noble-backports main universe deb-src http://archive.ubuntu.com/ubuntu/ noble-security main universe multiverse deb-src http://archive.ubuntu.com/ubuntu/ noble-updates main universe multiverse deb-src http://archive.ubuntu.com/ubuntu/ noble-backports main universe +deb http://packages.linuxmint.com wilma upstream diff --git a/fai/config/hooks/updatebase.UBUNTU b/fai/config/hooks/updatebase.UBUNTU index 98f775f..55971e8 100755 --- a/fai/config/hooks/updatebase.UBUNTU +++ b/fai/config/hooks/updatebase.UBUNTU @@ -1,12 +1,5 @@ #! /bin/bash -# mk-basefile doesn't use the -updates suite, then we unpack it, then we -# install sources.list that has -updates and we install random -# packages. It might avoid a problem if we a dist-upgrade first. - -$ROOTCMD apt-get update -$ROOTCMD apt-get -y dist-upgrade --purge --auto-remove - # https://lists.uni-koeln.de/pipermail/linux-fai/2016-July/011398.html # In Ubuntu 16.04 (but not 14.04), the locales configuration mechanism has # changed. There is a /var/lib/dpkg/info/locales.config file, which @@ -16,13 +9,35 @@ $ROOTCMD apt-get -y dist-upgrade --purge --auto-remove # hook applies the debconf setting. It must run after FAI's debconf task # but before dpkg gets a chance to clobber debconf with an empty setting. +# todo: debconf-get-selections did not show our locale settings. +# +# this could be related in the fai.log +# +#Calling task_debconf +# Adding debconf data from /var/lib/fai/config/debconf/DEBIAN +# Reconfiguring package keyboard-configuration +# Your console font configuration will be updated the next time your system +# boots. If you want to update it now, run 'setupcon' from a virtual console. +# debconf: DbDriver "_ENV_stack": unable to save changes to: console-setup/ask_detect keyboard-configuration/model keyboard-configuration/model keyboard-configuration/modelcode keyboard-configuration/variant keyboard-configuration/variant keyboard-configuration/optionscode keyboard-configuration/store_defaults_in_debconf_db +# todo fix the dropbear cat not found issue. +# +# if [ ! -f "$target/var/lib/locales/supported.d/local" ]; then - $ROOTCMD debconf --owner=locales sh -c ' + if $ROOTCMD debconf --owner=locales sh -c ' . /usr/share/debconf/confmodule db_version 2.0 db_get locales/locales_to_be_generated && mkdir -p /var/lib/locales/supported.d && - echo "$RET" > /var/lib/locales/supported.d/local' && + echo "$RET" > /var/lib/locales/supported.d/local'; then $ROOTCMD dpkg-reconfigure locales + fi fi + + +# mk-basefile doesn't use the -updates suite, then we unpack it, then we +# install sources.list that has -updates and we install random +# packages. It might avoid a problem if we a dist-upgrade first. + +$ROOTCMD apt-get update +$ROOTCMD apt-get -y dist-upgrade --purge --auto-remove diff --git a/fai/config/package_config/STANDARD b/fai/config/package_config/STANDARD index f55e664..091984c 100644 --- a/fai/config/package_config/STANDARD +++ b/fai/config/package_config/STANDARD @@ -16,7 +16,9 @@ locales lsof man-db manpages -mime-support +# this split into mailcap and media-types in t12, +# dunno that i need either of them at this stage +#mime-support ncurses-term openssh-client pciutils diff --git a/fai/config/package_config/UBUNTU_UP.gpg b/fai/config/package_config/UBUNTU_UP.gpg index 86214bddc4fb442695e7299beafd16c242db4289..ff1576ef6d8d135bf3cd4327da88ea6bed583702 100644 GIT binary patch literal 2228 zcmV;l2ut^w0u2OLM2Fe|5CFE!sddX@r1!nn^^`BN5Zb^m1H1i_zFpJOHL(pFl_Jp? z3QnRjxo6)d6j6~EUM2Sliv)ck{n3dZG-F>Xx0Iymw83XEOJ-9Yq0(mt&04ngO-!OM zf!+sa6~3oY2abCn$*r9ZaKZHrI2w>yUXkkY6Z<>RVqZ0Gl2Gk4)WrFXI-|&bNffNG zYQ%zv53Q3!6c z>(GpR;a8}nAP_Cx*eLTMP(+U7qrn~LN#cUiOMTu-L+WruR%newV}J0DcuLzh;s%<`h_Ax-SoakninO(O`c}L~}v- z^piL$M^tRqaj1*=xPzEYZtLZ<#$>50YJCR^g%>EKb481_ZMGRbXcWfwZzAAGHy~5FEB7`!pvc8bCVn=Y?j4FGchjT zOd;r6##G}HjeP(S0RRECHcV-5b$B36X>N2NQe|*&b7^#Ma(N(AX=iR}Zf77%WqBYx za&K>RKx}Dlb$D%QZgehVZ*4w_0yhK`0SW*i1p-$@huQ)g0|g5S2nPcN6$%Lm3k4Pe z0|5X69svRufB*^!5T;>a2}K*b^3)^`|8Sz)d)se&2_^}D zW+C%h9SarGmT`T95->lOME_j%=#kv{>Rf)_`$D0QprF>nb++s~>T{+UUjg?#v!m}- z*a-rO{@jG^&9m_Hd{tN*Q8bHu*fYTuP_2k5W2!(3{ilDQ!@uCoTj8=oeX{1b3#g;j zHgxfVulh~;TnB;DC^KeIB5lfYp|PUnmf4#Hq6&)S!&7Ak$$WADB=E4ERJ!u~EZ-9$ zS+k%@9xp0+S!=ZD5F3Oej>~&e69*UhK>> zX4hb%03&SDY+O#@sX)^!TaT+fXPj1UJ@<)Wk>9zEU5))i@Z#{d5}Ft zx`{Z)!1zhNX9UFzy_E!03dOrVC(yKpGqr4%Ke2tO7eKJo=o!IAZ{gih7qrwph&@qVIx$l4U zt=A$bMhjKmH$)(>Gw}*+q=Dv5vx?j}<{3{FG@{hxXgYNswi8oyaHfd|XW`$E_Wvo)fqZ0w@*#o7bzy(38P#tAvp+ka6NCk!jEL`CQUEQgj$@Te3RHeV7a>I0MjPB`E%8X&X;Ee-i%@){ z&sPnlQhp4h_iWoJ9I`F!VH`YhmFB6*xS889B!J3(5n2?c*5p}JKF*;5sYXruN?9Y2 zV>?&4f#o$OZh!sN^t#x334H1TcX70wTYMU*;vppAf?M#CUAn+nB~V%e)=--^@M|Iq zSIxPkIS(1$HmYq-n|t%kp_Op#V4~ti?D<-GFo$SviY zhEk3dIYdnBOI&RO*-MJHwXSp64;SR-Ao4Y8qMp$;dm6T>AhB(S+@BVHh+reUMQf@( zVoClAc}-pfJew7^pi%}X$t9tC;+HP;EXyAXbb(^Q`=oq+;D0g?SAJF&^x7B<1436X zlKsG2O4#gWnBhgwWY;>q$f9MhaCeEf)@}Dc%B=8>hTe_9lhMi-E0U55h>;K~)}nmI zduLt}|E1Py(gkf8F(=38!JvCsvL7KMSFuFjD9eYx3lIuL-R&0)C|yb*;gz0Xr59Kf Cu_g8Z literal 18331 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/etc/NetworkManager/conf.d/10-globally-managed-devices.conf <<'EOF' +[device*] +managed=1 +EOF # in a default desktop install, it looks like netplan creates this file under # run/NetworkManager/conf.d in early boot. diff --git a/wrt-setup b/wrt-setup index 975a1dd..1a85864 100755 --- a/wrt-setup +++ b/wrt-setup @@ -73,13 +73,13 @@ fi echo "$0: h=$h" # todo: ecdsa key not working with dropbear cat ~/.ssh/{h,hrsa,home}.pub | ssh $h dd of=/etc/dropbear/authorized_keys -scp /a/work/libremanage/libremanage /a/bin/fai/wrt-init /a/bin/fai/wrt-setup-local /a/bin/cedit/cedit $h:/usr/bin +scp /a/work/libremanage/libremanage /a/bin/fai/wrt-init /a/bin/fai/wrt-setup-local /a/bin/fai/dnsmasq-end-lease /a/bin/cedit/cedit $h:/usr/bin # relay is built for openwrt 18.06.2, r7676-cddd7b4c77 #/a/opt/openwrt/source/bin/packages/mips_24kc/mypackages/relay_1.0-1_mips_24kc.ipk \ scp /q/root/shadow/router /p/c/machine_specific/wrt/etc/dropbear/dropbear_rsa_host_key \ - /p/router-secrets /p/c/machine_specific/wrt/etc/wg.{key,psk} /p/c/ptr-data /p/c/{dnsmasq,cmc-firewall}-data /b/bash-bear-trap/bash-bear $h: + /p/router-secrets /p/c/machine_specific/wrt/etc/wg.{key,psk} /p/c/{ptr,dnsmasq,cmc-firewall}-data /b/bash-bear-trap/bash-bear $h: scp ../openwrtkeyring/usign/* $h:/etc/opkg/keys ssh $h wrt-init ${HOME_DOMAIN:-b8.nz} "$@" diff --git a/wrt-setup-local b/wrt-setup-local index ac33e3a..d18d798 100755 --- a/wrt-setup-local +++ b/wrt-setup-local @@ -15,6 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# shellcheck disable=SC1091 # somewhat dynamic set -e; . /usr/local/lib/bash-bear; set +e @@ -234,7 +235,7 @@ elif $secrets; then ssid=${rssid[$h]} fi -: ${ssid:=librecmc} +: "${ssid:=librecmc}" if $secrets; then @@ -617,6 +618,7 @@ EOF esac { + # shellcheck source=/p/c/cmc-firewall-data . /root/cmc-firewall-data cat <