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

[PATCH] Set repository in kickstart harddrive command (#592239)



The patch makes these ks lines work:

harddrive --partition=sdb1 --dir=/images/install.img
harddrive --partition=sdb1 --dir=/

For both, stage 2 and packages will be fetched from the harddrive.

The patch adds setting of instRepo value (to setting of stage2) when
parsing ks so that respective --repo anaconda argument is passed to
stage2. Without the --repo, stage 2 assumes media install and fails
in repo setup (as in the BZ).

repo= boot argument overrides ks harddrive command which sets only
stage 2 in this case.
---
 loader/hdinstall.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/loader/hdinstall.c b/loader/hdinstall.c
index 54a5fd9..22e7018 100644
--- a/loader/hdinstall.c
+++ b/loader/hdinstall.c
@@ -339,6 +339,7 @@ char * mountHardDrive(struct installMethod * method,
 void setKickstartHD(struct loaderData_s * loaderData, int argc,
                      char ** argv) {
     char *p;
+    char *url = NULL;
     gchar *biospart = NULL, *partition = NULL, *dir = NULL;
     GOptionContext *optCon = g_option_context_new(NULL);
     GError *optErr = NULL;
@@ -391,6 +392,13 @@ void setKickstartHD(struct loaderData_s * loaderData, int argc,
     if (dir)
         ((struct hdInstallData *)loaderData->stage2Data)->directory = dir;
 
+    /* don't override boot repo= setting */
+    if (loaderData->instRepo == NULL) {
+        checked_asprintf(&url, "hd:%s:%s", partition,
+                         dir ? dir : ".");
+        loaderData->instRepo = url;
+    }
+
     logMessage(INFO, "results of hd ks, partition is %s, dir is %s", partition,
                dir);
 }
-- 
1.6.0.6


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