seasharp
/
anvil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed an XML parse error (-- in comments) and pre-set the last_update to 0 to avoid warnings when running anvil-update-system without a job-uuid.

Browse Source 
Signed-off-by: Digimer <digimer@alteeve.ca>
main
Digimer 6 years ago
parent 5f77ff5885
commit 459fcfbcb3
2 changed files with 13 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      share/words.xml
  2. 3
      tools/anvil-update-system

20
share/words.xml
Unescape View File

@ -130,7 +130,7 @@ NOTE: Please be patient!
<key name="message_0083">Editing of this option is disabled.</key> <key name="message_0083">Editing of this option is disabled.</key>
<key name="message_0084">^1. Install a Striker dashboard (Fedora 28 64-bit)</key> <key name="message_0084">^1. Install a Striker dashboard (Fedora 28 64-bit)</key>
<!-- Keep help text wrapped within the area shown directly below for the 'help' section of PXE 'default' meny entry. --> <!-- Keep help text wrapped within the area shown directly below for the 'help' section of PXE 'default' meny entry. -->
<!-- /-----------------------------------------------------------------------------------------------------------\ --> <!-- /===========================================================================================================\ -->
<key name="message_0085"> <key name="message_0085">
This install will choose the largest available fixed disk (spindle or platter), remove any data from it, This install will choose the largest available fixed disk (spindle or platter), remove any data from it,
repartition in and install. This is a fully automated process! Once selected, the only way to abort will be repartition in and install. This is a fully automated process! Once selected, the only way to abort will be
@ -139,10 +139,10 @@ NOTE: Please be patient!
*** ALL EXISTING DATA ON SELECTED DRIVE WILL BE LOST! *** *** ALL EXISTING DATA ON SELECTED DRIVE WILL BE LOST! ***
*** THERE WILL BE NO FURTHER PROMPT! PROCEED CAREFULLY! *** *** THERE WILL BE NO FURTHER PROMPT! PROCEED CAREFULLY! ***
</key> </key>
<!-- \-----------------------------------------------------------------------------------------------------------/ --> <!-- \===========================================================================================================/ -->
<key name="message_0086">^2. Install an Anvil! Node (Fedora 28 64-bit)</key> <key name="message_0086">^2. Install an Anvil! Node (Fedora 28 64-bit)</key>
<!-- Keep help text wrapped within the area shown directly below for the 'help' section of PXE 'default' meny entry. --> <!-- Keep help text wrapped within the area shown directly below for the 'help' section of PXE 'default' meny entry. -->
<!-- /-----------------------------------------------------------------------------------------------------------\ --> <!-- /===========================================================================================================\ -->
<key name="message_0087"> <key name="message_0087">
This install will choose the smallest available fixed rotating disk, if available. If none is found, the This install will choose the smallest available fixed rotating disk, if available. If none is found, the
smallest solid-state fixed disk will be chosen. All data will be removed, the disk repartitioned and a new OS smallest solid-state fixed disk will be chosen. All data will be removed, the disk repartitioned and a new OS
@ -152,11 +152,11 @@ NOTE: Please be patient!
*** ALL EXISTING DATA ON SELECTED DRIVE WILL BE LOST! *** *** ALL EXISTING DATA ON SELECTED DRIVE WILL BE LOST! ***
*** THERE WILL BE NO FURTHER PROMPT! PROCEED CAREFULLY! *** *** THERE WILL BE NO FURTHER PROMPT! PROCEED CAREFULLY! ***
</key> </key>
<!-- \-----------------------------------------------------------------------------------------------------------/ --> <!-- \===========================================================================================================/ -->
<key name="message_0088">^3. Install an Anvil! Disaster Recover Host (Fedora 28 64-bit)</key> <key name="message_0088">^3. Install an Anvil! Disaster Recover Host (Fedora 28 64-bit)</key>
<key name="message_0089"> <key name="message_0089">
<!-- Keep help text wrapped within the area shown directly below for the 'help' section of PXE 'default' meny entry. --> <!-- Keep help text wrapped within the area shown directly below for the 'help' section of PXE 'default' meny entry. -->
<!-- /-----------------------------------------------------------------------------------------------------------\ --> <!-- /===========================================================================================================\ -->
This install will choose the smallest available fixed rotating disk, if available. If none is found, the This install will choose the smallest available fixed rotating disk, if available. If none is found, the
smallest solid-state fixed disk will be chosen. All data will be removed, the disk repartitioned and a new OS smallest solid-state fixed disk will be chosen. All data will be removed, the disk repartitioned and a new OS
will be installed. This is a fully automated process! Once selected, the only way to abort will be a manual will be installed. This is a fully automated process! Once selected, the only way to abort will be a manual
@ -164,27 +164,27 @@ NOTE: Please be patient!
*** ALL EXISTING DATA ON SELECTED DRIVE WILL BE LOST! *** *** ALL EXISTING DATA ON SELECTED DRIVE WILL BE LOST! ***
*** THERE WILL BE NO FURTHER PROMPT! PROCEED CAREFULLY! *** *** THERE WILL BE NO FURTHER PROMPT! PROCEED CAREFULLY! ***
<!-- \-----------------------------------------------------------------------------------------------------------/ --> <!-- \===========================================================================================================/ -->
</key> </key>
<key name="message_0090">Boot into a ^Rescue session</key> <key name="message_0090">Boot into a ^Rescue session</key>
<key name="message_0091"> <key name="message_0091">
<!-- Keep help text wrapped within the area shown directly below for the 'help' section of PXE 'default' meny entry. --> <!-- Keep help text wrapped within the area shown directly below for the 'help' section of PXE 'default' meny entry. -->
<!-- /-----------------------------------------------------------------------------------------------------------\ --> <!-- /===========================================================================================================\ -->
This will boot into a rescue shell. From there, you can access the bare hard drive on the machine to attempt This will boot into a rescue shell. From there, you can access the bare hard drive on the machine to attempt
to diagnose and repair problems that might be preventing a system from booting. to diagnose and repair problems that might be preventing a system from booting.
No data on the target machine will be changed by this option. No data on the target machine will be changed by this option.
</key> </key>
<!-- \-----------------------------------------------------------------------------------------------------------/ --> <!-- \===========================================================================================================/ -->
<key name="message_0092">Install ^Standard Fedora 28 64-bit Install</key> <key name="message_0092">Install ^Standard Fedora 28 64-bit Install</key>
<!-- Keep help text wrapped within the area shown directly below for the 'help' section of PXE 'default' meny entry. --> <!-- Keep help text wrapped within the area shown directly below for the 'help' section of PXE 'default' meny entry. -->
<!-- /-----------------------------------------------------------------------------------------------------------\ --> <!-- /===========================================================================================================\ -->
<key name="message_0093"> <key name="message_0093">
This will start a standard install of Fedora 28. This will start a standard install of Fedora 28.
This option will not change anything on disk until and unless you choose to do so. This option will not change anything on disk until and unless you choose to do so.
</key> </key>
<!-- \-----------------------------------------------------------------------------------------------------------/ --> <!-- \===========================================================================================================/ -->
<key name="message_0094">Boot from Next ^Boot Device</key> <key name="message_0094">Boot from Next ^Boot Device</key>
<key name="message_0095">Restarting: [#!variable!daemon!#] after updating the file: [#!variable!file!#].</key> <key name="message_0095">Restarting: [#!variable!daemon!#] after updating the file: [#!variable!file!#].</key>
<key name="message_0096">The file: [#!variable!file!#] did not need to be updated.</key> <key name="message_0096">The file: [#!variable!file!#] did not need to be updated.</key>

3
tools/anvil-update-system
Unescape View File

@ -192,6 +192,9 @@ sub run_os_update
{ {
my ($anvil) = @_; my ($anvil) = @_;
# This needs to be set to avoid warnings when called without a job-uuid.
$anvil->data->{sys}{last_update} = 0;
# NOTE: We run this directly to better monitor progress and update the progress. # NOTE: We run this directly to better monitor progress and update the progress.
my $transaction_shown = 0; my $transaction_shown = 0;
my $success = 0; my $success = 0;

Write Preview
Loading…
Cancel
Save