3 files changed, 9 insertions, 1 deletions
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index 37a592ce90..4b44330ec8 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -1910,6 +1910,14 @@ DriverSampleInit (
   PrivateData->HiiHandle[1] = HiiHandle[1];
 
   //
+  // Update the device path string.
+  //
+  if (HiiSetString (HiiHandle[0], STRING_TOKEN (STR_DEVICE_PATH), (EFI_STRING) &mHiiVendorDevicePath0, NULL) == 0) {
+    DriverSampleUnload (ImageHandle);
+    return EFI_OUT_OF_RESOURCES;
+  }
+  
+  //
   // Very simple example of how one would update a string that is already
   // in the HII database
   //
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index ab4703eb82..60e9cf2a34 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -320,7 +320,7 @@ formset
             minimum = 0,
             maximum = 0xf0,
             step    = 0,
-            default = 21,
+            default value = questionrefval(devicepath = STRING_TOKEN (STR_DEVICE_PATH), guid = DRIVER_SAMPLE_FORMSET_GUID, 0x1111),
 
             inconsistentif prompt = STRING_TOKEN(STR_ERROR_POPUP),
               ideqval MyIfrNVData.HowOldAreYouInYearsManual == 99
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
index 5a1e23f03d..98764d2408 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
+++ b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni