[rhel5-branch] Don't show NFS note for HTTP and FTP installation (#557477).

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

diff --git a/loader2/net.c b/loader2/net.c
index 526df3d..61b6796 100644
--- a/loader2/net.c
+++ b/loader2/net.c
@@ -70,6 +70,13 @@ char *netServerPrompt = \
        "\n"
        "    o the name or IP number of your %s server\n" 
        "    o the directory on that server containing\n" 
+       "      %s for your architecture\n");
+
+char *nfsServerPrompt = \
+    N_("Please enter the following information:\n"
+       "\n"
+       "    o the name or IP number of your NFS server\n" 
+       "    o the directory on that server containing\n" 
        "      %s for your architecture\n"
        "    o optionally, parameters for the NFS mount\n");
 
diff --git a/loader2/net.h b/loader2/net.h
index 48e8306..1957837 100644
--- a/loader2/net.h
+++ b/loader2/net.h
@@ -70,6 +70,7 @@ int writeNetInfo(const char * fn, struct networkDeviceConfig * dev);
 int findHostAndDomain(struct networkDeviceConfig * dev);
 int writeResolvConf(struct networkDeviceConfig * net);
 extern char *netServerPrompt;
+extern char *nfsServerPrompt;
 int nfsGetSetup(char ** hostptr, char ** dirptr, char ** optsptr);
 void initLoopback(void);
 int chooseNetworkInterface(struct loaderData_s * loaderData);
diff --git a/loader2/nfsinstall.c b/loader2/nfsinstall.c
index 4327b29..6d379dc 100644
--- a/loader2/nfsinstall.c
+++ b/loader2/nfsinstall.c
@@ -56,7 +56,7 @@ int nfsGetSetup(char ** hostptr, char ** dirptr, char ** optsptr) {
     entries[2].flags = NEWT_FLAG_SCROLL;
     entries[3].text = NULL;
     entries[3].value = NULL;
-    buf = sdupprintf(_(netServerPrompt), _("NFS"), getProductName());
+    buf = sdupprintf(_(nfsServerPrompt), getProductName());
     rc = newtWinEntries(_("NFS Setup"), buf, 60, 5, 15,
                         24, entries, _("OK"), _("Back"), NULL);
     free(buf);
-- 
1.6.2.5

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

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux