From 11cf433e641930281862f15e28b0869973a6df6b Mon Sep 17 00:00:00 2001
From: Matt Wilson <msw@redhat.com>
Date: Fri, 28 Apr 2000 20:08:08 +0000
Subject: fix for sparc ufs module loading

---
 loader/loader.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'loader')

diff --git a/loader/loader.c b/loader/loader.c
index 75bf8681d..8b75c74ab 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -580,14 +580,14 @@ static char * mountHardDrive(struct installMethod * method,
 		    } else {
 			for (j = 0; j < table.maxNumPartitions; j++) {
 			    switch (table.parts[j].type) {
-			    #ifdef __sparc__
+#ifdef __sparc__
 			      case BALKAN_PART_UFS:
 				if (!ufsloaded) {
 				    ufsloaded = 1;
-				    mlLoadModule("ufs", NULL, modLoaded, *modDeps, NULL, modInfo, flags);
+				    mlLoadModule("ufs", NULL, modLoaded, *modDepsPtr, NULL, modInfo, flags);
 				}
 				/* FALLTHROUGH */
-			    #endif
+#endif
 			      case BALKAN_PART_DOS:
 			      case BALKAN_PART_EXT2:
 				sprintf(partitions[numPartitions].name, 
@@ -1688,9 +1688,9 @@ int kickstartFromHardDrive(char * location,
     char * fullFn;
 
     mlLoadModule("vfat", NULL, modLoaded, *modDepsPtr, NULL, NULL, flags);
-    #ifdef __sparc__
+#ifdef __sparc__
     mlLoadModule("ufs", NULL, modLoaded, *modDepsPtr, NULL, NULL, flags);
-    #endif
+#endif
 
     fileName = strchr(source, '/');
     *fileName = '\0';
@@ -1886,9 +1886,10 @@ void loadUfs(struct knownDevices *kd, moduleList modLoaded,
 		} else {
 		    for (j = 0; j < table.maxNumPartitions; j++) {
 			if (table.parts[j].type == BALKAN_PART_UFS) {
-			    if (!ufsloaded)
-				mlLoadModule("ufs", NULL, modLoaded, *modDeps, NULL, NULL, flags);
-			    ufsloaded = 1;
+			    if (!ufsloaded) {
+				mlLoadModule("ufs", NULL, modLoaded, *modDepsPtr, NULL, modInfo, flags);
+				ufsloaded = 1;
+			    }
 			}
 		    }
 		}
-- 
cgit