feat: initial internal boot support

Author: limetech

emhttp/plugins/dynamix/Boot.page

@@ -0,0 +1,2 @@
+Type="xmenu"
+Tabs="true"

emhttp/plugins/dynamix/BootMode.page

@@ -1,4 +1,4 @@
-Menu="Flash:999"
+Menu="Flash:4"
 Title="Boot Mode"
 Tag="edit"
 ---

emhttp/plugins/dynamix/CacheDevices.page

@@ -76,6 +76,31 @@ function addPoolPopup() {
   });
   dialogStyle();
 }
+function addBootPoolPopup() {
+  var popup = $('#dialogWindow');
+  // Load popup with the template info
+  popup.html($("#templatePopupBootPool").html());
+  // Start Dialog section
+  popup.dialog({
+    title: "_(Add Bootable Pool)_",
+    height: 'auto',
+    width: 600,
+    resizable: false,
+    modal: true,
+    buttons: {
+    "_(Add)_": function() {
+        if (validate($(this).find('input[name="poolName"]').val())) {
+          $(this).find('form').submit();
+          $(this).dialog('close');
+        }
+      },
+    "_(Cancel)_": function() {
+        $(this).dialog('close');
+      }
+    }
+  });
+  dialogStyle();
+}
 function removeOption(inputString,value) {
   // Define a regular expression to match <option>...</option> substrings
   const optionPattern = /<option .*?<\/option>/g;
@@ -190,6 +215,9 @@ $root  = explode($_tilde_,$pool)[0];
 
 <?if (_var($var,'fsState')=="Stopped"):?>
 <input type="button" value="_(Add Pool)_" style="margin:0" onclick="addPoolPopup()">
+<?if (_var($var,'bootEligible')=="yes"):?>
+<input type="button" value="_(Add Bootable Pool)_" style="margin:0" onclick="addBootPoolPopup()">
+<?endif;?>
 
 <div id="templatePopupPool" class="template">
 <form markdown="1" method="POST" action="/update.htm" target="progressFrame" onsubmit="return validate(this.poolName.value)">
@@ -198,13 +226,34 @@ $root  = explode($_tilde_,$pool)[0];
 _(Name)_:
 : <input type="text" name="poolName" maxlength="40" value="<?=count($pools)==0?'cache':''?>">
 
+_(Slots)_:
+: <select name="poolSlots">
+  <?for ($n=1; $n<=2; $n++):?>
+  <?=mk_option(1,$n,$n)?>
+  <?endfor;?>
+  </select>
+
+</form>
+</div>
+
+<div id="templatePopupBootPool" class="template">
+<form markdown="1" method="POST" action="/update.htm" target="progressFrame" onsubmit="return validate(this.poolName.value)">
+<input type="hidden" name="poolBootable" value="yes">
+<input type="hidden" name="changeSlots" value="apply">
+
+_(Name)_:
+: <input type="text" name="poolName" maxlength="40" value="<?=count($pools)==0?'cache':''?>">
+
 _(Slots)_:
 : <select name="poolSlots">
   <?for ($n=1; $n<=_var($var,'MAX_CACHESZ',0); $n++):?>
   <?=mk_option(1,$n,$n)?>
   <?endfor;?>
   </select>
 
+_(Boot reserved size)_ (_(MiB)_):
+: <input type="number" name="poolBootSize" maxlength="10" value="<?=_var($var,'bootSizeDefault')?>" class="narrow">
+
 </form>
 </div>
 

emhttp/plugins/dynamix/DeviceInfo.page

@@ -1,4 +1,4 @@
-Menu="Device:1"
+Menu="Device:1 Boot:1"
 Title="$name _(Settings)_"
 Tag="hdd-o"
 Cond="array_key_exists($name, $disks) || array_key_exists($name, $devs)"
@@ -38,7 +38,10 @@ function hasSubpools($name)
     }
     return false;
 }
-if (!isSubpool($name)) {
+if (_var($disk,'type')== "Boot") {
+    $fsTypeImmutable = true;
+    $fsProfileImmutable = true;
+} elseif (!isSubpool($name)) {
     $fsTypeImmutable = !(_var($var, 'fsState') == 'Stopped' && !hasSubpools($name) && (empty(_var($disk, 'uuid')) || _var($disk, 'slots', 1) == 1));
     $fsProfileImmutable = $fsTypeImmutable;
 } else {
@@ -835,12 +838,19 @@ _(Identification)_:
 
 <?endif;?>
 <?if (!$unassigned):?>
-<?if (diskType('Data') || (diskType('Cache') && isPool($name) && !isSubpool($name))):?>
+<?if (isset($disk['fsType'])):?>
+<?if (diskType('Boot')):?>
+_(Comments)_:
+
+: <?=htmlspecialchars(_var($disk, 'comment'))?>
+
+<?else:?>
 _(Comments)_:
 : <input type="text" name="diskComment.<?=_var($disk, 'idx', 0)?>" maxlength="256" value="<?=htmlspecialchars(_var($disk, 'comment'))?>">
 
 :info_comments_help:
 
+<?endif;?>
 <?endif;?>
 _(Partition size)_:
 : <?=my_number(_var($disk, 'size', 0))?> KB (K=1024)
@@ -874,7 +884,7 @@ _(Spin down delay)_:
   </select><span id="smart_selftest" class='orange-text'></span>
 
 <?endif;?>
-<?if (diskType('Data') || (isPool($tag) && !isSubpool($tag))):?>
+<?if (isset($disk['fsType'])):?>
 _(File system status)_:
 : <?=_(_var($disk, 'fsStatus'))?><?=(_var($disk,'fsStatus')==="Mounted")? (_var($disk,'fsEmpty')==="yes"? ", empty" : ", not empty"):""?>&nbsp;
 
@@ -940,6 +950,17 @@ _(Autotrim)_:
 
 :info_autotrim_help:
 </div>
+<?endif;?>
+<?if (diskType('Boot') && isset($disk['fsType'])):?>
+_(Allocation profile)_:
+: <?=_(_var($disk, 'fsProfile'))?>&nbsp;
+
+_(Compression)_:
+: <?=_(_var($disk, 'compression'))?>&nbsp;
+
+_(Autotrim)_:
+: <?=_(_var($disk, 'autotrim'))?>&nbsp;
+
 <?endif;?>
 <?if (isPool($tag) && !isSubpool($tag)):?>
 _(Enable user share assignment)_:
@@ -957,7 +978,7 @@ _(Minimum free space)_:
 :info_free_space_help:
 
 <?endif;?>
-<?if (diskType('Data') || (isPool($tag) && !isSubpool($tag))):?>
+<?if (isset($disk['fsType'])):?>
 _(Warning disk utilization threshold)_ (%):
 : <input type="number" min="0" max="100" name="diskWarning.<?=_var($disk, 'idx', 0)?>" autocomplete="off" spellcheck="false" value="<?=_var($disk, 'warning')?>" placeholder="<?=_var($display, 'warning')?>">
 
@@ -999,11 +1020,11 @@ _(Critical disk utilization threshold)_ (%):
 <form markdown="1" method="POST" action="/update.php" target="progressFrame">
 
 _(pool device stats)_:
-: <pre><?= htmlspecialchars(shell_exec("/sbin/btrfs dev stats -T ".escapeshellarg("/mnt/$tag")) ?? '', ENT_QUOTES, 'UTF-8') ?></pre>
+: <pre><?= htmlspecialchars(shell_exec("/sbin/btrfs dev stats -T ".escapeshellarg(_var($disk,'fsMountpoint'))) ?? '', ENT_QUOTES, 'UTF-8') ?></pre>
 
 <input type="hidden" name="#command" value="/webGui/scripts/btrfs_check">
 <input type="hidden" name="#arg[1]" value="reset">
-<input type="hidden" name="#arg[2]" value="/mnt/<?=$tag?>">
+<input type="hidden" name="#arg[2]" value="<?=_var($disk,'fsMountpoint')?>">
 
 &nbsp;
 : <span class="buttons-spaced">
@@ -1017,13 +1038,13 @@ _(pool device stats)_:
     <i class="title fa fa-balance-scale"></i>_(Balance Status)_
   </span>
 </div>
-<form markdown="1" method="POST" action="/update.php" target="progressFrame" onsubmit="prepareFS(this,'btrfs-balance-<?=$tag?>','/mnt/<?=$tag?>')">
+<form markdown="1" method="POST" action="/update.php" target="progressFrame" onsubmit="prepareFS(this,'btrfs-balance-<?=$tag?>','<?=_var($disk,'fsMountpoint')?>')">
 <?if (_var($disk,'fsStatus')=="Mounted"):?>
-<?exec("$docroot/webGui/scripts/btrfs_balance status ".escapeshellarg("/mnt/$tag"), $balance_status, $retval)?>
-<?$usage = exec("/sbin/btrfs fi usage ".escapeshellarg("/mnt/$tag")." | grep -Pom1 '^Data,.+ \\(\\K[^%]+'");?>
+<?exec("$docroot/webGui/scripts/btrfs_balance status ".escapeshellarg(_var($disk,'fsMountpoint')), $balance_status, $retval)?>
+<?$usage = exec("/sbin/btrfs fi usage ".escapeshellarg(_var($disk,'fsMountpoint'))." | grep -Pom1 '^Data,.+ \\(\\K[^%]+'");?>
 
 _(btrfs filesystem usage)_:
-: <pre><?= htmlspecialchars(shell_exec("/sbin/btrfs fi usage -T ".escapeshellarg("/mnt/$tag")) ?? '', ENT_QUOTES, 'UTF-8') ?></pre>
+: <pre><?= htmlspecialchars(shell_exec("/sbin/btrfs fi usage -T ".escapeshellarg(_var($disk,'fsMountpoint'))) ?? '', ENT_QUOTES, 'UTF-8') ?></pre>
 
 <div>
   <dl>
@@ -1034,7 +1055,7 @@ _(btrfs filesystem usage)_:
 <?if ($retval != 0):?>
 <input type="hidden" name="#command" value="/webGui/scripts/btrfs_balance">
 <input type="hidden" name="#arg[1]" value="start">
-<input type="hidden" name="#arg[2]" value="/mnt/<?=$tag?>">
+<input type="hidden" name="#arg[2]" value="<?=_var($disk,'fsMountpoint')?>">
 <input type="hidden" name="#arg[3]" value="">
 
 &nbsp;
@@ -1069,7 +1090,7 @@ _(btrfs filesystem usage)_:
 <?else:?>
 <input type="hidden" name="#command" value="/webGui/scripts/btrfs_balance">
 <input type="hidden" name="#arg[1]" value="cancel">
-<input type="hidden" name="#arg[2]" value="/mnt/<?=$tag?>">
+<input type="hidden" name="#arg[2]" value="<?=_var($disk,'fsMountpoint')?>">
 
 &nbsp;
 : <span>
@@ -1096,7 +1117,7 @@ _(btrfs filesystem usage)_:
 <input type="hidden" name="#file" value="dynamix/dynamix.cfg">
 <input type="hidden" name="#section" value="<?=$balance?>">
 <input type="hidden" name="#include" value="/webGui/include/update.btrfs.php">
-<input type="hidden" name="#job" value="balance_<?=$tag?>;<?=$docroot?>/plugins/dynamix/scripts/btrfs_balance start /mnt/<?=$tag?> -dusage=50">
+<input type="hidden" name="#job" value="balance_<?=$tag?>;<?=$docroot?>/plugins/dynamix/scripts/btrfs_balance start <?=_var($disk,'fsMountpoint')?> -dusage=50">
 <input type="hidden" name="hour" value="">
 
 _(Balance schedule)_:
@@ -1162,17 +1183,17 @@ _(Block group usage)_ (%):
     <i class="title fa fa-paint-brush"></i>_(Scrub Status)_
   </span>
 </div>
-<form markdown="1" method="POST" action="/update.php" target="progressFrame" onsubmit="prepareFS(this,'btrfs-scrub-<?=$tag?>','/mnt/<?=$tag?>')">
+<form markdown="1" method="POST" action="/update.php" target="progressFrame" onsubmit="prepareFS(this,'btrfs-scrub-<?=$tag?>','<?=_var($disk,'fsMountpoint')?>')">
 <?if (_var($disk,'fsStatus')=="Mounted"):?>
-<?exec("$docroot/webGui/scripts/btrfs_scrub status ".escapeshellarg("/mnt/$tag"), $scrub_status, $retval)?>
+<?exec("$docroot/webGui/scripts/btrfs_scrub status ".escapeshellarg(_var($disk,'fsMountpoint')), $scrub_status, $retval)?>
 
 _(btrfs scrub status)_:
 : <pre id='btrfs-scrub'><?=implode("\n", $scrub_status)?></pre>
 
 <?if ($retval != 0):?>
 <input type="hidden" name="#command" value="/webGui/scripts/btrfs_scrub">
 <input type="hidden" name="#arg[1]" value="start">
-<input type="hidden" name="#arg[2]" value="/mnt/<?=$tag?>">
+<input type="hidden" name="#arg[2]" value="<?=_var($disk,'fsMountpoint')?>">
 <input type="hidden" name="#arg[3]" value="">
 
 &nbsp;
@@ -1185,7 +1206,7 @@ _(btrfs scrub status)_:
 <?else:?>
 <input type="hidden" name="#command" value="/webGui/scripts/btrfs_scrub">
 <input type="hidden" name="#arg[1]" value="cancel">
-<input type="hidden" name="#arg[2]" value="/mnt/<?=$tag?>">
+<input type="hidden" name="#arg[2]" value="<?=_var($disk,'fsMountpoint')?>">
 
 &nbsp;
 : <span class="buttons-spaced">
@@ -1212,7 +1233,7 @@ _(btrfs scrub status)_:
 <input type="hidden" name="#file" value="dynamix/dynamix.cfg">
 <input type="hidden" name="#section" value="<?=$scrub?>">
 <input type="hidden" name="#include" value="/webGui/include/update.btrfs.php">
-<input type="hidden" name="#job" value="scrub_<?=$tag?>;<?=$docroot?>/plugins/dynamix/scripts/btrfs_scrub start /mnt/<?=$tag?> -r">
+<input type="hidden" name="#job" value="scrub_<?=$tag?>;<?=$docroot?>/plugins/dynamix/scripts/btrfs_scrub start <?=_var($disk,'fsMountpoint')?> -r">
 <input type="hidden" name="hour" value="">
 
 _(Scrub schedule)_:
@@ -1270,6 +1291,7 @@ _(Time of the day)_:
   </span>
 </form>
 
+<?if (diskType('Data','Cache')):?>
 <div class="title nocontrol">
   <span class="left">
     <i class="title fa fa-shield"></i>_(Check Filesystem Status)_
@@ -1323,6 +1345,7 @@ _(btrfs check status)_:
 <?endif;?>
 </form>
 <?endif;?>
+<?endif;?>
 <?if (fsType('zfs') && !isSubpool($name)):?>
 <div class="title nocontrol">
   <span class="left">
@@ -1797,7 +1820,7 @@ _(check status)_:
 </form>
 <?endif;?>
 
-<?if (!diskStatus('_NP')):?>
+<?if (!diskType('Boot') && !diskStatus('_NP')):?>
 <div class="title"><span class="left"><i class="title fa fa-plus-square"></i>_(SMART Settings)_</span></div>
 
 <form markdown="1" name="smart_settings" method="POST" action="/update.php" target="progressFrame" onsubmit="prepareDeviceInfo(this)">
@@ -1966,15 +1989,15 @@ $(function() {
       for (var i=0,busy; busy=action[i]; i++) {
         switch (busy) {
         case 'btrfs-balance':
-          $.cookie('btrfs-balance-<?=$tag?>','/mnt/<?=$tag?>');
+          $.cookie('btrfs-balance-<?=$tag?>','<?=_var($disk,'fsMountpoint')?>');
           btrfsBalance($.cookie('btrfs-balance-<?=$tag?>'));
           break;
         case 'btrfs-scrub':
-          $.cookie('btrfs-scrub-<?=$tag?>','/mnt/<?=$tag?>');
+          $.cookie('btrfs-scrub-<?=$tag?>','<?=_var($disk,'fsMountpoint')?>');
           btrfsScrub($.cookie('btrfs-scrub-<?=$tag?>'));
           break;
         case 'btrfs-check':
-          $.cookie('btrfs-check-<?=$tag?>','/mnt/<?=$tag?>');
+          $.cookie('btrfs-check-<?=$tag?>','<?=_var($disk,'fsMountpoint')?>');
           btrfsCheck($.cookie('btrfs-check-<?=$tag?>'));
           break;
         case 'zfs-scrub':

emhttp/plugins/dynamix/FlashInfo.page

@@ -1,4 +1,4 @@
-Menu="Flash"
+Menu="Flash:1"
 Title="Flash Device Settings"
 Tag="usb"
 ---

emhttp/plugins/dynamix/Grub.page

@@ -1,7 +1,7 @@
-Menu="Flash"
+Menu="Flash:3 Boot:3"
 Title="GRUB configuration"
 Tag="edit"
-Cond="file_exists('/boot/grub/grub.cfg')"
+Cond="file_exists('/boot/grub/grub.cfg') && ($name == 'flash')"
 ---
 <?PHP
 /* Copyright 2005-2023, Lime Technology

emhttp/plugins/dynamix/SecuritySMB.page

@@ -1,4 +1,4 @@
-Menu="Disk Share Flash"
+Menu="Disk Share Flash:2 Boot:2"
 Title="SMB Security Settings"
 Tag="windows"
 Cond="(($var['shareSMBEnabled']!='no') && (isset($name)?array_key_exists($name,$sec)&&($shares[$name]['hasCfg']??false)!='similar':0))"

emhttp/plugins/dynamix/Syslinux.page

@@ -1,4 +1,4 @@
-Menu="Flash"
+Menu="Flash:3"
 Title="Syslinux Configuration"
 Tag="edit"
 Cond="file_exists('/boot/syslinux/syslinux.cfg')"