cleanup primary-setup calling logic

diff --git a/distro-begin b/distro-begin
index 905d36d1b7a081179a8803063e964f02852e6b28..09507192c02fa3ba08753ff71e72aa4aab6ec628 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -561,7 +561,7 @@ fi
 
 
 ##### setup email
-mail-setup
+primary-setup
 
 #### ubuntu nicety
 if isubuntu; then

diff --git a/mail-setup b/mail-setup
index 23c4c0def8029e77b171c7c0ebf051221701a0e3..e0aa6aadcf8b08ce620a099c6f43ebaef12d71c5 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -3,11 +3,8 @@
 # Copyright (C) 2019 Ian Kelling
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-# todo, primary-setup doesnt get called on distro-begin
 # todo: sm pull really needs to execute as systemd else it will always fail
 # because of journal reload
-#
-# todo: bbk -t kw didn't remount /p to a new subvol
 
 # todo setup better backup/sync of MAIL_HOST emails
 

diff --git a/primary-setup b/primary-setup
index 08ee7a506da547d7b35d60572ee9f7ea6e9b4898..9894f3f64cf434bfa0dfbdb92d13992d9066345e 100755 (executable)
--- a/primary-setup
+++ b/primary-setup
@@ -22,8 +22,9 @@ if [[ $1 ]]; then
     new_host=$HOSTNAME
   fi
   m sed -ri "s/MAIL_HOST=.*/MAIL_HOST=$new_host/" /a/bin/bash_unpublished/source-state
-  source /a/bin/bash_unpublished/source-state
 fi
+source /a/bin/bash_unpublished/source-state
+
 
 if dpkg -s rss2email &>/dev/null; then
   if [[ $HOSTNAME == "$MAIL_HOST" ]]; then