various minor fixes and improvements

[automated-distro-installer] / wrt-setup-local

diff --git a/wrt-setup-local b/wrt-setup-local
index 2dbc0cebca523518da314d488ebc3d90965c479d..43628bc8bee6f049a19807c2fc0c549ad45ab01c 100755 (executable)
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -51,20 +51,22 @@ l=${lan%.0}
 
 passwd -l root ||: #already locked fails
 
-cat >/usr/bin/arch-pxe-mount <<'EOFOUTER'
+cat >/usr/bin/archlike-pxe-mount <<'EOFOUTER'
 #!/bin/bash
 # symlinks are collapsed for nfs mount points, so use a bind mount.
 # tried putting this in /etc/config/fstab,
-# then doig block mount, it didn't work. This doesn't persist across reboots,
+# then doing block mount, it didn't work. This doesn't persist across reboots,
 # todo: figure that out
-d=/run/archiso/bootmnt
-cat > /etc/fstab <<EOF
+rm -f /etc/fstab
+for d in /run/{arch,parabola}iso/bootmnt; do
+cat >>/etc/fstab <<EOF
 /mnt/usb/tftpboot $d none bind 0 0
 EOF
 mount | grep $d &>/dev/null || mount $d
+done
 /etc/init.d/nfsd restart
 EOFOUTER
-chmod +x /usr/bin/arch-pxe-mount
+chmod +x /usr/bin/archlike-pxe-mount
 
 cat >.profile <<'EOF'
 # changing login shell emits spam on ssh single commands & scp
@@ -86,9 +88,10 @@ v /etc/init.d/fstab enable ||:
 # 255 == module already loaded
 for mod in scsi_mod sd_mod; do v modprobe $mod || [[ $? == 255 ]]; done
 
-# for arch pxe. The default settings in the installer expect to find
-# the NFS at /run/archiso/bootmnt
+# for archlike pxe. The default settings in the installer expect to find
+# the NFS at one of these dirs
 mkdir -p /run/archiso/bootmnt
+mkdir -p /run/parabolaiso/bootmnt
 
 # todo: at some later time, i found /mnt/usb not mounted, watch to see if
 # that is the case after running this or rebooting.
@@ -127,6 +130,7 @@ cedit /etc/exports <<EOF || v /etc/init.d/nfsd restart ||:
 /mnt/usb  $lan/$netmask(rw,no_root_squash,insecure,sync,no_subtree_check)
 # for arch pxe
 /run/archiso/bootmnt   $lan/$netmask(rw,no_root_squash,insecure,sync,no_subtree_check)
+/run/parabolaiso/bootmnt       $lan/$netmask(rw,no_root_squash,insecure,sync,no_subtree_check)
 EOF
 
 
@@ -152,7 +156,7 @@ v /etc/init.d/nfsd enable
 # fi
 
 
-wireless_restart=true
+wireless_restart=false
 key=pictionary49
 for x in 0 1; do
   if [[ $(uci get wireless.default_radio$x.ssid) != "$ssid" ]]; then
@@ -163,8 +167,8 @@ for x in 0 1; do
     v uci set wireless.default_radio$x.key=$key
     wireless_restart=true
   fi
-  if [[ $(uci get wireless.default_radio$x.encryption) != $key ]]; then
-    v uci set wireless.default_radio$x.encryption=$key
+  if [[ $(uci get wireless.default_radio$x.encryption) != psk2 ]]; then
+    v uci set wireless.default_radio$x.encryption=psk2
     wireless_restart=true
   fi
   if [[ $(uci get wireless.default_radio$x.disabled 2>/dev/null) ]]; then
@@ -211,6 +215,7 @@ config 'route' 'transmission'
         option 'gateway' '$l.3'
 EOF
 
+firewall_restart=false
 v cedit /etc/config/firewall <<EOF || firewall_restart=true
 config redirect
     option name ssh
@@ -332,7 +337,7 @@ if [[ $(uci get dhcp.@dnsmasq[0].domain) != b8.nz ]]; then
   uci commit dhcp
   dnsmasq_restart=true
 fi
-if [[ $(uci get dhcp.@dnsmasq[0].local) != b8.nz ]]; then
+if [[ $(uci get dhcp.@dnsmasq[0].local) != /b8.nz/ ]]; then
   v uci set dhcp.@dnsmasq[0].local=/b8.nz/
   uci commit dhcp
   dnsmasq_restart=true