We're not looking for the stage2 image anymore, so stop referring to "installation image". Also, there's no prompting to do for rescue mode anymore either. --- loader/hdinstall.c | 10 +++++----- loader/loader.c | 9 ++------- loader/nfsinstall.c | 4 ++-- loader/urlinstall.c | 2 +- loader/urls.c | 2 +- 5 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/loader/hdinstall.c b/loader/hdinstall.c index c321afb..b509409 100644 --- a/loader/hdinstall.c +++ b/loader/hdinstall.c @@ -180,7 +180,7 @@ int promptForHardDrive(struct loaderData_s *loaderData) {
/* now find out which partition has the stage2 image */ checked_asprintf(&buf, _("What partition and directory on that " - "partition holds the installation image " + "partition holds an installation tree " "for %s? If you don't see the disk drive " "you're using listed here, press F2 to " "configure additional devices."), @@ -203,7 +203,7 @@ int promptForHardDrive(struct loaderData_s *loaderData) { kspartition = NULL; }
- label = newtLabel(-1, -1, _("Directory holding image:")); + label = newtLabel(-1, -1, _("Directory holding tree:"));
dirEntry = newtEntry(28, 11, dir, 28, (const char **) &tmpDir, NEWT_ENTRY_SCROLL); @@ -280,7 +280,7 @@ int promptForHardDrive(struct loaderData_s *loaderData) { files = get_file_list(buf, ends_with_iso); if (!files) { newtWinMessage(_("Error"), _("OK"), - _("That directory does not contain installation media.")); + _("That directory does not contain an installable tree.")); umount("/mnt/isodir"); free(buf); continue; @@ -298,7 +298,7 @@ int promptForHardDrive(struct loaderData_s *loaderData) { if (doPwMount(buf, "/tmp/testmnt", "auto", "ro", NULL)) { free(buf); newtWinMessage(_("Error"), _("OK"), - _("That directory does not contain installation media.")); + _("That directory does not contain an installable tree.")); umount("/mnt/isodir"); continue; } @@ -307,7 +307,7 @@ int promptForHardDrive(struct loaderData_s *loaderData) {
if (access("/tmp/testmnt/.treeinfo", R_OK)) { newtWinMessage(_("Error"), _("OK"), - _("That directory does not contain installation media.")); + _("That directory does not contain an installable tree.")); umount("/tmp/testmnt"); umount("/mnt/isodir"); continue; diff --git a/loader/loader.c b/loader/loader.c index 47021cc..eb59432 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1366,13 +1366,8 @@ static void doLoaderMain(struct loaderData_s *loaderData, } installNames[i] = NULL;
- rc = newtWinMenu(FL_RESCUE(flags) ? _("Rescue Method") : - _("Installation Method"), - FL_RESCUE(flags) ? - _("What type of media contains the rescue " - "image?") : - _("What type of media contains the installation " - "image?"), + rc = newtWinMenu(_("Installation Method"), + _("What type of media contains the installation tree?"), 30, 10, 20, 6, installNames, &loaderData->method, _("OK"), _("Back"), NULL); if (rc == 2) { diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c index ed92f78..df58a32 100644 --- a/loader/nfsinstall.c +++ b/loader/nfsinstall.c @@ -82,7 +82,7 @@ static int nfsGetSetup(char ** hostptr, char ** dirptr, char ** optsptr) { entries[3].value = NULL;
if (asprintf(&buf, _("Please enter the server and path to your %s " - "installation image and optionally additional " + "installation tree and optionally additional " "NFS mount options."), getProductName()) == -1) { logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__); abort(); @@ -259,7 +259,7 @@ int promptForNfs(struct loaderData_s *loaderData) {
if (getFileFromNfs(url, "/tmp/.treeinfo", loaderData) && !isNfsIso(loaderData)) { newtWinMessage(_("Error"), _("OK"), - _("The URL provided does not contain installation media.")); + _("The URL provided does not contain an installable tree.")); free(url); continue; } diff --git a/loader/urlinstall.c b/loader/urlinstall.c index d20748e..23fe7b3 100644 --- a/loader/urlinstall.c +++ b/loader/urlinstall.c @@ -211,7 +211,7 @@ int promptForUrl(struct loaderData_s *loaderData) {
if (getFileFromUrl(url, "/tmp/.treeinfo", loaderData)) { newtWinMessage(_("Error"), _("OK"), - _("The URL provided does not contain installation media.")); + _("The URL provided does not contain an installable tree.")); free(url); continue; } diff --git a/loader/urls.c b/loader/urls.c index 72f7706..b5f0a0a 100644 --- a/loader/urls.c +++ b/loader/urls.c @@ -264,7 +264,7 @@ int urlMainSetupPanel(struct loaderData_s *loaderData) { buttons = newtButtonBar(_("OK"), &okay, _("Back"), &cancel, NULL);
checked_asprintf(&buf, - _("Please enter the URL containing the %s installation image on your server."), + _("Please enter the URL containing the %s installation tree on your server."), getProductName());
reflowedText = newtReflowText(buf, 47, 5, 5, &width, &height);
On Fri, Feb 25, 2011 at 12:37:23PM -0500, Chris Lumens wrote:
We're not looking for the stage2 image anymore, so stop referring to "installation image". Also, there's no prompting to do for rescue mode anymore either.
loader/hdinstall.c | 10 +++++----- loader/loader.c | 9 ++------- loader/nfsinstall.c | 4 ++-- loader/urlinstall.c | 2 +- loader/urls.c | 2 +- 5 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/loader/hdinstall.c b/loader/hdinstall.c index c321afb..b509409 100644 --- a/loader/hdinstall.c +++ b/loader/hdinstall.c
Ack
anaconda-devel@lists.fedoraproject.org
-
Brian C. Lane -
Chris Lumens