Update for NetworkPkg.

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

diff --git a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
index 0cf4ffeed98eefa4430ea853832dc0344c7ca345..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
     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
       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
       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
       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
       flags  = INTERACTIVE,\r
       key    = KEY_IGNORE_ORDER_CHANGES;\r

-\r

   endform;\r
 \r
   form formid = FORMID_DELETE_FORM,\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
     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
       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
       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
       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
       flags  = INTERACTIVE,\r
       key    = KEY_IGNORE_DELETE_ATTEMPT;\r

-      \r

   endform;    \r
 \r
   form formid = FORMID_ATTEMPT_FORM,\r
   endform;    \r
 \r
   form formid = FORMID_ATTEMPT_FORM,\r


@@ -348,12 +350,13 @@ formset
 \r
     subtitle text = STRING_TOKEN(STR_NULL);\r
 \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_HELP),\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
     goto FORMID_MAIN_FORM,\r
     prompt = STRING_TOKEN (STR_RETURN_MAIN_FORM),\r
     help   = STRING_TOKEN (STR_RETURN_MAIN_FORM),\r