diff --git a/dist/adastra-vtl-installer-1.0.0.tar.gz b/dist/adastra-vtl-installer-1.0.0.tar.gz index bc12467..5082390 100644 Binary files a/dist/adastra-vtl-installer-1.0.0.tar.gz and b/dist/adastra-vtl-installer-1.0.0.tar.gz differ diff --git a/dist/adastra-vtl-installer/VERSION b/dist/adastra-vtl-installer/VERSION index 710b07d..b719cc8 100644 --- a/dist/adastra-vtl-installer/VERSION +++ b/dist/adastra-vtl-installer/VERSION @@ -1,4 +1,4 @@ Adastra VTL Installer Version: 1.0.0 -Build Date: 2025-12-10 12:13:48 +Build Date: 2025-12-10 12:20:01 Build Host: vtl-dev diff --git a/dist/adastra-vtl-installer/web-ui/api.php b/dist/adastra-vtl-installer/web-ui/api.php index 398a860..a1a27e8 100644 --- a/dist/adastra-vtl-installer/web-ui/api.php +++ b/dist/adastra-vtl-installer/web-ui/api.php @@ -325,36 +325,18 @@ function addLun($params) { return; } - // Determine backing store type and device type + // Determine backing store type (simplify to just bstype) $bstypeParam = ''; - $deviceTypeParam = ''; - if (strpos($device, '/dev/sg') === 0) { - $bstypeParam = '--bstype sg'; // Use sg (passthrough) for generic scsi devices - - // Detect specific device type (tape or changer) - $lsscsiOutput = []; - exec("sudo /usr/bin/lsscsi -g | grep " . escapeshellarg($device), $lsscsiOutput); - - if (!empty($lsscsiOutput)) { - $line = $lsscsiOutput[0]; - if (strpos($line, 'mediumx') !== false) { - $deviceTypeParam = '--device-type changer'; - } elseif (strpos($line, 'tape') !== false) { - $deviceTypeParam = '--device-type tape'; - } else { - $deviceTypeParam = '--device-type pt'; // Default to passthrough if unknown - } - } + $bstypeParam = '--bstype sg'; } $command = sprintf( - 'sudo /usr/sbin/tgtadm --lld iscsi --mode logicalunit --op new --tid %d --lun %d --backing-store %s %s %s 2>&1', + 'sudo /usr/sbin/tgtadm --lld iscsi --mode logicalunit --op new --tid %d --lun %d --backing-store %s %s 2>&1', $tid, $lun, escapeshellarg($device), - $bstypeParam, - $deviceTypeParam + $bstypeParam ); $output = []; @@ -369,7 +351,8 @@ function addLun($params) { } else { echo json_encode([ 'success' => false, - 'error' => 'Failed to add LUN: ' . implode(' ', $output) + 'error' => 'Failed to add LUN: ' . implode(' ', $output), + 'command' => $command // Debug info ]); } } diff --git a/web-ui/api.php b/web-ui/api.php index 398a860..a1a27e8 100644 --- a/web-ui/api.php +++ b/web-ui/api.php @@ -325,36 +325,18 @@ function addLun($params) { return; } - // Determine backing store type and device type + // Determine backing store type (simplify to just bstype) $bstypeParam = ''; - $deviceTypeParam = ''; - if (strpos($device, '/dev/sg') === 0) { - $bstypeParam = '--bstype sg'; // Use sg (passthrough) for generic scsi devices - - // Detect specific device type (tape or changer) - $lsscsiOutput = []; - exec("sudo /usr/bin/lsscsi -g | grep " . escapeshellarg($device), $lsscsiOutput); - - if (!empty($lsscsiOutput)) { - $line = $lsscsiOutput[0]; - if (strpos($line, 'mediumx') !== false) { - $deviceTypeParam = '--device-type changer'; - } elseif (strpos($line, 'tape') !== false) { - $deviceTypeParam = '--device-type tape'; - } else { - $deviceTypeParam = '--device-type pt'; // Default to passthrough if unknown - } - } + $bstypeParam = '--bstype sg'; } $command = sprintf( - 'sudo /usr/sbin/tgtadm --lld iscsi --mode logicalunit --op new --tid %d --lun %d --backing-store %s %s %s 2>&1', + 'sudo /usr/sbin/tgtadm --lld iscsi --mode logicalunit --op new --tid %d --lun %d --backing-store %s %s 2>&1', $tid, $lun, escapeshellarg($device), - $bstypeParam, - $deviceTypeParam + $bstypeParam ); $output = []; @@ -369,7 +351,8 @@ function addLun($params) { } else { echo json_encode([ 'success' => false, - 'error' => 'Failed to add LUN: ' . implode(' ', $output) + 'error' => 'Failed to add LUN: ' . implode(' ', $output), + 'command' => $command // Debug info ]); } }