Merge pull request #1758 from dlandon/master

Minor Device Info page fixes.
This commit is contained in:
tom mortensen
2024-06-17 11:17:54 -07:00
committed by GitHub
2 changed files with 3 additions and 5 deletions

View File

@@ -1067,11 +1067,13 @@ _(zfs pool status)_:
: <input type="submit" value="_(Scrub)_" disabled><?=!$tag||$tag==prefix($tag) ? "<b>"._('Scrub')."</b> "._('is only available when the filesyestem is mounted') : sprintf(_('See %s Settings'),ucfirst(prefix($tag)))?>
<?endif;?>
<?if (_var($disk,'fsStatus')=="Mounted"):?>
<div class="title nocontrol"><span class="left"><i class="title fa fa-info"></i>_(Pool Information)_</span></div>
<?exec("/usr/sbin/zpool list -v ".escapeshellarg($tag), $zfs_info_status, $info_retval); $zfs_info_status = implode("\n",$zfs_info_status)?>
_(zfs pool information)_:
: <pre id='zfs-info'><?=$zfs_info_status?></pre>
<?endif;?>
</form>
<hr>

View File

@@ -18,11 +18,7 @@ mkdir -p /var/lib/xfs
case "$1" in
'start')
# Start the xfs_repair process in the background and log output
nohup bash -c "(
/sbin/xfs_repair $4 $2 &> /var/lib/xfs/check.status.$3
echo \$? > /var/lib/xfs/check.status.$3.exit
rm -f /var/lib/xfs/check.pid.$3
) &" &
/sbin/xfs_repair $4 $2 &> /var/lib/xfs/check.status.$3 &
pid=$!
echo $pid > /var/lib/xfs/check.pid.$3
exit 0