clean up the boot states area

diff --git a/migrations/v4-to-v5/migrate.sql b/migrations/v4-to-v5/migrate.sql
index 6f36acb..c02390f 100644 (file)
--- a/migrations/v4-to-v5/migrate.sql
+++ b/migrations/v4-to-v5/migrate.sql
@@ -242,8 +242,8 @@ INSERT INTO boot_states (boot_state)
 -- rcnf              failboot ?
 
 
-UPDATE nodes SET boot_state='safeboot' WHERE boot_state='dbg';
-UPDATE nodes SET boot_state='failboot' WHERE boot_state='diag';
+UPDATE nodes SET boot_state='failboot' WHERE boot_state='dbg';
+UPDATE nodes SET boot_state='safeboot' WHERE boot_state='diag';
 UPDATE nodes SET boot_state='disabled' WHERE boot_state='disable';
 UPDATE nodes SET boot_state='install' WHERE boot_state='inst';
 UPDATE nodes SET boot_state='reinstall' WHERE boot_state='rins';

diff --git a/planetlab5.sql b/planetlab5.sql
index 0f3e9fd..b4c0516 100644 (file)
--- a/planetlab5.sql
+++ b/planetlab5.sql
@@ -252,7 +252,7 @@ CREATE TABLE boot_states (
     boot_state text PRIMARY KEY
 ) WITH OIDS;
 INSERT INTO boot_states (boot_state) 
-       VALUES ('boot'), ('dbg'), ('diag'), ('disable'), ('inst'), ('rins'), ('new');
+       VALUES ('boot'), ('safeboot'), ('failboot'), ('disabled'), ('install'), ('reinstall');
 
 -- Nodes
 CREATE TABLE nodes (