X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-begin;h=0377b1c1526ffe9409d5b4b57c98c615cf96337a;hb=32a1673064cfd9eaa165b4ea62fa416f02f3dfd2;hp=abcb892f5e1f4747e64cd6a7adb474af8ba21555;hpb=7e4f3d0a6130b69b7f76a3ff13e510ffbeb1484b;p=distro-setup

diff --git a/distro-begin b/distro-begin
index abcb892..0377b1c 100755
--- a/distro-begin
+++ b/distro-begin
@@ -22,6 +22,24 @@
 # set the scrollback to unlimited in case something goes wrong
 
 
+# send to registrar, glue records:
+# for iankelling.org:
+
+# ns1.iankelling.org 72.14.176.105
+# ns1.iankelling.org 2600:3c00::f03c:91ff:fe6d:baf8
+# ns2.iankelling.org 172.105.84.95
+# ns2.iankelling.org 2a01:7e01::f03c:91ff:feb5:baec
+
+# for zroe.org:
+
+# ns1.zroe.org 72.14.176.105
+# ns1.zroe.org 2600:3c00::f03c:91ff:fe6d:baf8
+# ns2.zroe.org 172.105.84.95
+# ns2.zroe.org 2a01:7e01::f03c:91ff:feb5:baec
+#
+
+
+
 ####### begin setup environment #######
 
 
@@ -80,14 +98,14 @@ source $script_dir/pkgs
 set +x
 source /a/bin/distro-functions/src/identify-distros
 $interactive || set -x
-for f in kd x2 x3 frodo tp li lj demohost kw; do
+for f in kd x2 x3 frodo tp li l2 demohost kw; do
   eval "$f() { [[ $HOSTNAME == $f ]]; }"
 done
 codename=$(debian-codename)
 has_wayland() { has_monitor && [[ $codename == buster ]]; }
 has_x() { has_monitor && [[ $codename != buster ]]; }
 has_monitor() { ! linode ; }
-linode() { lj || li; }
+linode() { l2 || li; }
 # linode actually has btrfs now, but we dont do anything with it.
 has_btrfs() { ! linode; }
 home_network() { ! linode && ! kw; }
@@ -195,8 +213,10 @@ if [[ $HOSTNAME != $(cat /etc/hostname) ]]; then
   echo $HOSTNAME > /etc/hostname
   hostname -F /etc/hostname
 fi
-sudo $sed -i '/^127\.0\.1\.1/d' /etc/hosts
-echo "127.0.1.1 $HOSTNAME.b8.nz $HOSTNAME" | sudo tee -a /etc/hosts
+sudo sed -i --follow-symlinks -f - /etc/hosts <<EOF
+\$a 127.0.1.1 $HOSTNAME.b8.nz $HOSTNAME
+/^127\.0\.1\.1/d
+EOF
 
 
 ##### exit first stage if running as root
@@ -215,9 +235,9 @@ EOF
 done
 
 ###### do conflink
-# li needs the bind group before conflink
-if [[ $HOSTNAME == li ]]; then
-  getent group bind &>/dev/null || sudo groupadd -r bind
+# linode needs bind group before conflink
+if linode; then
+  pi-nostart bind9
 fi
 # this needs to be before installing pacserve so we have gpg conf.
 conflink
@@ -226,6 +246,7 @@ conflink
 set +x
 err-allow
 source /etc/profile.d/environment.sh
+export BRC=t
 # shellcheck source=./.bashrc
 source ~/.bashrc
 err-catch
@@ -315,7 +336,7 @@ case $distro in
     sudo rmmod evbug ||: # might not be loaded yet
     file=/etc/modprobe.d/evbug.conf
     line="blacklist evbug"
-    if ! grep -xFq "$line" $file; then
+    if [[ $(cat $file) != $line ]]; then
       sudo dd of=$file 2>/dev/null <<<"$line"
       sudo depmod -a
       sudo update-initramfs -u