X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=wrt-setup-local;h=f5711d074b8aebd81b95cfcfbcc0d159e0b09ef3;hp=ddf78d6f64a08db91db0a97f2f99b8c8cfdb7692;hb=8bf6d9c4cc9ec88976c62af33f32c0c660e977e0;hpb=f26c5d66d11fc97c3c6a17a3647dad5d1922fe5a diff --git a/wrt-setup-local b/wrt-setup-local index ddf78d6..f5711d0 100755 --- a/wrt-setup-local +++ b/wrt-setup-local @@ -18,11 +18,67 @@ set -eE -o pipefail trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR + +usage() { + cat <&2; usage 1 ;; + esac + ;; + m) mac=$OPTARG ;; + *) echo "$0: Internal error! unexpected args: $*" >&2 ; usage 1 ;; + esac +done +shift "$((OPTIND-1))" # Discard the options and sentinel -- + +if [[ ! $mac ]] && ! $test; then + # if we wanted to increment it + #WIRELESSMAC=${WIRELESSMAC:0: -1}$((${WIRELESSMAC: -1} + 2)) + mac=$WIRELESSMAC +fi + +if (( $# != 0 )); then + usage 1 fi + +macpre=${mac:0: -1} +macsuf=${mac: -1} + pmirror() { # background: upgrading all packages is not recommended because it # doesn't go into the firmware. build new firmware if you want @@ -47,19 +103,56 @@ v() { "$@" } +######### uci example:####### +# # https://wiki.openwrt.org/doc/uci +# wan_index=$(uci show firewall | sed -rn 's/firewall\.@zone\[([0-9])+\]\.name=wan/\1/p') +# wan="firewall.@zone[$wan_index]" +# if [[ $(uci get firewall.@forwarding[0].dest) != $forward_dest ]]; then +# # default is wan +# v uci set firewall.@forwarding[0].dest=$forward_dest +# uci commit firewall +# firewall_restart=true +# fi +####### end uci example ##### + +uset() { + local key="$1" + local val="$2" + local service="${key%%.*}" + restart_var=${service}_restart + if [[ ! ${!restart_var} ]]; then + eval $restart_var=false + fi + if [[ $(uci get "$key") != "$val" ]]; then + v uci set "$key"="$val" + uci commit $service + eval $restart_var=true + fi +} + + ### network config ### ssid="check out gnu.org" lan=10.0.0.0 -if $dev2; then - ssid="test1" +if $test; then + ssid="gnuv3" lan=10.1.0.0 fi mask=255.255.0.0 +cidr=16 l=${lan%.0} passwd -l root ||: #already locked fails +sed -ibak '/^root:/d' /etc/shadow +# /root/router created by manually running passwd then copying the resulting +# line. We have no mkpasswd on wrt/librecmc, then we scp it in. +cat /root/router >>/etc/shadow +# otherwise, serial console gets root login with no password +uset system.@system[0].ttylogin 1 + + cat >/usr/bin/archlike-pxe-mount <<'EOFOUTER' #!/bin/bash # symlinks are collapsed for nfs mount points, so use a bind mount. @@ -78,10 +171,15 @@ EOFOUTER chmod +x /usr/bin/archlike-pxe-mount sed -i '/^root:/s,/bin/ash$,/bin/bash,' /etc/passwd +# usb, screen, relay are for libremanage v pi kmod-usb-storage block-mount kmod-fs-ext4 nfs-kernel-server \ - tcpdump openvpn-openssl adblock libusb-compat /root/relay_1.0-1_mips_24kc.ipk - + tcpdump openvpn-openssl adblock libusb-compat /root/relay_1.0-1_mips_24kc.ipk \ + screen kmod-usb-serial-cp210x kmod-usb-serial-ftdi +cat >/etc/libremanage.conf </dev/null) ]]; then - v uci delete wireless.radio$x.disabled - wireless_restart=true + if [[ $mac ]]; then + uset wireless.default_radio$x.macaddr $macpre$((macsuf + 2*x)) fi + # secondary device has wireless disabled + uset wireless.radio$x.disabled $dev2 done if $wireless_restart; then @@ -236,84 +313,129 @@ EOF firewall_restart=false v cedit /etc/config/firewall <