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

[PATCH 29/29] Add some debugging prints.



---
 loader/cdinstall.c  |    2 ++
 loader/hdinstall.c  |    2 ++
 loader/loader.c     |   26 +++++++++++++++++++++++---
 loader/nfsinstall.c |    2 ++
 loader/urlinstall.c |    2 ++
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/loader/cdinstall.c b/loader/cdinstall.c
index b69bea5..acdb036 100644
--- a/loader/cdinstall.c
+++ b/loader/cdinstall.c
@@ -400,6 +400,8 @@ int loadCdromImages(struct loaderData_s *loaderData) {
     char *device = NULL;
     char *tmp;
 
+    logMessage(DEBUGLVL, "looking for extras for CD/DVD install");
+
     if (!loaderData->instRepo)
         return 0;
 
diff --git a/loader/hdinstall.c b/loader/hdinstall.c
index 4b6c580..d52e969 100644
--- a/loader/hdinstall.c
+++ b/loader/hdinstall.c
@@ -99,6 +99,8 @@ static int ends_with_iso(char *dirname, struct dirent *ent) {
 int loadHdImages(struct loaderData_s *loaderData) {
     char *device = NULL, *dir = NULL, *path;
 
+    logMessage(DEBUGLVL, "looking for extras for HD install");
+
     if (!loaderData->instRepo)
         return 0;
 
diff --git a/loader/loader.c b/loader/loader.c
index 5b42305..2af0384 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1261,6 +1261,7 @@ static void doLoaderMain(struct loaderData_s *loaderData,
      * override this check.
      */
     if (!FL_ASKMETHOD(flags) && !loaderData->instRepo && findInstallCD(loaderData) == LOADER_OK) {
+        logMessage(DEBUGLVL, "Found installation media, so skipping lang and kbd");
         skipLangKbd = 1;
         flags |= LOADER_FLAGS_NOPASS;
     }
@@ -1548,9 +1549,28 @@ static void doLoaderMain(struct loaderData_s *loaderData,
             }
 
             case STEP_EXTRAS: {
-                /* FIXME - this is where we need to look for product.img,
-                 * updates.img, etc.
-                 */
+                switch (loaderData->method) {
+                    case METHOD_CDROM:
+                        logMessage(DEBUGLVL, "in STEP_EXTRAS, method = METHOD_CDROM");
+                        break;
+
+                    case METHOD_HD:
+                        logMessage(DEBUGLVL, "in STEP_EXTRAS, method = METHOD_HD");
+                        break;
+
+                    case METHOD_NFS:
+                        logMessage(DEBUGLVL, "in STEP_EXTRAS, method = METHOD_NFS");
+                        break;
+
+                    case METHOD_URL:
+                        logMessage(DEBUGLVL, "in STEP_EXTRAS, method = METHOD_URL");
+                        break;
+
+                    default:
+                        logMessage(DEBUGLVL, "in STEP_EXTRAS, method = ??");
+                        break;
+                }
+
                 installMethods[validMethods[loaderData->method]].findExtras(loaderData);
                 step = STEP_DONE;
                 break;
diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c
index 1d22909..7ce0433 100644
--- a/loader/nfsinstall.c
+++ b/loader/nfsinstall.c
@@ -210,6 +210,8 @@ int loadNfsImages(struct loaderData_s *loaderData) {
     char *host, *path, *opts;
     char *url;
 
+    logMessage(DEBUGLVL, "looking for extras for NFS install");
+
     if (!loaderData->instRepo)
         return 0;
 
diff --git a/loader/urlinstall.c b/loader/urlinstall.c
index ea40862..000c025 100644
--- a/loader/urlinstall.c
+++ b/loader/urlinstall.c
@@ -163,6 +163,8 @@ static void copyErrorFn (char *msg) {
 int loadUrlImages(struct loaderData_s *loaderData) {
     char *url;
 
+    logMessage(DEBUGLVL, "looking for extras for HTTP/FTP install");
+
     if (!loaderData->instRepo)
         return 0;
 
-- 
1.7.1.1


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