From 3d4eadd436ffee3b01e9c58394d786e967ec6fa9 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Mon, 7 Jul 2014 11:29:21 +0000 Subject: [PATCH] the new migration management in c8856f107d319dbdf04164a520e8fd8c33ffc240 left out the part where we actually keep the system's current MIGRATIONID... it was being lost when setup/start.sh was re-run --- setup/start.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setup/start.sh b/setup/start.sh index 2d6ac1a8..66811ae2 100755 --- a/setup/start.sh +++ b/setup/start.sh @@ -35,6 +35,10 @@ if [ -f /etc/mailinabox.conf ]; then # Okay now load the old .conf file to get existing configuration options. cat /etc/mailinabox.conf | sed s/^/DEFAULT_/ > /tmp/mailinabox.prev.conf source /tmp/mailinabox.prev.conf + MIGRATIONID=$DEFAULT_MIGRATIONID +else + # What migration are we at for new installs? + MIGRATIONID=1 fi # The box needs a name. @@ -171,6 +175,7 @@ PRIMARY_HOSTNAME=$PRIMARY_HOSTNAME PUBLIC_IP=$PUBLIC_IP PUBLIC_IPV6=$PUBLIC_IPV6 CSR_COUNTRY=$CSR_COUNTRY +MIGRATIONID=$MIGRATIONID EOF # Start service configuration.