}
}
- // Load ata-piix prior kudzu because kudzu use ata-generic for ich7
- mysystem("/sbin/modprobe ata_piix");
-
- // Starting hardware detection
- runcommandwithstatus("/bin/probehw.sh", "Probing Hardware ...");
-
// Load common modules
- mysystem("/sbin/modprobe ide-generic");
- mysystem("/sbin/modprobe ide-cd");
- mysystem("/sbin/modprobe ide-disk");
- mysystem("/sbin/modprobe ehci-hcd");
- mysystem("/sbin/modprobe uhci-hcd");
- mysystem("/sbin/modprobe ohci-hcd");
- mysystem("/sbin/modprobe ohci1394");
- mysystem("/sbin/modprobe sd_mod");
- mysystem("/sbin/modprobe sr_mod");
- mysystem("/sbin/modprobe usb-storage");
- mysystem("/sbin/modprobe usbhid");
- mysystem("/sbin/modprobe ahci");
-
mysystem("/sbin/modprobe iso9660"); // CDROM
mysystem("/sbin/modprobe ext2"); // Boot patition
mysystem("/sbin/modprobe vfat"); // USB key
-
- runcommandwithstatus("/bin/sleep 10", "Waiting for USB Hardware ...");
/* German is the default */
for (choice = 0; langnames[choice]; choice++)
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);
* the disk.
*/
/* Don't use mysystem here so we can redirect output */
- sprintf(commandstring, "/bin/sfdisk -s /dev/%s > /tmp/disksize 2> /dev/null", harddrive);
+ sprintf(commandstring, "/sbin/sfdisk -s /dev/%s > /tmp/disksize 2> /dev/null", harddrive);
system(commandstring);
/* Calculate amount of disk space */
fclose(handle);
- snprintf(commandstring, STRING_SIZE, "/bin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode_disk);
+ snprintf(commandstring, STRING_SIZE, "/sbin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode_disk);
if (runcommandwithstatus(commandstring, ctr[TR_PARTITIONING_DISK]))
{
errorbox(ctr[TR_UNABLE_TO_PARTITION]);
if (fstype == EXT2) {
mysystem("/sbin/modprobe ext2");
- sprintf(mkfscommand, "/sbin/mke2fs -T ext2 -c");
+ 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");
- sprintf(mkfscommand, "/sbin/mke2fs -T ext3 -c");
+ sprintf(mkfscommand, "/sbin/mke2fs -T ext3");
}
- snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -c %s1", hdparams.devnode_part);
+ snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -I 128 %s1", hdparams.devnode_part);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_BOOT_FILESYSTEM]))
{
errorbox(ctr[TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM]);
}
snprintf(commandstring, STRING_SIZE,
- "/bin/tar -C /harddisk -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma");
+ "/bin/tar -C /harddisk -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma 2>/dev/null");
if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT,
ctr[TR_INSTALLING_FILES]))
/* Save language und local settings */
write_lang_configs(shortlangname);
- /* touch the modules.dep files */
- snprintf(commandstring, STRING_SIZE,
- "/bin/touch /harddisk/lib/modules/%s-ipfire/modules.dep",
- KERNEL_VERSION);
- mysystem(commandstring);
-/* snprintf(commandstring, STRING_SIZE,
- "/bin/touch /harddisk/lib/modules/%s-ipfire-smp/modules.dep",
- KERNEL_VERSION);
- mysystem(commandstring);
-*/
-
/* Rename uname */
rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
mysystem("/bin/mount --bind /sys /harddisk/sys");
/* Build cache lang file */
- snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
+ snprintf(commandstring, STRING_SIZE, "/usr/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]);
}
/* Update /etc/fstab */
- replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode_part_run);
-
+ snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE1#UUID=$(/sbin/blkid %s1 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+ system(commandstring);
+ snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE2#UUID=$(/sbin/blkid %s2 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+ system(commandstring);
+ snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE3#UUID=$(/sbin/blkid %s3 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+ system(commandstring);
+ snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE4#UUID=$(/sbin/blkid %s4 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+ system(commandstring);
+
if (fstype == EXT2) {
replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs");
replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
} else if (fstype == EXT3) {
- snprintf(commandstring, STRING_SIZE, "tune2fs -j %s3", hdparams.devnode_part);
- if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
- {
- errorbox(ctr[TR_JOURNAL_ERROR]);
- replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
- goto NOJOURNAL;
- }
- snprintf(commandstring, STRING_SIZE, "tune2fs -j %s4", hdparams.devnode_part);
- if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
- {
- errorbox(ctr[TR_JOURNAL_ERROR]);
- replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
- goto NOJOURNAL;
- }
replace("/harddisk/etc/fstab", "FSTYPE", "ext3");
NOJOURNAL:
replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
replace("/harddisk/boot/grub/grub.conf", "KVER", KERNEL_VERSION);
- /* Going to make our initrd... */
- snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/local/bin/rebuild-initrd");
- runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
+ snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#root=ROOT#root=UUID=$(/sbin/blkid %s3 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/boot/grub/grub.conf", hdparams.devnode_part);
+ system(commandstring);
- sprintf(string, "root=%s3", hdparams.devnode_part_run);
- replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
- system("sed -e 's#/harddisk#/#g' -e 's#//#/#g' < /proc/mounts > /harddisk/etc/mtab");
+ system("/bin/sed -e 's#/harddisk#/#g' -e 's#//#/#g' < /proc/mounts > /harddisk/etc/mtab");
snprintf(commandstring, STRING_SIZE,
- "/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);
+ "/usr/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);
if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_GRUB])) {
errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]);
goto EXIT;
}
mysystem("umount /cdrom");
- snprintf(commandstring, STRING_SIZE, "eject /dev/%s", sourcedrive);
+ snprintf(commandstring, STRING_SIZE, "/usr/bin/eject /dev/%s", sourcedrive);
mysystem(commandstring);
if (!unattended) {
fclose(flog);
newtFinished();
- if (!unattended) {
- if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
- printf("Unable to run setup.\n");
- }
+// if (!unattended) {
+// if (system("/usr/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
+// printf("Unable to run setup.\n");
+// }
if (system("/bin/umount /harddisk/proc"))
printf("Unable to umount /harddisk/proc.\n");
system("/bin/umount /harddisk/var");
system("/bin/umount /harddisk/boot");
system("/bin/umount /harddisk");
-
- system("/etc/halt");
+
+ if (!(allok))
+ system("/etc/halt");
return 0;
}
projects / people / pmueller / ipfire-2.x.git / blobdiff