Reiser4 Implementation abgeschlossen...

[people/pmueller/ipfire-2.x.git] / src / install+setup / install / main.c

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 44ce1f06baf232cc550903a2263bc2b18929b45b..ad21363f0690e5c3790d41ccd25bf59540555ebd 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -14,7 +14,7 @@
 #define CDROM_INSTALL 0
 #define URL_INSTALL 1
 #define DISK_INSTALL 2
-#define INST_FILECOUNT 6600
+#define INST_FILECOUNT 7000
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 
 int raid_disk = 0;
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
        int cdmounted = 0; /* Loop flag for inserting a cd. */
        int rc = 0;
        char commandstring[STRING_SIZE];
-       char *installtypes[] = { "CDROM", "HTTP/FTP", NULL };
+       char *installtypes[] = { "CDROM/USB", "HTTP/FTP", NULL };
        int installtype = CDROM_INSTALL;
        char insertmessage[STRING_SIZE];
        char insertdevnode[STRING_SIZE];
@@ -335,7 +335,7 @@ int main(int argc, char *argv[])
                }
 
                /* read source drive letter */
-               if ((handle = fopen("/source_device", "r")) == NULL) {
+               if ((handle = fopen("/tmp/source_device", "r")) == NULL) {
                        errorbox(ctr[TR_ERROR_PROBING_CDROM]);
                        goto EXIT;
                }
@@ -457,11 +457,11 @@ int main(int argc, char *argv[])
         * the disk. 
         */
        /* Don't use mysystem here so we can redirect output */
-       sprintf(commandstring, "/bin/sfdisk -s /dev/%s > /disksize 2> /dev/null", harddrive);
+       sprintf(commandstring, "/bin/sfdisk -s /dev/%s > /tmp/disksize 2> /dev/null", harddrive);
        system(commandstring);
 
        /* Calculate amount of disk space */
-        if ((handle = fopen("/disksize", "r")))
+        if ((handle = fopen("/tmp/disksize", "r")))
         {
                fgets(line, STRING_SIZE-1, handle);
                if (sscanf (line, "%s", string)) {
@@ -557,9 +557,9 @@ int main(int argc, char *argv[])
        }
 
        if (raid_disk)
-               snprintf(commandstring, STRING_SIZE, "/bin/mkreiserfs -f %sp3", hdparams.devnode);      
+               snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -y %sp3", hdparams.devnode);   
        else
-               snprintf(commandstring, STRING_SIZE, "/bin/mkreiserfs -f %s3", hdparams.devnode);       
+               snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -y %s3", hdparams.devnode);    
 
        if (runcommandwithstatus(commandstring, ctr[TR_MAKING_ROOT_FILESYSTEM]))
        {
@@ -568,9 +568,9 @@ int main(int argc, char *argv[])
        }
 
        if (raid_disk)
-               snprintf(commandstring, STRING_SIZE, "/bin/mkreiserfs -f %sp4", hdparams.devnode);      
+               snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -y %sp4", hdparams.devnode);   
        else
-               snprintf(commandstring, STRING_SIZE, "/bin/mkreiserfs -f %s4", hdparams.devnode);       
+               snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -y %s4", hdparams.devnode);    
 
        if (runcommandwithstatus(commandstring, ctr[TR_MAKING_LOG_FILESYSTEM]))
        {
@@ -661,7 +661,6 @@ int main(int argc, char *argv[])
        mysystem("/bin/mount --bind /dev /harddisk/dev");
 
 
-
        /* if we detected SCSI then fixup */
        /* doesn't really work cause it sometimes creates a ramdisk on ide systems */
 /*     mysystem("/bin/probecntrl.sh");