#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;
char **ctr;
-char *pcmcia = NULL;
extern char url[STRING_SIZE];
+struct nic nics[20] = { { "" , "" } }; // only defined for compile
+struct knic knics[20] = { { "" , "" , "" } }; // only defined for compile
+
extern char *en_tr[];
extern char *de_tr[];
return (cpu_count > 1);
}
-int generate_packages_list(char *packages, const char *rpmdir, const char *source) {
-
- FILE *fd=NULL;
- char buffer[STRING_SIZE];
- bzero(buffer, sizeof(buffer));
-
- if ((fd = fopen(source, "r")) == NULL) {
- (void) fprintf(flog, "Packages file %s not found\n", source);
- return -1;
- }
- while (fgets(buffer, sizeof(buffer), fd) != NULL) {
- int length = -1;
- length = strlen(buffer)-1;
- if (length<=0) {
- continue;
- }
- if (buffer[length] == '\n') {
- buffer[length]='\0';
- }
- length = snprintf(packages, STRING_SIZE, "%s %s/%s", strdup(packages), rpmdir, buffer);
- if ((length <0) || (length >STRING_SIZE)) {
- (void) fprintf(flog, "rpm command line too long: %d\n%s", length, packages);
- return -1;
- }
- }
- if (ferror(fd)) {
- (void) fprintf(flog, "Error reading file\n");
- (void) fclose(fd);
- return -1;
- }
- (void) fclose(fd);
- return 0;
-}
-
long calc_swapsize(long memory, long disk) {
if (memory < 128) {
return 256;
return memory*2;
}
-int unattended_setup(struct keyvalue *unattendedkv) {
- struct keyvalue *mainsettings = initkeyvalues();
- struct keyvalue *ethernetkv = initkeyvalues();
- FILE *file, *hosts;
- char commandstring[STRING_SIZE];
-
- char domainname[STRING_SIZE];
- char hostname[STRING_SIZE];
- char keymap[STRING_SIZE];
- char language[STRING_SIZE];
- char timezone[STRING_SIZE];
- char green_address[STRING_SIZE];
- char green_netmask[STRING_SIZE];
- char green_netaddress[STRING_SIZE];
- 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);
- findkey(unattendedkv, "KEYMAP", keymap);
- findkey(unattendedkv, "LANGUAGE", language);
- findkey(unattendedkv, "TIMEZONE", timezone);
- findkey(unattendedkv, "GREEN_ADDRESS", green_address);
- findkey(unattendedkv, "GREEN_NETMASK", green_netmask);
- findkey(unattendedkv, "GREEN_NETADDRESS", green_netaddress);
- 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);
- replacekeyvalue(mainsettings, "HOSTNAME", hostname);
- replacekeyvalue(mainsettings, "KEYMAP", keymap);
- replacekeyvalue(mainsettings, "LANGUAGE", language);
- replacekeyvalue(mainsettings, "TIMEZONE", timezone);
- writekeyvalues(mainsettings, "/harddisk" CONFIG_ROOT "/main/settings");
- freekeyvalues(mainsettings);
-
- /* do setup stuff */
- fprintf(flog, "unattended: Starting setup\n");
-
- /* network */
-
- fprintf(flog, "unattended: setting up network configuration\n");
-
- (void) readkeyvalues(ethernetkv, "/harddisk" CONFIG_ROOT "/ethernet/settings");
- replacekeyvalue(ethernetkv, "GREEN_ADDRESS", green_address);
- replacekeyvalue(ethernetkv, "GREEN_NETMASK", green_netmask);
- replacekeyvalue(ethernetkv, "GREEN_NETADDRESS", green_netaddress);
- replacekeyvalue(ethernetkv, "GREEN_BROADCAST", green_broadcast);
- replacekeyvalue(ethernetkv, "CONFIG_TYPE", "0");
- replacekeyvalue(ethernetkv, "GREEN_DEV", "eth0");
- write_ethernet_configs(ethernetkv);
- freekeyvalues(ethernetkv);
-
- /* timezone */
- unlink("/harddisk/etc/localtime");
- snprintf(commandstring, STRING_SIZE, "/harddisk/%s", timezone);
- link(commandstring, "/harddisk/etc/localtime");
-
- /* hostname */
- fprintf(flog, "unattended: writing hostname.conf\n");
- if (!(file = fopen("/harddisk" CONFIG_ROOT "/main/hostname.conf", "w")))
- {
- errorbox("unattended: ERROR writing hostname.conf");
- return 0;
- }
- fprintf(file, "ServerName %s\n", hostname);
- fclose(file);
-
- fprintf(flog, "unattended: writing hosts\n");
- if (!(hosts = fopen("/harddisk/etc/hosts", "w")))
- {
- errorbox("unattended: ERROR writing hosts");
- return 0;
- }
- fprintf(hosts, "127.0.0.1\tlocalhost\n");
- fprintf(hosts, "%s\t%s.%s\t%s\n", green_address, hostname, domainname, hostname);
- fclose(hosts);
-
- fprintf(flog, "unattended: writing hosts.allow\n");
- if (!(file = fopen("/harddisk/etc/hosts.allow", "w")))
- {
- errorbox("unattended: ERROR writing hosts.allow");
- return 0;
- }
- fprintf(file, "sshd : ALL\n");
- fprintf(file, "ALL : localhost\n");
- fprintf(file, "ALL : %s/%s\n", green_netaddress, green_netmask);
- fclose(file);
-
- fprintf(flog, "unattended: writing hosts.deny\n");
- if (!(file = fopen("/harddisk/etc/hosts.deny", "w")))
- {
- errorbox("unattended: ERROR writing hosts.deny");
- return 0;
- }
- 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);
- 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);
- if (mysystem(commandstring)) {
- errorbox("unattended: ERROR setting admin password");
- return 0;
- }
-
- return 1;
-}
-
int main(int argc, char *argv[])
{
char *langnames[] = { "Deutsch", "English", NULL };
char *shortlangnames[] = { "de", "en", NULL };
char **langtrs[] = { de_tr, en_tr, NULL };
- char hdletter, cdletter;
+ char hdletter;
char harddrive[5], sourcedrive[5]; /* Device holder. */
struct devparams hdparams, cdromparams; /* Params for CDROM and HD */
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];
int choice;
char shortlangname[10];
char message[1000];
char title[STRING_SIZE];
int allok = 0;
int allok_fastexit=0;
- int unmount_before=0;
struct keyvalue *ethernetkv = initkeyvalues();
FILE *handle, *cmdfile;
char line[STRING_SIZE];
long memory = 0;
long system_partition, boot_partition, root_partition, swap_file;
int scsi_disk = 0;
- int pcmcia_disk = 0;
- int pcmcia_cdrom = 0;
- int scsi_cdrom = 0;
- int ide_cdrom = 0;
- int fdisk = 0;
- int hardyn = 0;
- char *yesnoharddisk[] = { "NO", "YES", NULL };
- char *yesno[] = { "NO", "YES", NULL };
- char green[STRING_SIZE];
+ char *yesnoharddisk[3]; // char *yesnoharddisk = { "NO", "YES", NULL };
+
int unattended = 0;
struct keyvalue *unattendedkv = initkeyvalues();
- char packages[STRING_SIZE];
- int serial_console = 0;
- char megabridge[STRING_SIZE];
+ int hardyn = 0;
setlocale (LC_ALL, "");
sethostname( SNAME , 10);
fprintf(flog, "Couldn't open commandline: /proc/cmdline\n");
} else {
fgets(line, STRING_SIZE, cmdfile);
- if (strstr (line, "fdisk") != NULL) {
- 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();
}
}
- // make some beeps before wiping the system :)
if (unattended) {
runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
}
ctr = langtrs[choice];
strcpy(shortlangname, shortlangnames[choice]);
-
- mysystem("/bin/setfont lat0-16");
+ fprintf(flog, "Selected language: %s\n", shortlangname);
newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
newtPushHelpLine(ctr[TR_HELPLINE]);
+ sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
if (!unattended) {
sprintf(message, ctr[TR_WELCOME], NAME);
- sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
newtWinMessage(title, ctr[TR_OK], message);
sprintf(message, ctr[TR_SELECT_INSTALLATION_MEDIA_LONG], NAME);
rc = newtWinMenu(ctr[TR_SELECT_INSTALLATION_MEDIA], message,
50, 5, 5, 6, installtypes, &installtype, ctr[TR_OK],
ctr[TR_CANCEL], NULL);
- }
- else {
+ } else {
rc = 1;
installtype = CDROM_INSTALL;
}
// Starting hardware detection
runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
+ runcommandwithstatus("/bin/probenic.sh install", ctr[TR_PROBING_HARDWARE]);
/* CDROM INSTALL */
if (installtype == CDROM_INSTALL) {
-
switch (mysystem("/bin/mountsource.sh")) {
case 0:
installtype = CDROM_INSTALL;
}
/* 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;
}
fprintf(flog, "Source drive: %s\n", sourcedrive);
fclose(handle);
- snprintf(cdromparams.devnode, STRING_SIZE, "/dev/%s", sourcedrive);
- cdromparams.module = 0;
- fprintf(flog, "Source device: %s\n", cdromparams.devnode);
+ //snprintf(cdromparams.devnode_disk, STRING_SIZE, "/dev/%s", sourcedrive);
+ fprintf(flog, "Source device: %s\n", sourcedrive);
}
/* Configure the network now! */
goto EXIT;
}
- /* Check for ipcop-<VERSION>.tbz2 */
+ /* Check for ipfire-<VERSION>.tbz2 */
if (checktarball(SNAME "-" VERSION ".tbz2", ctr[TR_ENTER_URL])) {
errorbox(ctr[TR_NO_IPCOP_TARBALL_FOUND]);
goto EXIT;
}
}
- /* Get device for the HD. This has to succeed. */
- if (!(hdletter = findidetype(IDE_HD)))
- {
- /* Need to clean this up at some point */
- if (!try_scsi("sda") || strstr(sourcedrive, "sda") != NULL) {
- if (!try_scsi("ida/c0d0")) {
- if (!try_scsi("cciss/c0d0")) {
- if (!try_scsi("rd/c0d0")) {
- if (!try_scsi("ataraid/d0")) {
- errorbox(ctr[TR_NO_HARDDISK]);
- goto EXIT;
- } else {
- raid_disk = 1;
- sprintf(harddrive, "ataraid/d0");
- }
- } else {
- raid_disk = 1;
- sprintf(harddrive, "rd/c0d0");
- }
- } else {
- raid_disk = 1;
- sprintf(harddrive, "cciss/c0d0");
- }
- } else {
- raid_disk = 1;
- sprintf(harddrive, "ida/c0d0");
- }
- } else {
- if (strstr(sourcedrive, "sda") != NULL) {
- // probably installing from usb stick, try sdb
- if (try_scsi("sdb")) {
- sprintf(harddrive, "sdb");
- }
- else {
- errorbox(ctr[TR_NO_HARDDISK]);
- goto EXIT;
- }
- }
- else {
- sprintf(harddrive, "sda");
- }
- }
- scsi_disk = 1;
- } else
+ // Now try to find destination device...
+ if ((hdletter = findidetype(IDE_HD))) {
sprintf(harddrive, "hd%c", hdletter);
-
- fprintf(flog, "Destination drive: %s\n", harddrive);
-
+ goto FOUND_DESTINATION;
+ }
+
+ /* Need to clean this up at some point
+ scsi disk is sdb/sdc when sda/sdb is used for usb-key
+ if scsi-disk is sdd or more, it is not discovered
+ Support only 2 usb keys, none could be unplugged */
+ if (checkusb("sdb") && try_scsi("sdc")) {
+ scsi_disk = 1;
+ sprintf(harddrive, "sdc");
+ goto FOUND_DESTINATION;
+ }
+ if (checkusb("sda") && try_scsi("sdb")) {
+ scsi_disk = 1;
+ sprintf(harddrive, "sdb");
+ goto FOUND_DESTINATION;
+ }
+ if (try_scsi("sda")) {
+ scsi_disk = 1;
+ sprintf(harddrive, "sda");
+ goto FOUND_DESTINATION;
+ }
+ if (try_scsi("ida/c0d0")) {
+ raid_disk = 1;
+ sprintf(harddrive, "ida/c0d0");
+ goto FOUND_DESTINATION;
+ }
+ if (try_scsi("cciss/c0d0")) {
+ raid_disk = 1;
+ sprintf(harddrive, "cciss/c0d0");
+ goto FOUND_DESTINATION;
+ }
+ if (try_scsi("rd/c0d0")) {
+ raid_disk = 1;
+ sprintf(harddrive, "rd/c0d0");
+ goto FOUND_DESTINATION;
+ }
+ if (try_scsi("ataraid/d0")) {
+ raid_disk = 1;
+ sprintf(harddrive, "ataraid/d0");
+ goto FOUND_DESTINATION;
+ }
+ /* nothing worked, give up */
+ errorbox(ctr[TR_NO_HARDDISK]);
+ goto EXIT;
+
+ FOUND_DESTINATION:
/* load unattended configuration */
if (unattended) {
fprintf(flog, "unattended: Reading unattended.conf\n");
(void) readkeyvalues(unattendedkv, UNATTENDED_CONF);
}
-
- /* Make the hdparms struct and print the contents. */
- snprintf(hdparams.devnode, STRING_SIZE, "/dev/%s", harddrive);
- hdparams.module = 0;
-
- sprintf(message, ctr[TR_PREPARE_HARDDISK], hdparams.devnode);
+ /* Make the hdparms struct and print the contents.
+ With USB-KEY install and SCSI disk, while installing, the disk
+ is named 'sdb,sdc,...' (following keys)
+ On reboot, it will become 'sda'
+ To avoid many test, all names are built in the struct.
+ */
+ sprintf(hdparams.devnode_disk, "/dev/%s", harddrive);
+ /* Address the partition or raid partition (eg dev/sda or /dev/sdap1 */
+ sprintf(hdparams.devnode_part, "/dev/%s%s", harddrive,raid_disk ? "p" : "");
+ /* Now the names after the machine is booted. Only scsi is affected
+ and we only install on the first scsi disk. */
+ { char tmp[30];
+ strcpy(tmp, scsi_disk ? "sda" : harddrive);
+ sprintf(hdparams.devnode_disk_run, "/dev/%s", tmp);
+ sprintf(hdparams.devnode_part_run, "/dev/%s%s", tmp, raid_disk ? "p" : "");
+ }
+
+ fprintf(flog, "Destination drive: %s\n", hdparams.devnode_disk);
+
+ sprintf(message, ctr[TR_PREPARE_HARDDISK], hdparams.devnode_disk);
if (unattended) {
hardyn = 1;
}
-
+
+ yesnoharddisk[0] = ctr[TR_NO];
+ yesnoharddisk[1] = ctr[TR_YES];
+ yesnoharddisk[2] = NULL;
+
while (! hardyn) {
rc = newtWinMenu(title, message,
50, 5, 5, 6, yesnoharddisk,
if (rc == 2)
goto EXIT;
}
-
if (rc == 2)
goto EXIT;
* 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)) {
fclose(handle);
- snprintf(commandstring, STRING_SIZE, "/bin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/bin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode_disk);
if (runcommandwithstatus(commandstring, ctr[TR_PARTITIONING_DISK]))
{
errorbox(ctr[TR_UNABLE_TO_PARTITION]);
goto EXIT;
}
- mysystem("/bin/udevstart");
+ mysystem("/sbin/udevstart");
- if (raid_disk)
- snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext2 -c %sp1", hdparams.devnode);
- else
- snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext2 -c %s1", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext2 -c %s1", hdparams.devnode_part);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_BOOT_FILESYSTEM]))
{
errorbox(ctr[TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM]);
}
if (swap_file) {
- if (raid_disk)
- snprintf(commandstring, STRING_SIZE, "/bin/mkswap %sp2", hdparams.devnode);
- else
- snprintf(commandstring, STRING_SIZE, "/bin/mkswap %s2", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/sbin/mkswap %s2", hdparams.devnode_part);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_SWAPSPACE]))
{
errorbox(ctr[TR_UNABLE_TO_MAKE_SWAPSPACE]);
}
}
- if (raid_disk)
- snprintf(commandstring, STRING_SIZE, "/bin/mkreiserfs -f %sp3", hdparams.devnode);
- else
- snprintf(commandstring, STRING_SIZE, "/bin/mkreiserfs -f %s3", hdparams.devnode);
-
+ snprintf(commandstring, STRING_SIZE, "/sbin/mkreiserfs -f %s3", hdparams.devnode_part);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_ROOT_FILESYSTEM]))
{
errorbox(ctr[TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM]);
goto EXIT;
}
- if (raid_disk)
- snprintf(commandstring, STRING_SIZE, "/bin/mkreiserfs -f %sp4", hdparams.devnode);
- else
- snprintf(commandstring, STRING_SIZE, "/bin/mkreiserfs -f %s4", hdparams.devnode);
-
+ snprintf(commandstring, STRING_SIZE, "/sbin/mkreiserfs -f %s4", hdparams.devnode_part);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_LOG_FILESYSTEM]))
{
errorbox(ctr[TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM]);
}
/* Mount harddisk. */
- if (raid_disk)
- snprintf(commandstring, STRING_SIZE, "/sbin/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_part);
if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_ROOT_FILESYSTEM]))
{
errorbox(ctr[TR_UNABLE_TO_MOUNT_ROOT_FILESYSTEM]);
mkdir("/harddisk/var", S_IRWXU|S_IRWXG|S_IRWXO);
mkdir("/harddisk/var/log", S_IRWXU|S_IRWXG|S_IRWXO);
- if (raid_disk)
- snprintf(commandstring, STRING_SIZE, "/sbin/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_part);
if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_BOOT_FILESYSTEM]))
{
errorbox(ctr[TR_UNABLE_TO_MOUNT_BOOT_FILESYSTEM]);
goto EXIT;
}
if (swap_file) {
- if (raid_disk)
- snprintf(commandstring, STRING_SIZE, "/bin/swapon %sp2", hdparams.devnode);
- else
- snprintf(commandstring, STRING_SIZE, "/bin/swapon %s2", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/sbin/swapon %s2", hdparams.devnode_part);
if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_SWAP_PARTITION]))
{
errorbox(ctr[TR_UNABLE_TO_MOUNT_SWAP_PARTITION]);
goto EXIT;
}
}
- if (raid_disk)
- snprintf(commandstring, STRING_SIZE, "/sbin/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_part);
if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_LOG_FILESYSTEM]))
{
errorbox(ctr[TR_UNABLE_TO_MOUNT_LOG_FILESYSTEM]);
goto EXIT;
}
-
- snprintf(commandstring, STRING_SIZE, "/bin/tar -C /harddisk -xvjf /cdrom/" SNAME "-" VERSION ".tbz2");
+
+ if (installtype == URL_INSTALL) {
+ snprintf(commandstring, STRING_SIZE,
+ "/bin/wget -q -O - %s/" SNAME "-" VERSION ".tbz2 | /bin/tar -C /harddisk -xvjf -", url);
+ }
+
+ if (installtype == CDROM_INSTALL) {
+ snprintf(commandstring, STRING_SIZE,
+ "/bin/tar -C /harddisk -xvjf /cdrom/" SNAME "-" VERSION ".tbz2");
+ }
if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT,
ctr[TR_INSTALLING_FILES]))
/* Save USB controller type to modules.conf */
write_usb_modules_conf();
+
+ /* Save language und local settings */
+ write_lang_configs(shortlangname);
/* touch the modules.dep files */
snprintf(commandstring, STRING_SIZE,
- "/bin/chroot /harddisk /usr/bin/touch /lib/modules/%s/modules.dep",
+ "/bin/touch /harddisk/lib/modules/%s-ipfire/modules.dep",
KERNEL_VERSION);
mysystem(commandstring);
snprintf(commandstring, STRING_SIZE,
- "/bin/chroot /harddisk /usr/bin/touch /lib/modules/%s-smp/modules.dep",
+ "/bin/touch /harddisk/lib/modules/%s-ipfire-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]);
- goto EXIT;
- }
-
/* mount proc filesystem */
mysystem("mkdir /harddisk/proc");
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");
- if ((handle = fopen("/cntrldriver", "r")))
+ /* Build cache lang file */
+ 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]);
+ goto EXIT;
+ }
+
+ /* Update /etc/fstab */
+ replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode_part_run);
+
+ /* if we detected SCSI/USB then fixup */
+/* mysystem("/bin/probecntrl.sh");
+ if ((handle = fopen("/tmp/cntrldriver", "r")))
{
char *driver;
- fgets(line, STRING_SIZE-1, handle);
- fclose(handle);
+ fgets(line, STRING_SIZE-1, handle);
+ fclose(handle);
line[strlen(line) - 1] = 0;
driver = strtok(line, ".");
- 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");
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 %s --with=sd_mod --with=sr_mod /boot/ipfirerd.img %s-ipfire", 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 %s --with=sd_mod --with=sr_mod /boot/ipfirerd-smp.img %s-ipfire-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\"");
- if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_LANG_CACHE]))
- {
- errorbox(ctr[TR_UNABLE_TO_INSTALL_LANG_CACHE]);
- goto EXIT;
- }
-
- if (raid_disk)
- sprintf(string, "root=%sp3", hdparams.devnode);
- else
- sprintf(string, "root=%s3", hdparams.devnode);
+ sprintf(string, "root=%s3", hdparams.devnode_part_run);
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_disk);
- 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;
mysystem("/bin/installbootsplash.sh");
mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
- mysystem("umount /harddisk/proc");
- mysystem("umount /harddisk/dev");
+// 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, NAME);
+ newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message);
+ }
allok = 1;
EXIT:
fprintf(flog, "Install program ended.\n");
- fflush(flog);
- fclose(flog);
+
+
if (!(allok))
newtWinMessage(title, ctr[TR_OK], ctr[TR_PRESS_OK_TO_REBOOT]);
- newtFinished();
-
freekeyvalues(ethernetkv);
if (allok && !allok_fastexit)
{
/* /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"))
- 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"))
- printf("Unable to umount /harddisk/proc.\n");
- }
+// if (system("/bin/mount proc -t proc /harddisk/proc"))
+// printf("Unable to mount proc in /harddisk.");
+// else
+// {
+ if (unattended) {
+ fprintf(flog, "Entering unattended setup\n");
+ if (unattended_setup(unattendedkv)) {
+ snprintf(commandstring, STRING_SIZE, "/bin/sleep 10");
+ runcommandwithstatus(commandstring, "Unattended installation finished, system will reboot");
+ } else {
+ errorbox("Unattended setup failed.");
+ goto EXIT;
+ }
+ }
+
+ fflush(flog);
+ fclose(flog);
+ newtFinished();
+
+ if (!unattended) {
+ // Copy our scanned nics to the disk and lock because scan doesn't work in chroot
+ system("touch /harddisk/var/ipfire/ethernet/scan_lock");
+ system("cp -f /tmp/scanned_nics /harddisk/var/ipfire/ethernet/scanned_nics");
+ if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
+ printf("Unable to run setup.\n");
+ system("rm -f /harddisk/var/ipfire/ethernet/scan_lock");
+ }
+
+ if (system("/bin/umount /harddisk/proc"))
+ printf("Unable to umount /harddisk/proc.\n");
+// }
+ } else {
+ fflush(flog);
+ fclose(flog);
+ newtFinished();
}
fcloseall();
- system("/bin/swapoff /harddisk/swapfile");
- system("/sbin/umount /harddisk/var");
- system("/sbin/umount /harddisk/boot");
- system("/sbin/umount /harddisk");
+ if (swap_file) {
+ snprintf(commandstring, STRING_SIZE, "/bin/swapoff %s2", hdparams.devnode_part);
+ }
+
+ newtFinished();
+
+ system("/bin/umount /harddisk/proc");
+ system("/bin/umount /harddisk/dev");
+
+ system("/bin/umount /harddisk/var");
+ system("/bin/umount /harddisk/boot");
+ system("/bin/umount /harddisk");
system("/etc/halt");
projects / people / teissler / ipfire-2.x.git / blobdiff