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

[PATCH 25/29] Remove a bunch of unused support functions.



---
 loader/cdinstall.c |   11 -----------
 loader/cdinstall.h |    5 -----
 loader/hdinstall.h |    6 ------
 loader/loader.h    |    3 ---
 loader/method.c    |   35 -----------------------------------
 loader/method.h    |    2 --
 6 files changed, 0 insertions(+), 62 deletions(-)

diff --git a/loader/cdinstall.c b/loader/cdinstall.c
index a8e4dfc..a9cf635 100644
--- a/loader/cdinstall.c
+++ b/loader/cdinstall.c
@@ -451,17 +451,6 @@ err:
     return retbuf;
 }
 
-/* try to find a install CD non-interactively */
-char * findAnacondaCD(char *location) {
-    return setupCdrom(location, NULL, 0, 1);
-}
-
-/* look for a CD and mount it.  if we have problems, ask */
-char * mountCdromImage(struct installMethod * method,
-                       char * location, struct loaderData_s * loaderData) {
-    return setupCdrom(location, loaderData, 1, 1);
-}
-
 void setKickstartCD(struct loaderData_s * loaderData, int argc, char ** argv) {
 
     logMessage(INFO, "kickstartFromCD");
diff --git a/loader/cdinstall.h b/loader/cdinstall.h
index a0ecbc3..2be81c9 100644
--- a/loader/cdinstall.h
+++ b/loader/cdinstall.h
@@ -22,11 +22,6 @@
 
 #include "method.h"
 
-char * mountCdromImage(struct installMethod * method,
-                       char * location, struct loaderData_s * loaderData);
-
-char * findAnacondaCD(char * location);
-
 void setKickstartCD(struct loaderData_s * loaderData, int argc,
 		    char ** argv);
 
diff --git a/loader/hdinstall.h b/loader/hdinstall.h
index cee3e16..80931e6 100644
--- a/loader/hdinstall.h
+++ b/loader/hdinstall.h
@@ -22,12 +22,6 @@
 
 #include "method.h"
 
-struct hdInstallData {
-    char * partition;
-    char * directory;
-};
-
-
 void setKickstartHD(struct loaderData_s * loaderData, int argc,
 		    char ** argv);
 int promptForHardDrive(struct loaderData_s *loaderData);
diff --git a/loader/loader.h b/loader/loader.h
index ce99005..6d3aac1 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -146,7 +146,6 @@ struct loaderData_s {
     char * ksFile;
     int method;
     char * ddsrc;
-    void * stage2Data;
     char * logLevel;
     char * updatessrc;
     char * dogtailurl;
@@ -160,8 +159,6 @@ struct loaderData_s {
 
     moduleInfoSet modInfo;
 
-    int inferredStage2, invalidRepoParam;
-
     /* Proxy info needs to be in the loaderData so we can get these
      * settings off the command line, too.
      */
diff --git a/loader/method.c b/loader/method.c
index 273649b..844048f 100644
--- a/loader/method.c
+++ b/loader/method.c
@@ -359,41 +359,6 @@ void copyProductImg(char * path) {
     }
 }
 
-/** Bind the uncompressed second stage to /mnt/runtime.
- *
- * return 0 on success, 1 on failure to mount.
- */
-int mountStage2Direct(char *stage2Path) {
-    if (access(stage2Path, R_OK)) {
-        return 1;
-    }
-
-    char *target = "/mnt/runtime";
-    char *error = NULL;
-    if (doBindMount(stage2Path, target, &error)) {
-        logMessage(ERROR, "failed to bind %s to %s: %s",
-                   stage2Path, target, error);
-        free(error);
-        return 1;
-    }
-    logMessage(INFO, "successfully bound %s to %s", stage2Path, target);
-    return 0;
-}
-
-/* mount a second stage, verify the stamp file, copy updates 
- * Returns 0 on success, 1 on failure to mount, -1 on bad stamp */
-int mountStage2(char *stage2path) {
-    if (access(stage2path, R_OK)) {
-        return 1;
-    }
-
-    if (doPwMount(stage2path, "/mnt/runtime", "auto", "ro", NULL)) {
-        return 1;
-    }
-
-    return 0;
-}
-
 /* given a device name (w/o '/dev' on it), try to get a file */
 /* Error codes: 
       1 - could not create device node
diff --git a/loader/method.h b/loader/method.h
index 7918fe1..c8d8ce0 100644
--- a/loader/method.h
+++ b/loader/method.h
@@ -42,8 +42,6 @@ struct installMethod {
 int readStampFileFromIso(char *file, char **descr, char **timestamp);
 void queryIsoMediaCheck(char * isoDir);
 
-int mountStage2(char *stage2path);
-int mountStage2Direct(char *stage2path);
 int getFileFromBlockDevice(char *device, char *path, char * dest);
 
 int unpackCpioBall(char * ballPath, char * rootDir);
-- 
1.7.1.1


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