]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - src/install+setup/install/main.c
Ich hab mal ein bisschen die Arbeit vom Cuebernommen :D
[people/pmueller/ipfire-2.x.git] / src / install+setup / install / main.c
index b18e221368889a111f5ce3195189939c017b5c57..3ca80da7aaa7bc78dcea76bb42a97c5ead89da85 100644 (file)
@@ -108,8 +108,6 @@ int unattended_setup(struct keyvalue *unattendedkv) {
     char green_broadcast[STRING_SIZE];
     char root_password[STRING_SIZE];
     char admin_password[STRING_SIZE];
-    char serial_console[STRING_SIZE];
-    char reversesort[STRING_SIZE];
 
     findkey(unattendedkv, "DOMAINNAME", domainname);
     findkey(unattendedkv, "HOSTNAME", hostname);
@@ -122,8 +120,6 @@ int unattended_setup(struct keyvalue *unattendedkv) {
     findkey(unattendedkv, "GREEN_BROADCAST", green_broadcast);
     findkey(unattendedkv, "ROOT_PASSWORD", root_password);
     findkey(unattendedkv, "ADMIN_PASSWORD", admin_password);
-    findkey(unattendedkv, "SERIAL_CONSOLE", serial_console);
-    findkey(unattendedkv, "REVERSE_NICS", reversesort);
 
     /* write main/settings. */
     replacekeyvalue(mainsettings, "DOMAINNAME", domainname);
@@ -138,7 +134,6 @@ int unattended_setup(struct keyvalue *unattendedkv) {
     fprintf(flog, "unattended: Starting setup\n");
 
     /* network */
-
     fprintf(flog, "unattended: setting up network configuration\n");
 
     (void) readkeyvalues(ethernetkv, "/harddisk" CONFIG_ROOT "/ethernet/settings");
@@ -164,7 +159,7 @@ int unattended_setup(struct keyvalue *unattendedkv) {
        return 0;
     }
     fprintf(file, "ServerName %s\n", hostname);
-    fclose(file);                                  
+    fclose(file);
 
     fprintf(flog, "unattended: writing hosts\n");
     if (!(hosts = fopen("/harddisk/etc/hosts", "w")))
@@ -174,7 +169,7 @@ int unattended_setup(struct keyvalue *unattendedkv) {
     }
     fprintf(hosts, "127.0.0.1\tlocalhost\n");
     fprintf(hosts, "%s\t%s.%s\t%s\n", green_address, hostname, domainname, hostname);
-    fclose(hosts);                                                             
+    fclose(hosts);
 
     fprintf(flog, "unattended: writing hosts.allow\n");
     if (!(file = fopen("/harddisk/etc/hosts.allow", "w")))
@@ -196,47 +191,24 @@ int unattended_setup(struct keyvalue *unattendedkv) {
     fprintf(file, "ALL : ALL\n");
     fclose(file);
 
-    if (strcmp(serial_console, "yes") != 0) {
-           snprintf(commandstring, STRING_SIZE,
-                    "/bin/chroot /harddisk /bin/sed -i -e \"s/^s0/#s0/\" /etc/inittab");
-           if (mysystem(commandstring)) {
-                   errorbox("unattended: ERROR modifying inittab");
-                   return 0;    
-           }
-
-           snprintf(commandstring, STRING_SIZE,
-                    "/bin/chroot /harddisk /bin/sed -i -e \"s/^serial/#serial/; s/^terminal/#terminal/\" /boot/grub/grub.conf");
-           if (mysystem(commandstring)) {
-                   errorbox("unattended: ERROR modifying inittab");
-                   return 0;
-           }
-    }
-
-    /* set reverse sorting of interfaces */
-    if (strcmp(reversesort, "yes") == 0) {
-           mysystem("/bin/touch /harddisk/var/ipfire/ethernet/reverse_nics");
-    }
-
     /* set root password */
     fprintf(flog, "unattended: setting root password\n");
-    
     snprintf(commandstring, STRING_SIZE,
-           "/bin/chroot /harddisk /bin/sh -c \"echo 'root:%s' | /usr/sbin/chpasswd\"", root_password);
+           "/sbin/chroot /harddisk /bin/sh -c \"echo 'root:%s' | /usr/sbin/chpasswd\"", root_password);
     if (mysystem(commandstring)) {
        errorbox("unattended: ERROR setting root password");
        return 0;
     }
-    
+
     /* set admin password */
     fprintf(flog, "unattended: setting admin password\n");
     snprintf(commandstring, STRING_SIZE,
-           "/bin/chroot /harddisk /usr/bin/htpasswd -c -m -b " CONFIG_ROOT "/auth/users admin '%s'", admin_password);
+           "/sbin/chroot /harddisk /usr/sbin/htpasswd -c -m -b " CONFIG_ROOT "/auth/users admin '%s'", admin_password);
     if (mysystem(commandstring)) {
        errorbox("unattended: ERROR setting admin password");
-       return 0;    
+       return 0;
     }
-    
-    return 1;                                                          
+    return 1;
 }
 
 int main(int argc, char *argv[])
@@ -316,23 +288,6 @@ int main(int argc, char *argv[])
                        fprintf(flog, "Manual FDISK selected.\n");
                        fdisk = 1;
                }
-               if (strstr (line, "nopcmcia") == NULL) {
-                       fprintf(flog, "Initializing PCMCIA controllers.\n");
-                       pcmcia = initialize_pcmcia();
-                       if (pcmcia) {
-                               fprintf (flog, "Detected PCMCIA Controller: %s.\n", pcmcia);
-                               sprintf(commandstring, "/sbin/modprobe %s", pcmcia);
-                               mysystem("/sbin/modprobe pcmcia_core");
-                               mysystem(commandstring);
-                               mysystem("/sbin/modprobe ds");
-                               /* pcmcia netcard drivers are not available from Boot floppy,
-                                * they will be loaded from Drivers floppy later */
-                       } else {
-                               fprintf (flog, "Detected No PCMCIA Controller.\n");
-                       }
-               } else {
-                       fprintf(flog, "Skipping PCMCIA detection.\n");
-               }
                if (strstr (line, "nousb") == NULL) {
                        fprintf(flog, "Initializing USB controllers.\n");
                        initialize_usb();
@@ -608,7 +563,7 @@ int main(int argc, char *argv[])
                goto EXIT;
        }
 
-       mysystem("/bin/udevstart");
+       mysystem("/sbin/udevstart");
 
        if (raid_disk)
                snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext2 -c %sp1", hdparams.devnode);
@@ -622,9 +577,9 @@ int main(int argc, char *argv[])
 
        if (swap_file) {
                if (raid_disk)
-                       snprintf(commandstring, STRING_SIZE, "/bin/mkswap %sp2", hdparams.devnode);     
+                       snprintf(commandstring, STRING_SIZE, "/sbin/mkswap %sp2", hdparams.devnode);    
                else
-                       snprintf(commandstring, STRING_SIZE, "/bin/mkswap %s2", hdparams.devnode);
+                       snprintf(commandstring, STRING_SIZE, "/sbin/mkswap %s2", hdparams.devnode);
                if (runcommandwithstatus(commandstring, ctr[TR_MAKING_SWAPSPACE]))
                {
                        errorbox(ctr[TR_UNABLE_TO_MAKE_SWAPSPACE]);
@@ -656,9 +611,9 @@ int main(int argc, char *argv[])
 
        /* Mount harddisk. */
        if (raid_disk)
-               snprintf(commandstring, STRING_SIZE, "/sbin/mount %sp3 /harddisk", hdparams.devnode);
+               snprintf(commandstring, STRING_SIZE, "/bin/mount %sp3 /harddisk", hdparams.devnode);
        else
-               snprintf(commandstring, STRING_SIZE, "/sbin/mount %s3 /harddisk", hdparams.devnode);
+               snprintf(commandstring, STRING_SIZE, "/bin/mount %s3 /harddisk", hdparams.devnode);
        if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_ROOT_FILESYSTEM]))
        {
                errorbox(ctr[TR_UNABLE_TO_MOUNT_ROOT_FILESYSTEM]);
@@ -670,9 +625,9 @@ int main(int argc, char *argv[])
        mkdir("/harddisk/var/log", S_IRWXU|S_IRWXG|S_IRWXO);
        
        if (raid_disk)
-               snprintf(commandstring, STRING_SIZE, "/sbin/mount %sp1 /harddisk/boot", hdparams.devnode);
+               snprintf(commandstring, STRING_SIZE, "/bin/mount %sp1 /harddisk/boot", hdparams.devnode);
        else
-               snprintf(commandstring, STRING_SIZE, "/sbin/mount %s1 /harddisk/boot", hdparams.devnode);
+               snprintf(commandstring, STRING_SIZE, "/bin/mount %s1 /harddisk/boot", hdparams.devnode);
 
        if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_BOOT_FILESYSTEM]))
        {
@@ -681,9 +636,9 @@ int main(int argc, char *argv[])
        }
        if (swap_file) {
                if (raid_disk)
-                       snprintf(commandstring, STRING_SIZE, "/bin/swapon %sp2", hdparams.devnode);
+                       snprintf(commandstring, STRING_SIZE, "/sbin/swapon %sp2", hdparams.devnode);
                else
-                       snprintf(commandstring, STRING_SIZE, "/bin/swapon %s2", hdparams.devnode);
+                       snprintf(commandstring, STRING_SIZE, "/sbin/swapon %s2", hdparams.devnode);
                if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_SWAP_PARTITION]))
                {
                        errorbox(ctr[TR_UNABLE_TO_MOUNT_SWAP_PARTITION]);
@@ -691,9 +646,9 @@ int main(int argc, char *argv[])
                }
        }
        if (raid_disk)
-               snprintf(commandstring, STRING_SIZE, "/sbin/mount %sp4 /harddisk/var", hdparams.devnode);
+               snprintf(commandstring, STRING_SIZE, "/bin/mount %sp4 /harddisk/var", hdparams.devnode);
        else
-               snprintf(commandstring, STRING_SIZE, "/sbin/mount %s4 /harddisk/var", hdparams.devnode);
+               snprintf(commandstring, STRING_SIZE, "/bin/mount %s4 /harddisk/var", hdparams.devnode);
        if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_LOG_FILESYSTEM]))
        {
                errorbox(ctr[TR_UNABLE_TO_MOUNT_LOG_FILESYSTEM]);
@@ -714,41 +669,17 @@ int main(int argc, char *argv[])
 
        /* touch the modules.dep files */
        snprintf(commandstring, STRING_SIZE, 
-               "/bin/chroot /harddisk /usr/bin/touch /lib/modules/%s/modules.dep",
+               "/sbin/chroot /harddisk /usr/bin/touch /lib/modules/%s/modules.dep",
                KERNEL_VERSION);
        mysystem(commandstring);
        snprintf(commandstring, STRING_SIZE, 
-               "/bin/chroot /harddisk /usr/bin/touch /lib/modules/%s-smp/modules.dep",
+               "/sbin/chroot /harddisk /usr/bin/touch /lib/modules/%s-smp/modules.dep",
                KERNEL_VERSION);
        mysystem(commandstring);
 
        /* Rename uname */
        rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
 
-       /* Write PCMCIA Config */
-       if (pcmcia) {
-               handle = fopen("/harddisk/etc/modules.conf", "a");
-               if (handle != NULL) {
-                       fprintf (handle, "# PCMCIA Settings\n");
-                       fprintf (handle, "alias pcmcia-controller %s\n", pcmcia);
-                       fclose(handle);
-               }
-       }
-
-       handle = fopen("/harddisk/etc/pcmcia.conf", "w");
-       if (handle != NULL) {
-               if (pcmcia) {
-                       fprintf (handle, "PCMCIA=yes\n");
-                       fprintf (handle, "PCIC=%s\n", pcmcia);
-               } else {
-                       fprintf (handle, "PCMCIA=no\n");
-                       fprintf (handle, "PCIC=\n");
-               }
-               fprintf (handle, "CARDMGR_OPTS=\n");
-               fprintf (handle, "SCHEME=\n");
-               fclose(handle);
-       }
-
        /* *always* write disk configuration */
        if (!(write_disk_configs(&hdparams))){
          errorbox(ctr[TR_ERROR_WRITING_CONFIG]);
@@ -775,18 +706,18 @@ int main(int argc, char *argv[])
                fprintf(flog, "Detected SCSI driver %s\n",driver);
                if (strlen(driver) > 1) {
                        fprintf(flog, "Fixing up ipfirerd.img\n");
-                       mysystem("/bin/chroot /harddisk /sbin/modprobe loop");
+                       mysystem("/sbin/chroot /harddisk /sbin/modprobe loop");
                        mkdir("/harddisk/initrd", S_IRWXU|S_IRWXG|S_IRWXO);
-                       snprintf(commandstring, STRING_SIZE, "/bin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata /boot/ipfirerd.img %s", driver, KERNEL_VERSION);
+                       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata /boot/ipfirerd.img %s", driver, KERNEL_VERSION);
                        runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-                       snprintf(commandstring, STRING_SIZE, "/bin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata /boot/ipfirerd-smp.img %s-smp", driver, KERNEL_VERSION);
+                       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata /boot/ipfirerd-smp.img %s-smp", driver, KERNEL_VERSION);
                        runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-                       mysystem("/bin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf");
+                       mysystem("/sbin/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\"");
+       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
        if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_LANG_CACHE]))
        {
                errorbox(ctr[TR_UNABLE_TO_INSTALL_LANG_CACHE]);
@@ -798,14 +729,13 @@ int main(int argc, char *argv[])
        else
                sprintf(string, "root=%s3", hdparams.devnode);
        replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
-       mysystem( "sed -i \"s|KVERSION|$(/bin/uname -r)|\" /harddisk/boot/grub/grub.conf" );
-
        replace( "/harddisk/boot/grub/grubbatch", "DEVICE", hdparams.devnode);
+
        /* restore permissions */
        chmod("/harddisk/boot/grub/grubbatch", S_IXUSR | S_IRUSR | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH);
 
        snprintf(commandstring, STRING_SIZE, 
-                "/bin/chroot /harddisk /boot/grub/grubbatch");
+                "/sbin/chroot /harddisk /boot/grub/grubbatch");
        if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_GRUB])) {
                errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]);
                goto EXIT;
@@ -845,23 +775,41 @@ EXIT:
        {
                /* /proc is needed by the module checker.  We have to mount it
                 * so it can be seen by setup, which is run chrooted. */
-               if (system("/sbin/mount proc -t proc /harddisk/proc"))
+               if (system("/bin/mount proc -t proc /harddisk/proc"))
                        printf("Unable to mount proc in /harddisk.");
                else
                {
-                       if (system("/bin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
-                               printf("Unable to run setup.\n");
-                       if (system("/sbin/umount /harddisk/proc"))
+
+                       if (!unattended) {
+                           if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
+                                   printf("Unable to run setup.\n");
+                       }
+                       else {
+                           fprintf(flog, "Entering unattended setup\n");
+                           unattended_setup(unattendedkv);
+                           snprintf(commandstring, STRING_SIZE, "/bin/sleep 10");
+                           runcommandwithstatus(commandstring, "Unattended installation finished, system will reboot");
+                       }
+
+                       if (system("/bin/umount /harddisk/proc"))
                                printf("Unable to umount /harddisk/proc.\n");
                }
        }
 
        fcloseall();
 
-       system("/bin/swapoff /harddisk/swapfile");
-       system("/sbin/umount /harddisk/var");
-       system("/sbin/umount /harddisk/boot");
-       system("/sbin/umount /harddisk");
+       if (swap_file) {
+               if (raid_disk)
+                       snprintf(commandstring, STRING_SIZE, "/bin/swapoff %sp2", hdparams.devnode);
+               else
+                       snprintf(commandstring, STRING_SIZE, "/bin/swapoff %s2", hdparams.devnode);
+       }
+
+       newtFinished();
+
+       system("/bin/umount /harddisk/var");
+       system("/bin/umount /harddisk/boot");
+       system("/bin/umount /harddisk");
          
        system("/etc/halt");