All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 1ecb4ce5 authored by Ryan Jackson's avatar Ryan Jackson

Change image name for iptables firewall

parent 3167eb00
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<attribute name="features"><value>ping,ssh,ipod,isup,veths,linktest</value></attribute> <attribute name="features"><value>ping,ssh,ipod,isup,veths,linktest</value></attribute>
<attribute name="magic"><value></value></attribute> <attribute name="magic"><value></value></attribute>
<attribute name="mustclean"><value>1</value></attribute> <attribute name="mustclean"><value>1</value></attribute>
<attribute name="nextosid"><value>emulab-ops,UBUNTU10-STD</value></attribute> <attribute name="nextosid"><value>emulab-ops,UBUNTU10-STD-FW</value></attribute>
<attribute name="op_mode"><value>NORMALv2</value></attribute> <attribute name="op_mode"><value>NORMALv2</value></attribute>
<attribute name="osname"><value>FW-IPTABLES</value></attribute> <attribute name="osname"><value>FW-IPTABLES</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute> <attribute name="pid"><value>emulab-ops</value></attribute>
...@@ -200,15 +200,15 @@ ...@@ -200,15 +200,15 @@
</image> </image>
<image> <image>
<attribute name="OS"><value>Linux</value></attribute> <attribute name="OS"><value>Linux</value></attribute>
<attribute name="description"><value>Ubuntu 10.04.1 32-bit (Lucid Lynx)</value></attribute> <attribute name="description"><value>Firewall based on Ubuntu 10.04.1 32-bit (Lucid Lynx)</value></attribute>
<attribute name="gid"><value>emulab-ops</value></attribute> <attribute name="gid"><value>emulab-ops</value></attribute>
<attribute name="global"><value>1</value></attribute> <attribute name="global"><value>1</value></attribute>
<attribute name="imagename"><value>UBUNTU10-STD</value></attribute> <attribute name="imagename"><value>UBUNTU10-STD-FW</value></attribute>
<attribute name="loadpart"><value>2</value></attribute> <attribute name="loadpart"><value>2</value></attribute>
<attribute name="mbr_version"><value>2</value></attribute> <attribute name="mbr_version"><value>2</value></attribute>
<attribute name="op_mode"><value>NORMALv2</value></attribute> <attribute name="op_mode"><value>NORMALv2</value></attribute>
<attribute name="osfeatures"><value>ping,ssh,ipod,isup,linktest</value></attribute> <attribute name="osfeatures"><value>ping,ssh,ipod,isup,linktest</value></attribute>
<attribute name="path"><value>/usr/testbed/images/UBUNTU10-STD.ndz</value></attribute> <attribute name="path"><value>/usr/testbed/images/UBUNTU10-STD-FW.ndz</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute> <attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="shared"><value>0</value></attribute> <attribute name="shared"><value>0</value></attribute>
<attribute name="version"><value>10</value></attribute> <attribute name="version"><value>10</value></attribute>
......
...@@ -38,7 +38,7 @@ my %imagenames = ( ...@@ -38,7 +38,7 @@ my %imagenames = (
# XXX note that the FBSD410* images may not work on all HW but are # XXX note that the FBSD410* images may not work on all HW but are
# included here to resolve nextosid entries for FW-IPFW and FBSD-JAIL # included here to resolve nextosid entries for FW-IPFW and FBSD-JAIL
"2" => ['FBSD62+FC6-STD', 'FBSD62-STD', 'FC6-STD', 'FBSD410-STD', "2" => ['FBSD62+FC6-STD', 'FBSD62-STD', 'FC6-STD', 'FBSD410-STD',
'FBSD410-IPFW2', 'UBUNTU10-STD'], 'FBSD410-IPFW2', 'UBUNTU10-STD-FW'],
); );
my @osnames = ('FREEBSD-MFS', 'FRISBEE-MFS', 'NEWNODE-MFS', my @osnames = ('FREEBSD-MFS', 'FRISBEE-MFS', 'NEWNODE-MFS',
......
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