Update widearea and normal machines a bit.

sql/database-fill.sql

@@ -291,20 +291,19 @@ REPLACE INTO state_transitions VALUES ('NODEALLOC','RELOAD','FREE_CLEAN','');
 REPLACE INTO state_transitions VALUES ('NODEALLOC','RESERVED','REBOOT','');
 REPLACE INTO state_transitions VALUES ('NODEALLOC','RESERVED','RELOAD','');
 REPLACE INTO state_transitions VALUES ('NORMAL','BOOTING','BOOTING','DHCPRetry');
-REPLACE INTO state_transitions VALUES ('NORMAL','BOOTING','REBOOTED','Error');
-REPLACE INTO state_transitions VALUES ('NORMAL','BOOTING','REBOOTING','BootOK');
+REPLACE INTO state_transitions VALUES ('NORMAL','BOOTING','REBOOTED','BootOK');
+REPLACE INTO state_transitions VALUES ('NORMAL','BOOTING','REBOOTING','Error');
 REPLACE INTO state_transitions VALUES ('NORMAL','BOOTING','SHUTDOWN','Error');
 REPLACE INTO state_transitions VALUES ('NORMAL','ISUP','REBOOTING','Reboot');
 REPLACE INTO state_transitions VALUES ('NORMAL','ISUP','SHUTDOWN','Reboot');
-REPLACE INTO state_transitions VALUES ('NORMAL','REBOOTED','BOOTING','DHCP');
 REPLACE INTO state_transitions VALUES ('NORMAL','REBOOTED','ISUP','BootDone');
-REPLACE INTO state_transitions VALUES ('NORMAL','REBOOTED','REBOOTING','BootOK');
+REPLACE INTO state_transitions VALUES ('NORMAL','REBOOTED','REBOOTING','Error');
 REPLACE INTO state_transitions VALUES ('NORMAL','REBOOTED','SHUTDOWN','Error');
 REPLACE INTO state_transitions VALUES ('NORMAL','REBOOTING','BOOTING','DHCP');
-REPLACE INTO state_transitions VALUES ('NORMAL','REBOOTING','REBOOTING','BootOK');
-REPLACE INTO state_transitions VALUES ('NORMAL','REBOOTING','SHUTDOWN','Error');
+REPLACE INTO state_transitions VALUES ('NORMAL','REBOOTING','REBOOTING','Retry');
+REPLACE INTO state_transitions VALUES ('NORMAL','REBOOTING','SHUTDOWN','Reboot');
 REPLACE INTO state_transitions VALUES ('NORMAL','SHUTDOWN','BOOTING','DHCP');
-REPLACE INTO state_transitions VALUES ('NORMAL','SHUTDOWN','REBOOTING','BootOK');
+REPLACE INTO state_transitions VALUES ('NORMAL','SHUTDOWN','REBOOTING','Reboot');
 REPLACE INTO state_transitions VALUES ('NORMAL','SHUTDOWN','SHUTDOWN','Retry');
 REPLACE INTO state_transitions VALUES ('NORMALv1','BOOTING','BOOTING','DHCPRetry');
 REPLACE INTO state_transitions VALUES ('NORMALv1','BOOTING','SHUTDOWN','Error');
@@ -328,21 +327,15 @@ REPLACE INTO state_transitions VALUES ('USERSTATUS','ACTIVE','FROZEN','');
 REPLACE INTO state_transitions VALUES ('USERSTATUS','FROZEN','ACTIVE','');
 REPLACE INTO state_transitions VALUES ('USERSTATUS','NEWUSER','UNAPPROVED','');
 REPLACE INTO state_transitions VALUES ('USERSTATUS','UNAPPROVED','ACTIVE','');
-REPLACE INTO state_transitions VALUES ('WIDEAREA','BOOTING','REBOOTED','Error');
-REPLACE INTO state_transitions VALUES ('WIDEAREA','BOOTING','REBOOTING','BootOK');
-REPLACE INTO state_transitions VALUES ('WIDEAREA','BOOTING','SHUTDOWN','Error');
 REPLACE INTO state_transitions VALUES ('WIDEAREA','ISUP','REBOOTED','SilentReboot');
 REPLACE INTO state_transitions VALUES ('WIDEAREA','ISUP','REBOOTING','Reboot');
 REPLACE INTO state_transitions VALUES ('WIDEAREA','ISUP','SHUTDOWN','Reboot');
-REPLACE INTO state_transitions VALUES ('WIDEAREA','REBOOTED','BOOTING','DHCP');
 REPLACE INTO state_transitions VALUES ('WIDEAREA','REBOOTED','ISUP','BootDone');
-REPLACE INTO state_transitions VALUES ('WIDEAREA','REBOOTED','REBOOTING','BootOK');
+REPLACE INTO state_transitions VALUES ('WIDEAREA','REBOOTED','REBOOTING','Error');
 REPLACE INTO state_transitions VALUES ('WIDEAREA','REBOOTED','SHUTDOWN','Error');
-REPLACE INTO state_transitions VALUES ('WIDEAREA','REBOOTING','BOOTING','DHCP');
 REPLACE INTO state_transitions VALUES ('WIDEAREA','REBOOTING','REBOOTED','BootOK');
-REPLACE INTO state_transitions VALUES ('WIDEAREA','REBOOTING','REBOOTING','BootOK');
-REPLACE INTO state_transitions VALUES ('WIDEAREA','SHUTDOWN','BOOTING','DHCP');
-REPLACE INTO state_transitions VALUES ('WIDEAREA','SHUTDOWN','REBOOTED','Error');
+REPLACE INTO state_transitions VALUES ('WIDEAREA','REBOOTING','REBOOTING','Retry');
+REPLACE INTO state_transitions VALUES ('WIDEAREA','SHUTDOWN','REBOOTED','BootOK');
 REPLACE INTO state_transitions VALUES ('WIDEAREA','SHUTDOWN','SHUTDOWN','Retry');
 REPLACE INTO state_transitions VALUES ('PCVM','BOOTING','SHUTDOWN','Error');
 REPLACE INTO state_transitions VALUES ('PCVM','BOOTING','TBSETUP','BootOK');