Verified Commit 78c8231d authored by Côme Chilliet's avatar Côme Chilliet
Browse files

:sparkles: feat(argonaut-fuse) Add options to change FAI cmdline

issue #5845
Showing with 42 additions and 1 deletion
+42 -1
...@@ -56,6 +56,34 @@ class argonautFuseFAIConfig extends simplePlugin ...@@ -56,6 +56,34 @@ class argonautFuseFAIConfig extends simplePlugin
'argonautFuseNfsRoot', TRUE, 'argonautFuseNfsRoot', TRUE,
'/srv/fai/nfsroot' '/srv/fai/nfsroot'
), ),
new StringAttribute (
_('FAI 4 command line'), _('Command line for FAI 4 - should be "ip=dhcp root=/dev/nfs boot=live union=aufs"'),
'argonautFuseFai4Cmdline', TRUE,
'ip=dhcp root=/dev/nfs boot=live union=aufs'
),
new StringAttribute (
_('FAI 5 command line'), _('Command line for FAI 5 - should be "ip=dhcp rootovl"'),
'argonautFuseFai5Cmdline', TRUE,
'ip=dhcp rootovl'
),
)
)
);
}
function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE, $attributesInfo = NULL)
{
parent::__construct($dn, $object, $parent, $mainTab, $attributesInfo);
$this->attributesAccess['argonautFuseFaiVersion']->setManagedAttributes(
array(
'disable' => array (
4 => array (
'argonautFuseFai5Cmdline'
),
5 => array (
'argonautFuseFai4Cmdline'
)
) )
) )
); );
......
...@@ -338,6 +338,18 @@ attributetype ( 1.3.6.1.4.1.38414.2.14.12 NAME 'argonautFuseFaiVersion' ...@@ -338,6 +338,18 @@ attributetype ( 1.3.6.1.4.1.38414.2.14.12 NAME 'argonautFuseFaiVersion'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
SINGLE-VALUE ) SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.2.14.13 NAME 'argonautFuseFai4Cmdline'
DESC 'Fusion Directory - Argonaut, fuse command line for FAI 4 - should be "ip=dhcp root=/dev/nfs boot=live union=aufs".'
EQUALITY caseExactIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.2.14.14 NAME 'argonautFuseFai5Cmdline'
DESC 'Fusion Directory - Argonaut, fuse command line for FAI 5 - should be "ip=dhcp rootovl".'
EQUALITY caseExactIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.2.15.1 NAME 'argonautFAIMonitorPort' attributetype ( 1.3.6.1.4.1.38414.2.15.1 NAME 'argonautFAIMonitorPort'
DESC 'Fusion Directory - Argonaut FAI monitor, port.' DESC 'Fusion Directory - Argonaut FAI monitor, port.'
EQUALITY integerMatch EQUALITY integerMatch
...@@ -426,7 +438,8 @@ objectclass ( 1.3.6.1.4.1.38414.2.2.7 NAME 'argonautFuseFAIConfig' ...@@ -426,7 +438,8 @@ objectclass ( 1.3.6.1.4.1.38414.2.2.7 NAME 'argonautFuseFAIConfig'
DESC 'An argonaut config for fuse FAI module' DESC 'An argonaut config for fuse FAI module'
SUP top AUXILIARY SUP top AUXILIARY
MUST ( argonautFuseNfsRoot ) MUST ( argonautFuseNfsRoot )
MAY ( argonautFuseFaiVersion $ argonautFuseFaiFlags ) ) MAY ( argonautFuseFaiVersion $ argonautFuseFaiFlags $
argonautFuseFai4Cmdline $ argonautFuseFai5Cmdline ) )
objectclass ( 1.3.6.1.4.1.38414.2.2.8 NAME 'argonautFuseLTSPConfig' objectclass ( 1.3.6.1.4.1.38414.2.2.8 NAME 'argonautFuseLTSPConfig'
DESC 'An argonaut config for fuse LTSP module' DESC 'An argonaut config for fuse LTSP module'
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment