X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finstall%2Bsetup%2Finstall%2Fmain.c;h=ea47593cd30e36a8f6baa75a6221ba32de1667b6;hp=d18f16bfa7e94ca91625caa80043f9cd4d95b08f;hb=b9d51680a64a7da279807b1d9901e206749db97f;hpb=dfa59dbd1f12f3427c51215e76b4a825f8a169fc diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index d18f16bfa..ea47593cd 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -1,3 +1,4 @@ + /* SmoothWall install program. * * This program is distributed under the terms of the GNU General Public @@ -11,8 +12,9 @@ #include "install.h" #define _GNU_SOURCE -#define INST_FILECOUNT 8400 +#define INST_FILECOUNT 10700 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf" +#define LICENSE_FILE "/cdrom/COPYING" #define EXT2 0 #define EXT3 1 @@ -33,15 +35,17 @@ extern char *en_tr[]; extern char *es_tr[]; extern char *de_tr[]; extern char *fr_tr[]; +extern char *pl_tr[]; +extern char *ru_tr[]; int main(int argc, char *argv[]) { char discl_msg[40000] = "Disclaimer\n"; - char *langnames[] = { "Deutsch", "English", "Français", "Español", NULL }; - char *shortlangnames[] = { "de", "en", "fr", "es", NULL }; - char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, NULL }; + char *langnames[] = { "Deutsch", "English", "Français", "Español", "Polski", "Русский", NULL }; + char *shortlangnames[] = { "de", "en", "fr", "es", "pl", "ru", NULL }; + char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, ru_tr, NULL }; char hdletter; char harddrive[30], sourcedrive[5]; /* Device holder. */ struct devparams hdparams, cdromparams; /* Params for CDROM and HD */ @@ -49,7 +53,7 @@ int main(int argc, char *argv[]) char commandstring[STRING_SIZE]; char mkfscommand[STRING_SIZE]; char *fstypes[] = { "ext2", "ext3", "ext4", "ReiserFS", NULL }; - int fstype = EXT3; + int fstype = EXT4; int choice; int i; int found = 0; @@ -117,25 +121,15 @@ int main(int argc, char *argv[]) } } - // Read gpl ... - if (! (copying = fopen("/COPYING", "r"))) - { - fprintf(flog, "Couldn't open gpl (/COPYING)\n"); - sprintf(discl_msg, "Couldn't open gpl (/COPYING)\n"); - } else { - fread(discl_msg, 1, 40000, copying); - fclose(copying); - } - // Load common modules mysystem("/sbin/modprobe iso9660"); // CDROM - mysystem("/sbin/modprobe ext2"); // Boot patition +// mysystem("/sbin/modprobe ext2"); // Boot patition mysystem("/sbin/modprobe vfat"); // USB key /* German is the default */ for (choice = 0; langnames[choice]; choice++) { - if (strcmp(langnames[choice], "Deutsch") == 0) + if (strcmp(langnames[choice], "English") == 0) break; } if (!langnames[choice]) @@ -151,14 +145,9 @@ int main(int argc, char *argv[]) newtPushHelpLine(ctr[TR_HELPLINE]); - sprintf(message, ctr[TR_WELCOME], NAME); - newtWinMessage(title, ctr[TR_OK], message); - if (!unattended) { - if (disclaimerbox(discl_msg)==0) { - errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]); - goto EXIT; - } + sprintf(message, ctr[TR_WELCOME], NAME); + newtWinMessage(title, ctr[TR_OK], message); } mysystem("/bin/mountsource.sh"); @@ -175,7 +164,23 @@ int main(int argc, char *argv[]) fgets(sourcedrive, 5, handle); fprintf(flog, "Source drive: %s\n", sourcedrive); fclose(handle); - + + if (!unattended) { + // Read the license file. + if (!(copying = fopen(LICENSE_FILE, "r"))) { + sprintf(discl_msg, "Could not open license file: %s\n", LICENSE_FILE); + fprintf(flog, discl_msg); + } else { + fread(discl_msg, 1, 40000, copying); + fclose(copying); + + if (disclaimerbox(discl_msg)==0) { + errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]); + goto EXIT; + } + } + } + i = 0; while (found == 0) { i++; @@ -372,16 +377,16 @@ int main(int argc, char *argv[]) } if (fstype == EXT2) { - mysystem("/sbin/modprobe ext2"); +// mysystem("/sbin/modprobe ext2"); sprintf(mkfscommand, "/sbin/mke2fs -T ext2"); } else if (fstype == REISERFS) { mysystem("/sbin/modprobe reiserfs"); sprintf(mkfscommand, "/sbin/mkreiserfs -f"); } else if (fstype == EXT3) { - mysystem("/sbin/modprobe ext3"); +// mysystem("/sbin/modprobe ext3"); sprintf(mkfscommand, "/sbin/mke2fs -T ext3"); } else if (fstype == EXT4) { - mysystem("/sbin/modprobe ext4"); +// mysystem("/sbin/modprobe ext4"); sprintf(mkfscommand, "/sbin/mke2fs -T ext4"); } @@ -460,9 +465,6 @@ int main(int argc, char *argv[]) /* Save language und local settings */ write_lang_configs(shortlangname); - /* Rename uname */ - rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname"); - /* mount proc filesystem */ mysystem("mkdir /harddisk/proc"); mysystem("/bin/mount --bind /proc /harddisk/proc"); @@ -510,6 +512,15 @@ int main(int argc, char *argv[]) system("/bin/sed -e 's#/harddisk#/#g' -e 's#//#/#g' < /proc/mounts > /harddisk/etc/mtab"); + /* + * Generate device.map to help grub finding the device to install itself on. + */ + FILE *f = NULL; + if (f = fopen("/harddisk/boot/grub/device.map", "w")) { + fprintf(f, "(hd0) %s\n", hdparams.devnode_part); + fclose(f); + } + snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk); if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_GRUB])) { @@ -553,7 +564,7 @@ int main(int argc, char *argv[]) if (!unattended) { sprintf(message, ctr[TR_CONGRATULATIONS_LONG], NAME, SNAME, NAME); - newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message); + newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_PRESS_OK_TO_REBOOT], message); } allok = 1; @@ -605,13 +616,13 @@ EXIT: newtFinished(); - system("/bin/umount /harddisk/proc"); - system("/bin/umount /harddisk/dev"); - system("/bin/umount /harddisk/sys"); + system("/bin/umount /harddisk/proc >/dev/null 2>&1"); + system("/bin/umount /harddisk/dev >/dev/null 2>&1"); + system("/bin/umount /harddisk/sys >/dev/null 2>&1"); - system("/bin/umount /harddisk/var"); - system("/bin/umount /harddisk/boot"); - system("/bin/umount /harddisk"); + system("/bin/umount /harddisk/var >/dev/null 2>&1"); + system("/bin/umount /harddisk/boot >/dev/null 2>&1"); + system("/bin/umount /harddisk >/dev/null 2>&1"); if (!(allok)) system("/etc/halt");