source /a/bin/bash_unpublished/source-semi-priv
#### begin convert private hostnames to public hostnames ####
-if ! $at_home; then
- for var in old_host new_host; do
- case ${!var} in
- tp)
- eval $var=$HOME_DOMAIN
- ;;
- esac
- done
-fi
+#if ! $at_home; then
+# for var in old_host new_host; do
+# case ${!var} in
+# tp)
+# eval $var=$HOME_DOMAIN
+# ;;
+# esac
+# done
+#fi
#### end convert private hostnames to public hostnames ####
sleep 2
done
+new_hostname=$($new_shell hostname)
+
########### end initial processing, begin actually modifying things ##########
restore_new_btrbk=false
restore_old_btrbk=true
fi
-for ((i=0; i<10; i++)); do
- $old_shell killall arbtt-capture || break
- sleep 1
- if [[ i == 9 ]]; then
- warn="WARNING!!! failed to kill arbtt-capture"
- fi
-done
-for ((i=0; i<10; i++)); do
- $new_shell killall arbtt-capture || break
- sleep 1
- if [[ i == 9 ]]; then
- warn="WARNING!!! failed to kill arbtt-capture"
- fi
-done
-
-$new_shell bash -s <<'EOF'
+$new_shell bash -xs <<'EOF'
set -eE
-if mountpoint /m; then sudo umount /m; fi
-if mountpoint /o; then sudo umount /o; fi
+if mountpoint -q /m; then sudo umount /m; fi
+if mountpoint -q /o; then sudo umount /o; fi
EOF
# if new_host is not on home network, make mail.iankelling.org not resolve
if [[ $new_host == $HOSTNAME ]] && ! $at_home; then
echo | $wrt_shell cedit mail_host /etc/hosts || [[ $? == 1 ]] # 1 means file changed.
else
- $wrt_shell bash -s <<EOFOUTER
- cedit mail_host /etc/hosts <<EOF || /etc/init.d/dnsmasq restart
-\$(grep "\b$new_host\b" /etc/hosts | awk '{print \$1}') mail.iankelling.org
+ $wrt_shell bash -xs $new_host <<'EOFOUTER'
+new_host=$1
+cedit mail_host /etc/hosts <<EOF || /etc/init.d/dnsmasq restart
+$(grep "\b$new_hostname\b" /etc/hosts | awk '{print $1}') mail.iankelling.org
EOF
EOFOUTER
fi
-mail-setup() {
- shell="$1"
- $shell sed -ri "s/MAIL_HOST=.*/MAIL_HOST=$new_host/" /a/bin/bash_unpublished/source-semi-priv
- $shell /a/bin/distro-setup/mail-setup exim4
-}
-
-mail-setup "$old_shell"
+$old_shell /a/bin/distro-setup/install-my-scripts
+$old_shell primary-setup $new_hostname
sudo dd of=/etc/btrbk.conf <<'EOF'
ssh_identity /root/.ssh/home
sudo btrbk -l debug --progress run
+$new_shell /a/bin/distro-setup/install-my-scripts
$new_shell mount-latest-subvol
-
-mail-setup "$new_shell"
+$new_shell primary-setup $new_hostname
if $restore_new_btrbk; then
$new_shell sudo systemctl start btrbk.timer
if $restore_old_btrbk; then
$old_shell sudo systemctl start btrbk.timer
fi
-
-$new_shell DISPLAY=:0 arbtt-capture --sample-rate=10 &
-
-echo $warn