Commit 7f2dc913 authored by Leigh Stoller's avatar Leigh Stoller

Minor tweaks to handle setting AMD_ROOT="" for fixed endpoint elabinelab.

parent 96c565f0
...@@ -3832,6 +3832,14 @@ sub CreateDefsFile($) ...@@ -3832,6 +3832,14 @@ sub CreateDefsFile($)
print OUTDEFS "ZFS_ROOT=\"$ZFSPOOL\"\n"; print OUTDEFS "ZFS_ROOT=\"$ZFSPOOL\"\n";
last SWITCH; last SWITCH;
}; };
/^AMD_ROOT$/ && do {
# If not provided, we get the value from configure.
if (exists($emulabconfig{"AMD_ROOT"})) {
my $amdroot = $emulabconfig{"AMD_ROOT"};
print OUTDEFS "AMD_ROOT=\"$amdroot\"\n";
}
last SWITCH;
};
print OUTDEFS $line; print OUTDEFS $line;
} }
......
...@@ -5209,7 +5209,7 @@ ZFS_QUOTA_GROUP_X="1.0" ...@@ -5209,7 +5209,7 @@ ZFS_QUOTA_GROUP_X="1.0"
ZFS_NOEXPORT=0 ZFS_NOEXPORT=0
INCREMENTAL_MOUNTD=0 INCREMENTAL_MOUNTD=0
WITHAMD=0 WITHAMD=0
AMD_ROOT=/.amd_mnt AMD_ROOT=/.amd_mnt/ops
NFSMFS_ROOT="" NFSMFS_ROOT=""
BS_IQN_PREFIX=iqn.2000-10.net.emulab BS_IQN_PREFIX=iqn.2000-10.net.emulab
ATTENUATOR="" ATTENUATOR=""
......
...@@ -499,7 +499,7 @@ ZFS_QUOTA_GROUP_X="1.0" ...@@ -499,7 +499,7 @@ ZFS_QUOTA_GROUP_X="1.0"
ZFS_NOEXPORT=0 ZFS_NOEXPORT=0
INCREMENTAL_MOUNTD=0 INCREMENTAL_MOUNTD=0
WITHAMD=0 WITHAMD=0
AMD_ROOT=/.amd_mnt AMD_ROOT=/.amd_mnt/ops
NFSMFS_ROOT="" NFSMFS_ROOT=""
BS_IQN_PREFIX=iqn.2000-10.net.emulab BS_IQN_PREFIX=iqn.2000-10.net.emulab
ATTENUATOR="" ATTENUATOR=""
......
...@@ -111,7 +111,8 @@ ZFS_QUOTA_USER="none" ...@@ -111,7 +111,8 @@ ZFS_QUOTA_USER="none"
ZFS_QUOTA_PROJECT="none" ZFS_QUOTA_PROJECT="none"
ZFS_QUOTA_GROUP="none" ZFS_QUOTA_GROUP="none"
WITHAMD=changeme WITHAMD=changeme
AMD_ROOT=/.amd_mnt/ops # This will default to /.amd_mnt/ops in configure
AMD_ROOT=changeme
# Which console to use in the MFS. We need to set this for GeniRacks. # Which console to use in the MFS. We need to set this for GeniRacks.
NODECONSOLE=changeme NODECONSOLE=changeme
......
...@@ -12,6 +12,8 @@ tb-set-elabinelab-attribute CONFIG_NODBINIT 1 ...@@ -12,6 +12,8 @@ tb-set-elabinelab-attribute CONFIG_NODBINIT 1
tb-set-elabinelab-attribute CONFIG_ADMINUSERS 1 tb-set-elabinelab-attribute CONFIG_ADMINUSERS 1
tb-set-elabinelab-attribute CONFIG_NOSETUP 0 tb-set-elabinelab-attribute CONFIG_NOSETUP 0
tb-set-elabinelab-attribute CONFIG_PORTAL 1 tb-set-elabinelab-attribute CONFIG_PORTAL 1
tb-set-elabinelab-attribute CONFIG_ZFS 1
tb-set-elabinelab-attribute AMD_ROOT ""
tb-set-elabinelab-attribute CONFIG_TARGETSYS 1 tb-set-elabinelab-attribute CONFIG_TARGETSYS 1
tb-set-elabinelab-attribute TARGETSYS_TARGET POWDER-FIXED tb-set-elabinelab-attribute TARGETSYS_TARGET POWDER-FIXED
...@@ -53,7 +55,7 @@ tb-set-elabinelab-role-attribute boss XEN_CORES 2 ...@@ -53,7 +55,7 @@ tb-set-elabinelab-role-attribute boss XEN_CORES 2
# Nucs need the latest. # Nucs need the latest.
tb-set-elabinelab-attribute MFSVERSION "11-64" tb-set-elabinelab-attribute MFSVERSION "11-64"
tb-set-elabinelab-attribute MFSCONSOLE vga tb-set-elabinelab-attribute MFSCONSOLE sio
# Extra stuff for devel in elabinelab. # Extra stuff for devel in elabinelab.
tb-set-elabinelab-role-attribute boss XEN_NOANTISPOOFING yes tb-set-elabinelab-role-attribute boss XEN_NOANTISPOOFING yes
......
Markdown is supported
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