System ist mittels LFS Bootscripte startbar.

[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 2756f3e720888210aa20db3228d47f96de8aa0ee..b18e221368889a111f5ce3195189939c017b5c57 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -15,7 +15,7 @@
 #define URL_INSTALL 1
 #define DISK_INSTALL 2
 #define INST_FILECOUNT 6600
-#define UNATTENDED_CONF "/cdrom/data/unattended.conf"
+#define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 
 int raid_disk = 0;
 FILE *flog = NULL;
@@ -347,7 +347,7 @@ int main(int argc, char *argv[])
 
        // make some beeps before wiping the system :)
        if (unattended) {
-           runcommandwithstatus("/bin/beep -f 450 -r 10 -D 800 -n -f 900 -l 1000", "WARNING: Unattended installation will start in 10 seconds...");
+           runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
        }
        
        /* German is the default */
@@ -370,7 +370,7 @@ int main(int argc, char *argv[])
 
        mysystem("/bin/setfont lat0-16");
 
-       newtDrawRootText(14, 0, NAME " v" VERSION " - " SLOGAN );
+       newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
        newtPushHelpLine(ctr[TR_HELPLINE]);
 
        if (!unattended) {
@@ -412,7 +412,8 @@ int main(int argc, char *argv[])
 
                /* read source drive letter */
                if ((handle = fopen("/source_device", "r")) == NULL) {
-                   errorbox("ERROR reading source_device");
+                       errorbox(ctr[TR_ERROR_PROBING_CDROM]);
+                       goto EXIT;
                }
                fgets(sourcedrive, 5, handle);
                fprintf(flog, "Source drive: %s\n", sourcedrive);
@@ -759,8 +760,11 @@ int main(int argc, char *argv[])
        mysystem("/bin/mount -t proc none /harddisk/proc");
        mysystem("/bin/mount --bind /dev /harddisk/dev");
 
+
+
        /* if we detected SCSI then fixup */
-       mysystem("/bin/probecntrl.sh");
+       /* doesn't really work cause it sometimes creates a ramdisk on ide systems */
+/*     mysystem("/bin/probecntrl.sh");
        if ((handle = fopen("/cntrldriver", "r")))
        {
                char *driver;
@@ -779,7 +783,7 @@ int main(int argc, char *argv[])
                        runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
                        mysystem("/bin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf");
                }
-       }
+       } */
 
        /* Build cache lang file */
        snprintf(commandstring, STRING_SIZE, "/bin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
@@ -807,6 +811,9 @@ int main(int argc, char *argv[])
                goto EXIT;
        }
 
+       /* Update /etc/fstab */
+       replace( "/harddisk/etc/fstab", "DEVICE", hdparams.devnode);
+
        /* Install bootsplash */
        mysystem("/bin/installbootsplash.sh");
 
@@ -814,9 +821,11 @@ int main(int argc, char *argv[])
        mysystem("umount /harddisk/proc");
        mysystem("umount /harddisk/dev");
 
-       sprintf(message, ctr[TR_CONGRATULATIONS_LONG],
-                       NAME, SNAME, SNAME, NAME, NAME, NAME);
-       newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message);
+       if (!unattended) {
+               sprintf(message, ctr[TR_CONGRATULATIONS_LONG],
+                               NAME, SNAME, SNAME, NAME, NAME, NAME);
+               newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message);
+       }
                 
        allok = 1;