0.7.2: read/write loader.conf entries under system/loaderconf (they were reported missing)
This commit is contained in:
1 parent
52d1e65a01
commit
f0b5ab6c09
3 files changed
+33
-13
No files matched your search
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"appname": "VM Manager",
|
"appname": "VM Manager",
|
||||||
"version": "0.7.1",
|
"version": "0.7.2",
|
||||||
"rootfolder": "/mnt/Daten/extensions/vmmngr",
|
"rootfolder": "/mnt/Daten/extensions/vmmngr",
|
||||||
"vm_source": "auto",
|
"vm_source": "auto",
|
||||||
"bridges": ["ix0bridge"],
|
"bridges": ["ix0bridge"],
|
||||||
|
|||||||
+31
-11
@@ -14,31 +14,49 @@ if (!function_exists('vmm_register_boot')) {
|
|||||||
*
|
*
|
||||||
* @return array list of added entries ('' when everything was present)
|
* @return array list of added entries ('' when everything was present)
|
||||||
*/
|
*/
|
||||||
|
function vmm_loaderconf_path(): string
|
||||||
|
{
|
||||||
|
// XigmaNAS nests loader.conf entries under <system><loaderconf>
|
||||||
|
global $config;
|
||||||
|
if (isset($config['system']) && is_array($config['system'])) {
|
||||||
|
return 'system';
|
||||||
|
}
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
function vmm_register_boot(): array
|
function vmm_register_boot(): array
|
||||||
{
|
{
|
||||||
global $config;
|
global $config;
|
||||||
|
|
||||||
$added = [];
|
$added = [];
|
||||||
|
|
||||||
// 1) loader.conf entries
|
// 1) loader.conf entries live in <system><loaderconf><param>
|
||||||
$want = ['vmm_load' => 'YES', 'nmdm_load' => 'YES'];
|
$scope = vmm_loaderconf_path() === 'system' ? 'system' : '';
|
||||||
if (!isset($config['loaderconf']) || !is_array($config['loaderconf'])) {
|
if ($scope === 'system') {
|
||||||
$config['loaderconf'] = [];
|
if (!isset($config['system']['loaderconf']) || !is_array($config['system']['loaderconf'])) {
|
||||||
|
$config['system']['loaderconf'] = [];
|
||||||
|
}
|
||||||
|
$lc = &$config['system']['loaderconf'];
|
||||||
|
} else {
|
||||||
|
if (!isset($config['loaderconf']) || !is_array($config['loaderconf'])) {
|
||||||
|
$config['loaderconf'] = [];
|
||||||
|
}
|
||||||
|
$lc = &$config['loaderconf'];
|
||||||
}
|
}
|
||||||
if (!isset($config['loaderconf']['param']) || !is_array($config['loaderconf']['param'])) {
|
if (!isset($lc['param']) || !is_array($lc['param'])) {
|
||||||
$config['loaderconf']['param'] = [];
|
$lc['param'] = [];
|
||||||
}
|
}
|
||||||
$have = [];
|
$have = [];
|
||||||
foreach ($config['loaderconf']['param'] as $p) {
|
foreach ($lc['param'] as $p) {
|
||||||
if (isset($p['name'])) {
|
if (isset($p['name'])) {
|
||||||
$have[(string)$p['name']] = true;
|
$have[(string)$p['name']] = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
foreach ($want as $key => $value) {
|
foreach (['vmm_load' => 'YES', 'nmdm_load' => 'YES'] as $key => $value) {
|
||||||
if (isset($have[$key])) {
|
if (isset($have[$key])) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$config['loaderconf']['param'][] = [
|
$lc['param'][] = [
|
||||||
'uuid' => uuid(),
|
'uuid' => uuid(),
|
||||||
'enable' => '',
|
'enable' => '',
|
||||||
'name' => $key,
|
'name' => $key,
|
||||||
@@ -47,8 +65,9 @@ if (!function_exists('vmm_register_boot')) {
|
|||||||
];
|
];
|
||||||
$added[] = $key;
|
$added[] = $key;
|
||||||
}
|
}
|
||||||
|
unset($lc);
|
||||||
|
|
||||||
// 2) postinit hook: repairs symlinks and loads modules at every boot
|
// 2) postinit hook (<rc> is a top-level section)
|
||||||
$cmd = VMM_ROOT . '/vmm-init -p';
|
$cmd = VMM_ROOT . '/vmm-init -p';
|
||||||
$found = false;
|
$found = false;
|
||||||
if (isset($config['rc']['param']) && is_array($config['rc']['param'])) {
|
if (isset($config['rc']['param']) && is_array($config['rc']['param'])) {
|
||||||
@@ -85,8 +104,9 @@ if (!function_exists('vmm_register_boot')) {
|
|||||||
function vmm_boot_state(): array
|
function vmm_boot_state(): array
|
||||||
{
|
{
|
||||||
global $config;
|
global $config;
|
||||||
|
$params = $config['system']['loaderconf']['param'] ?? ($config['loaderconf']['param'] ?? []);
|
||||||
$loader = [];
|
$loader = [];
|
||||||
foreach (($config['loaderconf']['param'] ?? []) as $p) {
|
foreach (($params ?: []) as $p) {
|
||||||
if (isset($p['name'])) {
|
if (isset($p['name'])) {
|
||||||
$loader[(string)$p['name']] = (string)($p['value'] ?? '');
|
$loader[(string)$p['name']] = (string)($p['value'] ?? '');
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
0.7.1
|
0.7.2
|
||||||
Reference in new issue
Block a user