[PATCH] Change the method config prompts.

[Chris Lumens <clumens@xxxxxxxxxx>]

---
 loader2/net.c        |    4 ----
 loader2/net.h        |    1 -
 loader2/nfsinstall.c |    3 ++-
 loader2/urls.c       |    3 ++-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/loader2/net.c b/loader2/net.c
index b728e98..36246c9 100644
--- a/loader2/net.c
+++ b/loader2/net.c
@@ -53,10 +53,6 @@
 /* boot flags */
 extern uint64_t flags;
 
-char *netServerPrompt = \
-    N_("Please enter the URL containing %s on your\n"
-       "server.\n");
-
 /**
  * Callback function for the CIDR entry boxes on the manual TCP/IP
  * configuration window.
diff --git a/loader2/net.h b/loader2/net.h
index 9a3f4ff..82a5bf4 100644
--- a/loader2/net.h
+++ b/loader2/net.h
@@ -88,7 +88,6 @@ int configureNetwork(struct networkDeviceConfig * dev);
 int writeNetInfo(const char * fn, struct networkDeviceConfig * dev);
 int findHostAndDomain(struct networkDeviceConfig * dev);
 int writeResolvConf(struct networkDeviceConfig * net);
-extern char *netServerPrompt;
 int nfsGetSetup(char ** hostptr, char ** dirptr);
 void initLoopback(void);
 int chooseNetworkInterface(struct loaderData_s * loaderData);
diff --git a/loader2/nfsinstall.c b/loader2/nfsinstall.c
index 8999387..499ec7c 100644
--- a/loader2/nfsinstall.c
+++ b/loader2/nfsinstall.c
@@ -62,7 +62,8 @@ int nfsGetSetup(char ** hostptr, char ** dirptr) {
     entries[1].flags = NEWT_FLAG_SCROLL;
     entries[2].text = NULL;
     entries[2].value = NULL;
-    rc = asprintf(&buf, _(netServerPrompt), _("NFS"), getProductName());
+    rc = asprintf(&buf, _("Please enter the server name and path to your %s "
+                          "images."), getProductName());
     rc = newtWinEntries(_("NFS Setup"), buf, 60, 5, 15,
                         24, entries, _("OK"), _("Back"), NULL);
     free(buf);
diff --git a/loader2/urls.c b/loader2/urls.c
index b828de1..bfd25a2 100644
--- a/loader2/urls.c
+++ b/loader2/urls.c
@@ -279,7 +279,8 @@ int urlMainSetupPanel(struct iurlinfo * ui, char * doSecondarySetup) {
 
     buttons = newtButtonBar(_("OK"), &okay, _("Back"), &cancel, NULL);
 
-    r = asprintf(&buf, _(netServerPrompt), getProductName());
+    r = asprintf(&buf, _("Please enter the URL containing the %s images on your server."),
+                 getProductName());
     reflowedText = newtReflowText(buf, 47, 5, 5, &width, &height);
     free(buf);
 
-- 
1.5.3.7

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list