Commit 29cb6567 authored by Leigh B Stoller's avatar Leigh B Stoller

Merge branch 'imagealiases' of gitlab.flux.utah.edu:emulab/emulab-devel into imagealiases

parents 0c0a91eb 5d030417
...@@ -64,6 +64,8 @@ mfs:*frisbee) ...@@ -64,6 +64,8 @@ mfs:*frisbee)
;; ;;
*) *)
echo "rebooting..." echo "rebooting..."
$BINDIR/tmcc state SHUTDOWN
sleep 1
reboot reboot
;; ;;
esac esac
......
...@@ -439,6 +439,7 @@ REPLACE INTO state_timeouts VALUES ('WIMRELOAD','SHUTDOWN',240,'REBOOT'); ...@@ -439,6 +439,7 @@ REPLACE INTO state_timeouts VALUES ('WIMRELOAD','SHUTDOWN',240,'REBOOT');
REPLACE INTO state_timeouts VALUES ('WIMRELOAD','RELOADSETUP',60,'NOTIFY'); REPLACE INTO state_timeouts VALUES ('WIMRELOAD','RELOADSETUP',60,'NOTIFY');
REPLACE INTO state_timeouts VALUES ('WIMRELOAD','RELOADING',1800,'NOTIFY'); REPLACE INTO state_timeouts VALUES ('WIMRELOAD','RELOADING',1800,'NOTIFY');
REPLACE INTO state_timeouts VALUES ('WIMRELOAD','RELOADDONE',60,'NOTIFY'); REPLACE INTO state_timeouts VALUES ('WIMRELOAD','RELOADDONE',60,'NOTIFY');
REPLACE INTO state_timeouts VALUES ('PXEKERNEL','PXEBOOTING',120,'REBOOT');
-- --
-- Dumping data for table `state_transitions` -- Dumping data for table `state_transitions`
...@@ -707,6 +708,8 @@ REPLACE INTO state_transitions VALUES ('RELOAD-PCVM','RELOADING','RELOADFAILED', ...@@ -707,6 +708,8 @@ REPLACE INTO state_transitions VALUES ('RELOAD-PCVM','RELOADING','RELOADFAILED',
REPLACE INTO state_transitions VALUES ('RELOAD-PCVM','RELOADFAILED','SHUTDOWN',''); REPLACE INTO state_transitions VALUES ('RELOAD-PCVM','RELOADFAILED','SHUTDOWN','');
REPLACE INTO state_transitions VALUES ('RELOAD-UE','RELOADING','RELOADDONE','ReloadDone'); REPLACE INTO state_transitions VALUES ('RELOAD-UE','RELOADING','RELOADDONE','ReloadDone');
REPLACE INTO state_transitions VALUES ('RELOAD-UE','SHUTDOWN','RELOADING','Booting'); REPLACE INTO state_transitions VALUES ('RELOAD-UE','SHUTDOWN','RELOADING','Booting');
REPLACE INTO state_transitions VALUES ('NORMALv2','BOOTING','PXEWAIT','MoonshotPxeWait');
REPLACE INTO state_transitions VALUES ('PXEKERNEL','PXEWAKEUP','SHUTDOWN','MoonshotBootDisk');
-- --
-- Dumping data for table `state_triggers` -- Dumping data for table `state_triggers`
...@@ -741,6 +744,7 @@ REPLACE INTO state_triggers VALUES ('*','WIMRELOAD','PXEBOOTING','REBOOT'); ...@@ -741,6 +744,7 @@ REPLACE INTO state_triggers VALUES ('*','WIMRELOAD','PXEBOOTING','REBOOT');
REPLACE INTO state_triggers VALUES ('*','WIMRELOAD','BOOTING','REBOOT'); REPLACE INTO state_triggers VALUES ('*','WIMRELOAD','BOOTING','REBOOT');
REPLACE INTO state_triggers VALUES ('*','WIMRELOAD','ISUP','REBOOT'); REPLACE INTO state_triggers VALUES ('*','WIMRELOAD','ISUP','REBOOT');
REPLACE INTO state_triggers VALUES ('*','RELOAD-UE','RELOADDONE','RELOADDONE'); REPLACE INTO state_triggers VALUES ('*','RELOAD-UE','RELOADDONE','RELOADDONE');
REPLACE INTO state_triggers VALUES ('*','NORMALv2','PXEWAIT','PXEBOOT');
-- --
-- Dumping data for table `table_regex` -- Dumping data for table `table_regex`
......
#
# Stated stuff for Moonshot ARM cartridges.
#
use strict;
use libdb;
sub DoUpdate($$$)
{
my ($dbhandle, $dbname, $version) = @_;
DBQueryFatal("REPLACE INTO state_timeouts VALUES ".
"('PXEKERNEL','PXEBOOTING',120,'REBOOT')");
DBQueryFatal("REPLACE INTO state_transitions VALUES ".
"('NORMALv2','BOOTING','PXEWAIT','MoonshotPxeWait')");
DBQueryFatal("REPLACE INTO state_transitions VALUES ".
"('PXEKERNEL','PXEWAKEUP','SHUTDOWN','MoonshotBootDisk')");
DBQueryFatal("REPLACE INTO state_triggers VALUES ".
"('*','NORMALv2','PXEWAIT','PXEBOOT')");
return 0;
}
1;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment