Update for NetworkPkg.

[mirror_edk2.git] / NetworkPkg / IScsiDxe / IScsiConfigVfr.vfr

diff --git a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
index 94b00ee60d4586b5bdcaf4afd9b6ca81875f7d4e..4a322cfd69f9387b4fc1f5b376dfd6627b9e7ceb 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
+++ b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
@@ -85,18 +85,19 @@ formset
     label ORDER_ENTRY_LABEL;\r
     label LABEL_END;\r
 \r
-    goto FORMID_MAIN_FORM,\r
-      prompt = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
+    text\r
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
+      text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
+        text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_ORDER_CHANGES;\r
-      \r
-    goto FORMID_MAIN_FORM,\r
-      prompt = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
+\r
+    text\r
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
+      text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
+        text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       flags  = INTERACTIVE,\r
       key    = KEY_IGNORE_ORDER_CHANGES;\r
-\r
   endform;\r
 \r
   form formid = FORMID_DELETE_FORM,\r
@@ -105,18 +106,19 @@ formset
     label DELETE_ENTRY_LABEL;\r
     label LABEL_END;\r
 \r
-    goto FORMID_MAIN_FORM,\r
-      prompt = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
+    text\r
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
+      text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
+        text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_DELETE_ATTEMPT;\r
-      \r
-    goto FORMID_MAIN_FORM,\r
-      prompt = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
+\r
+    text\r
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
+      text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
+        text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       flags  = INTERACTIVE,\r
       key    = KEY_IGNORE_DELETE_ATTEMPT;\r
-      \r
   endform;    \r
 \r
   form formid = FORMID_ATTEMPT_FORM,\r
@@ -346,78 +348,15 @@ formset
 \r
     endif;\r
 \r
-    suppressif NOT ideqval ISCSI_CONFIG_IFR_NVDATA.AuthenticationType == ISCSI_AUTH_TYPE_KRB;\r
-\r
-    checkbox varid = ISCSI_CONFIG_IFR_NVDATA.MutualRequired,\r
-            prompt = STRING_TOKEN(STR_ISCSI_MUTUAL_REQUIRED),\r
-            help   = STRING_TOKEN(STR_ISCSI_MUTUAL_REQUIRED_HELP),\r
-            flags  = 0,\r
-    endcheckbox;\r
-    \r
-    string  varid   = ISCSI_CONFIG_IFR_NVDATA.KerberosUserName,\r
-            prompt  = STRING_TOKEN(STR_ISCSI_KERBEROS_USER_NAME),\r
-            help    = STRING_TOKEN(STR_ISCSI_KERBEROS_USER_NAME),\r
-            flags   = INTERACTIVE,\r
-            key     = KEY_KERBEROS_USER_NAME,\r
-            minsize = 0,\r
-            maxsize = KERBEROS_NAME_MAX_LEN,\r
-    endstring;\r
-\r
-    string  varid    = ISCSI_CONFIG_IFR_NVDATA.KerberosUserSecret,\r
-            prompt   = STRING_TOKEN(STR_ISCSI_KERBEROS_USER_SECRET),\r
-            help     = STRING_TOKEN(STR_ISCSI_KERBEROS_USER_SECRET),\r
-            flags    = INTERACTIVE,\r
-            key      = KEY_KERBEROS_USER_SECRET,\r
-            minsize  = KERBEROS_SECRET_MIN_LEN,\r
-            maxsize  = KERBEROS_SECRET_MAX_LEN,\r
-    endstring;\r
-    \r
-    string  varid   = ISCSI_CONFIG_IFR_NVDATA.KerberosKDCName,\r
-            prompt  = STRING_TOKEN(STR_ISCSI_KERBEROS_KDC_NAME),\r
-            help    = STRING_TOKEN(STR_ISCSI_KERBEROS_KDC_NAME),\r
-            flags   = INTERACTIVE,\r
-            key     = KEY_KERBEROS_KDC_NAME,\r
-            minsize = 0,\r
-            maxsize = KERBEROS_NAME_MAX_LEN,\r
-    endstring;\r
-\r
-    string  varid    = ISCSI_CONFIG_IFR_NVDATA.KerberosKDCRealm,\r
-            prompt   = STRING_TOKEN(STR_ISCSI_KERBEROS_KDC_REALM),\r
-            help     = STRING_TOKEN(STR_ISCSI_KERBEROS_KDC_REALM),\r
-            flags    = INTERACTIVE,\r
-            key      = KEY_KERBEROS_KDC_REALM,\r
-            minsize  = 0,\r
-            maxsize  = KERBEROS_NAME_MAX_LEN,\r
-    endstring;\r
-\r
-    string  varid   = ISCSI_CONFIG_IFR_NVDATA.KerberosKDCIp,\r
-            prompt  = STRING_TOKEN(STR_ISCSI_KERBEROS_KDC_IP),\r
-            help    = STRING_TOKEN(STR_ISCSI_KERBEROS_KDC_IP),\r
-            flags   = INTERACTIVE,\r
-            key     = KEY_KERBEROS_KDC_IP_ADDR,\r
-            minsize = IP_MIN_SIZE,\r
-            maxsize = IP_MAX_SIZE,\r
-    endstring;\r
-\r
-    numeric varid   = ISCSI_CONFIG_IFR_NVDATA.KerberosKDCPort,\r
-            prompt  = STRING_TOKEN(STR_ISCSI_KERBEROS_KDC_PORT),\r
-            help    = STRING_TOKEN(STR_ISCSI_KERBEROS_KDC_PORT),\r
-            flags   = 0,\r
-            minimum = KERBEROS_KDC_PORT_MIN_NUM,\r
-            maximum = KERBEROS_KDC_PORT_MAX_NUM,\r
-            step    = 0,\r
-    endnumeric;\r
-    \r
-    endif;\r
-\r
     subtitle text = STRING_TOKEN(STR_NULL);\r
 \r
-    goto FORMID_ATTEMPT_FORM,\r
-    prompt = STRING_TOKEN (STR_SAVE_CHANGES),\r
-    help   = STRING_TOKEN (STR_SAVE_CHANGES),\r
-    flags  = INTERACTIVE,\r
-    key    = KEY_SAVE_ATTEMPT_CONFIG;\r
-\r
+    text\r
+      help   = STRING_TOKEN (STR_SAVE_CHANGES_HELP),\r
+      text   = STRING_TOKEN (STR_SAVE_CHANGES),\r
+        text   = STRING_TOKEN (STR_SAVE_CHANGES),\r
+      flags  = INTERACTIVE,\r
+      key    = KEY_SAVE_ATTEMPT_CONFIG;\r
+      \r
     goto FORMID_MAIN_FORM,\r
     prompt = STRING_TOKEN (STR_RETURN_MAIN_FORM),\r
     help   = STRING_TOKEN (STR_RETURN_MAIN_FORM),\r