Merge pull request unraid#2564 from SimonFair/change-flash-name

feat(flash): change flash to boot device

Author: limetech

emhttp/languages/en_US/helptext.txt

@@ -103,9 +103,9 @@ periodically to move user share files off the Cache and onto the Array.
 :end
 
 :boot_device_help:
-Vital array configuration is maintained on the USB Flash device; for this reason, it must remain
-plugged in to your server.  Click on [Flash](/Main/Flash?name=flash) to see the GUID and registration
-information, and to configure export settings.  Since the USB Flash device is formatted using FAT file system,
+Vital array configuration is maintained on the boot device; for this reason, it must remain
+plugged in to your server.  Click on [Boot Device](/Main/Boot?name=flash) to see the GUID and registration
+information, and to configure export settings.  Since the boot device is formatted using FAT file system,
 it may only be exported using SMB protocol.
 :end
 
@@ -442,7 +442,7 @@ array or the cache disk/pool.
 :end
 
 :flash_backup_help:
-Use *Flash backup* to create a single zip file of the current contents of the flash device and store it locally on your computer.
+Use *Boot device backup* to create a single zip file of the current contents of the boot device and store it locally on your computer.
 :end
 
 :syslinux_cfg_help:
@@ -1238,7 +1238,7 @@ Enter the TELNET port, default port is 23.
 
 :mgmt_use_ssh_help:
 SSH is enabled by default and offers a secure way of CLI access. Upon system startup SSH keys are automatically generated
-if not yet existing, and stored on the flash device in the folder */config/ssh*.
+if not yet existing, and stored on the boot device in the folder */config/ssh*.
 :end
 
 :mgmt_ssh_port_help:
@@ -1374,7 +1374,7 @@ provisioned and downloaded to your server.
 
 **nginx certificate handling details**
 
-nginx makes use of two certificate files stored on the USB flash boot device:<br>
+nginx makes use of two certificate files stored on the boot device:<br>
 
 - a self-signed certificate: `config/ssl/certs/<server-name>_unraid_bundle.pem`
 
@@ -1618,7 +1618,7 @@ This will send a copy of the syslog messages to the designated server.
 This setting is NO by default and must be used with care to avoid unnecessary wear and tear of the USB device.
 
 Change this setting to YES when troubleshooting is required and it is not possible to get the regular diagnostics information.
-A mirror of the syslog file is stored in the **logs** folder of the flash device.
+A mirror of the syslog file is stored in the **logs** folder of the boot device.
 :end
 
 :syslog_shutdown_flash_help:
@@ -1984,8 +1984,8 @@ The interface assignment rules can be changed here and might be necessary to set
 **eth0** is the main interface used to manage the Unraid system. The other interfaces are optional and may be used as desired.
 Every interface must be uniquely identified by its MAC (hardware) address.
 
-The interface assignment is stored on the flash device under */config/network-rules.cfg*. This file can be viewed with any editor, but it is recommended to make changes via the webGUI only.<br>
-Deleting the file *network-rules.cfg* from the flash device will restore automatic interface assignment after a system reboot.
+The interface assignment is stored on the boot device under */config/network-rules.cfg*. This file can be viewed with any editor, but it is recommended to make changes via the webGUI only.<br>
+Deleting the file *network-rules.cfg* from the boot device will restore automatic interface assignment after a system reboot.
 :end
 
 :eth_routing_table_help:
@@ -2174,7 +2174,7 @@ Select the desired time format which is used in the notifications archive. Recom
 
 :notifications_store_flash_help:
 By default notifications are stored on RAM disk, which will get lost upon system reboot.
-Notifications may be stored permanently on the flash drive under folder '/boot/config/plugins/dynamix' instead.
+Notifications may be stored permanently on the boot drive under folder '/boot/config/plugins/dynamix' instead.
 :end
 
 :notifications_system_help:
@@ -2293,7 +2293,7 @@ Select a default template when it is the first time you are configuring this app
 
 **User-defined templates**<br>
 Once you've added an application to your system through a Default template,
-the settings you specified are saved to your USB flash device to make it easy to rebuild your applications in the event an upgrade were to fail or if another issue occurred.
+the settings you specified are saved to your boot device to make it easy to rebuild your applications in the event an upgrade were to fail or if another issue occurred.
 To rebuild, simply select the previously loaded application from the User-defined list and all the settings for the container will appear populated from your previous setup.
 Clicking create will redownload the necessary files for the application and should restore you to a working state.
 To delete a User-defined template, select it from the list above and click the red X to the right of it.
@@ -2555,7 +2555,7 @@ Unraid server SSL port for secure web traffic.
 :end
 
 :unraidnet_inactivespanel_help:
-Click Activate to set up a local git repo for your local USB Flash boot device and connect to a dedicated remote on unraid.net tied to this server.
+Click Activate to set up a local git repo for your local boot device and connect to a dedicated remote on unraid.net tied to this server.
 :end
 
 :unraidnet_changespanel_help:
@@ -2720,7 +2720,7 @@ This page displays all the drivers available on this system. Filter the list acc
 
 Any 3rd party driver installed by a plugin will have a support symbol next to it, click this to get support for the plugin.
 
-Click the edit button to add/modify/delete any modprobe.d config file in the config/modprobe.d directory on the flash drive.
+Click the edit button to add/modify/delete any modprobe.d config file in the config/modprobe.d directory on the boot drive.
 :end
 
 :console_keyboard_help:

emhttp/plugins/dynamix.plugin.manager/scripts/plugin

@@ -105,11 +105,11 @@ name - MANDATORY plugin name, e.g., "myplugin" or "my-plugin" etc.
 
   The plugin should also create a directory under `/boot/config/plugins` named after the plugin, e.g.,
   `/boot/config/plugins/myplugin`.  Here is where you store plugin-specific files such as a configuration
-  file and icon file.  Note that this directory exists on the users USB Flash device and writes should be
+  file and icon file.  Note that this directory exists on the user's boot device and writes should be
   minimized.
 
   Upon successful installation, the plugin manager will copy the input plugin file to `/boot/config/plugins`
-  on the users USB Flash device, and create a symlink in `/var/log/plugins` also named after the plugin,
+  on the user's boot device, and create a symlink in `/var/log/plugins` also named after the plugin,
   e.g., `/var/log/plugins/myplugin`.  Each time the unRaid server is re-booted, all plugins stored
   in `/boot/config/plugins` are automatically installed; plugin authors should be aware of this behavior.
 

emhttp/plugins/dynamix.vm.manager/VMSettings.page

@@ -263,7 +263,7 @@ _(VM Usage refresh timer)_ (_(seconds)_):
 
 _(Boot Parameter Settings)_:
 : <div style="max-width: 400px; padding: 12px 16px; border-radius: 5px; background-color: rgba(240, 173, 78, 0.08); border: 1px solid rgba(240, 173, 78, 0.3); border-left: 4px solid #f0ad4e; font-size: 13px; line-height: 1.5; box-sizing: border-box;">
-  _(PCIe ACS Override, VFIO interrupts & GPU framebuffer settings are managed in)_ <a href="/Main/Flash#boot-parameters" style="color: #2196F3; font-weight: bold; text-decoration: underline;">_(Boot Parameters)_</a>.
+  _(PCIe ACS Override, VFIO interrupts & GPU framebuffer settings are managed in)_ <a href="/BootParameters#vm-parameters" style="color: #2196F3; font-weight: bold; text-decoration: underline;">_(Boot Parameters)_</a>.
   </div>
 
 </div>

emhttp/plugins/dynamix.vm.manager/scripts/libvirt_init

@@ -10,7 +10,7 @@ if [ ! -d /etc/libvirt/qemu ]; then
   log "initializing /etc/libvirt"
   # initialize with default settings
   cp -rp /etc/libvirt-/* /etc/libvirt
-  # check if libvirt image file exists on USB flash
+  # check if libvirt image file exists on boot device
   OLD_IMAGE=/boot/config/plugins/dynamix.kvm.manager/domain.img
   if [ ! -f $OLD_IMAGE ]; then
     OLD_IMAGE=/boot/config/plugins/virtMan/virtMan.img

emhttp/plugins/dynamix/ArrayOperation.page

@@ -486,7 +486,7 @@ var devices = new NchanSubscriber('/sub/devices<?=$spot?",parity":""?>',{subscri
 devices.on('message', function(msg, meta) {
   switch (<?if($spot):?>meta.id.channel()<?else:?>0<?endif;?>) {
   case 0:
-    // array + pool + ua + flash devices
+    // array + pool + ua + boot devices
     var get = JSON.parse(msg);
     for (var name in get) $('#'+name).html(get[name]);
     if (recall !== null) recall.html('&nbsp;');

emhttp/plugins/dynamix/BootInfo.page

@@ -1,5 +1,5 @@
 Menu="Boot:1"
-Title="Boot Device Settings"
+Title="Boot Device"
 Tag="usb"
 ---
 <?PHP
@@ -17,7 +17,7 @@ Tag="usb"
 <script>
 function cleanUp(zip) {
   if (document.hasFocus()) {
-    $('input[value="_(Creating Flash backup)_..."]').val("_(Flash backup)_").prop('disabled',false);
+    $('input[value="_(Creating boot device backup)_..."]').val("_(Boot device backup)_").prop('disabled',false);
     $('div.spinner').hide('slow');
     $('#pleaseWait').hide('slow');
     $.post('/webGui/include/Download.php',{cmd:'unlink',file:zip});
@@ -26,23 +26,24 @@ function cleanUp(zip) {
   }
 }
 function backup() {
-  $('input[value="_(Flash backup)_"]').val('_(Creating Flash backup)_...').prop('disabled',true);
+  $('input[value="_(Boot device backup)_"]').val('_(Creating boot device backup)_...').prop('disabled',true);
   $('div.spinner').show('slow');
   $('#pleaseWait').show('slow');
   $.post('/webGui/include/Download.php',{cmd:'backup'},function(zip) {
     if (zip) {
       location = '/'+zip;
       setTimeout(function(){cleanUp(zip);},6000);
     } else {
-      $('input[value="_(Creating Flash backup)_..."]').val("_(Flash backup)_");
+      var $btn = $('input[value="_(Creating boot device backup)_..."]');
+      $btn.val("_(Boot device backup)_").prop('disabled',false);
       $('div.spinner').hide('slow');
       $('#pleaseWait').hide('slow');
       swal({title:"_(Creation error)_",text:"_(Insufficient free disk space available)_",type:'error',html:true,confirmButtonText:"_(Ok)_"});
     }
   });
 }
 </script>
-<div id="pleaseWait" style="display:none;text-align:center;margin-bottom:24px"><span class="red-text strong">_(Please wait)_... _(creating Flash backup zip file (this may take several minutes))_</span></div>
+<div id="pleaseWait" style="display:none;text-align:center;margin-bottom:24px"><span class="red-text strong">_(Please wait)_... _(creating boot device backup zip file (this may take several minutes))_</span></div>
 
 _(Flash Vendor)_:
 : <?=htmlspecialchars($var['flashVendor'] ?? '', ENT_QUOTES, 'UTF-8');?>
@@ -53,8 +54,6 @@ _(Flash Product)_:
 _(Flash GUID)_:
 : <?=htmlspecialchars($var['flashGUID'] ?? '', ENT_QUOTES, 'UTF-8');?>&nbsp;
 
-_(Pool GUID)_:
-: <?=htmlspecialchars($var['poolGUID'] ?? '', ENT_QUOTES, 'UTF-8');?>&nbsp;
 
 <?if (strstr($var['regTy'], "blacklisted")):?>
 
@@ -72,6 +71,6 @@ _(Pool GUID)_:
 
 &nbsp;
 : <span class="inline-block">
-    <input type="button" value="_(Flash backup)_" onclick="backup()">
+    <input type="button" value="_(Boot device backup)_" onclick="backup()">
     <input type="button" value="_(Done)_" onclick="done()">
   </span>

emhttp/plugins/dynamix/BootParameters.page

@@ -49,7 +49,7 @@ $csrf_token = $var['csrf_token'] ?? '';
     </div>
 
     <!-- VM Passthrough Section -->
-    <section class="section" id="boot-parameters">
+    <section class="section" id="vm-parameters">
         <h3 class="section-header">_(VM Passthrough)_</h3>
 
         <div class="warning-box">

emhttp/plugins/dynamix/DashStats.page

@@ -513,7 +513,7 @@ switch ($themeHelper->getThemeName()) { // $themeHelper set in DefaultPageLayout
                                       <div class='pie' id='sys0'><span class='sys0'></span><span class='var0'></span></div>
                                   </span>
                                   <span>
-                                      <a class='info hand none'>_(Flash device)_<span>_(Percent usage of flash usb device)_ (<?=$flashsize?>)</span></a>
+                                      <a class='info hand none'>_(Boot device)_<span>_(Percent usage of boot device)_ (<?=$flashsize?>)</span></a>
                                       <div class='pie' id='sys1'><span class='sys1'></span><span class='var1'></span></div>
                                   </span>
                                   <span>
@@ -1183,7 +1183,7 @@ switch ($themeHelper->getThemeName()) { // $themeHelper set in DefaultPageLayout
                                     <span class='tile-header-left'>
                                         <i class='icon-disk f32'></i>
                                         <div class='section'>
-                                            <h3 class='tile-header-main'><?=_(native($pool),3).($started ? '' : ' ('._('stopped').')')?> <span class='tile-header-main' id="pool_status_<?=$i?>"> <?=_('Status')." :"?></span></h3>
+                                            <h3 class='tile-header-main'><?=($pool=='flash' ? _('Internal boot') : _(native($pool),3)).($started ? '' : ' ('._('stopped').')')?> <span class='tile-header-main' id="pool_status_<?=$i?>"> <?=_('Status')." :"?></span></h3>
                                             <span>
                                                 <?if ($started):?>
                                                     <?
@@ -2613,7 +2613,7 @@ dashboard.on('message',function(msg,meta) {
     for (var i=0,name; name=get.name[i]; i++) if (i!=1) html.push("<i class='ups fa fa-circle' style='color:"+(colors[i]||blue)+"'></i>"+name+": "+(i==0?get.ram[5]:get.ram[i*2+3]));
     html.push("<i class='ups fa fa-circle' style='color:"+colors[1]+"'></i>"+get.name[1]+": "+get.ram[3]);
     $('#dynamic').html(html.join('<br>'));
-    // flash, Log & Docker graphs
+    // boot device, Log & Docker graphs
     for (var k=1,sys; sys=get.sys[k-1]; k++) {
       var load = sys[0].slice(0,-1);
       $('.sys'+k).text(sys[0]).css({'color':fontColor(load,<?=$display['critical']?>,<?=$display['warning']?>)});

emhttp/plugins/dynamix/DeviceInfo.page

@@ -836,7 +836,7 @@ _(Name)_:
 
 <?else:?>
 _(Name)_:
-: <?=_(my_disk(native(htmlspecialchars($name))), 3)?>
+: <?=$name=='flash' ? _('Boot Device') : _(my_disk(native(htmlspecialchars($name))), 3)?>
 
 <?endif;?>
 <?if (diskStatus('_NP')):?>