Add latest state tweaks.

sql/database-fill.sql

@@ -276,7 +276,7 @@ REPLACE INTO state_timeouts VALUES ('NODEALLOC','RESERVED',0,NULL);
 REPLACE INTO state_timeouts VALUES ('NORMAL','BOOTING',180,'REBOOT');
 REPLACE INTO state_timeouts VALUES ('NORMALv1','BOOTING',180,'REBOOT');
 REPLACE INTO state_timeouts VALUES ('NORMALv1','ISUP',0,NULL);
-REPLACE INTO state_timeouts VALUES ('NORMALv1','TBSETUP',120,'NOTIFY');
+REPLACE INTO state_timeouts VALUES ('NORMALv1','TBSETUP',600,'NOTIFY');
 REPLACE INTO state_timeouts VALUES ('RELOAD','BOOTING',180,'REBOOT');
 REPLACE INTO state_timeouts VALUES ('RELOAD','RELOADING',600,'NOTIFY');
 REPLACE INTO state_timeouts VALUES ('RELOAD','RELOADSETUP',60,'NOTIFY');
@@ -305,6 +305,7 @@ REPLACE INTO state_transitions VALUES ('EXPTSTATUS','TESTING','SWAPPING');
 REPLACE INTO state_transitions VALUES ('MINIMAL','BOOTING','BOOTING');
 REPLACE INTO state_transitions VALUES ('MINIMAL','BOOTING','ISUP');
 REPLACE INTO state_transitions VALUES ('MINIMAL','BOOTING','SHUTDOWN');
+REPLACE INTO state_transitions VALUES ('MINIMAL','ISUP','BOOTING');
 REPLACE INTO state_transitions VALUES ('MINIMAL','ISUP','SHUTDOWN');
 REPLACE INTO state_transitions VALUES ('MINIMAL','SHUTDOWN','BOOTING');
 REPLACE INTO state_transitions VALUES ('MINIMAL','SHUTDOWN','SHUTDOWN');