WebSVN – SvarDOS – Diff – /install/trunk/install.c

 /* returns total disk space of drive drv (in MiB, max 2048), or -1 if drive invalid */
 static int disksize(int drv) {
   long res;
   union REGS r;
   r.h.ah = 0x36; /* DOS 2+ get free disk space */
-  r.h.dl = drv;
+  r.h.dl = drv;  /* A=1, B=2, etc */
   int86(0x21, &r, &r);
   if (r.x.ax == 0xffffu) return(-1); /* AX set to FFFFh if drive invalid */
   res = r.x.ax;  /* sectors per cluster */
   res *= r.x.dx; /* dx contains total clusters, bx contains free clusters */
   res *= r.x.cx; /* bytes per sector */
   int selecteddrive = 3; /* default to 'C:' */
   int cselecteddrive;
   int ds;
   int choice;
   char buff[1024];
+  int driveid = 1; /* fdisk runs on first drive (unless USB boot) */
+  if (selecteddrive == get_cur_drive() + 1) { /* get_cur_drive() returns 0-based values (A=0) while selecteddrive is 1-based (A=1) */
-  if (selecteddrive == get_cur_drive()) selecteddrive = 4; /* use D: if install is run from C: (typically because it was booted from USB?) */
+    selecteddrive = 4; /* use D: if install is run from C: (typically because it was booted from USB?) */
+    driveid = 2; /* primary drive is the emulated USB storage */
+  }
   cselecteddrive = 'A' + selecteddrive - 1;
   for (;;) {
     driveremovable = isdriveremovable(selecteddrive);
     if (driveremovable < 0) {
       char *list[] = { "Create a partition automatically", "Run the FDISK partitioning tool", "Quit to DOS", NULL};
       list[2] = kittengets(0, 2, list[2]);
       snprintf(buff, sizeof(buff), kittengets(3, 0, "ERROR: Drive %c: could not be found. Perhaps your hard disk needs to be partitioned first. Please create at least one partition on your hard disk, so SvarDOS can be installed on it. Note, that SvarDOS requires at least %d MiB of available disk space.\n\nYou can use the FDISK partitioning tool for creating the required partition manually, or you can let the installer partitioning your disk automatically. You can also abort the installation to use any other partition manager of your choice."), cselecteddrive, SVARDOS_DISK_REQ);
       putstringwrap(4, 1, COLOR_BODY[mono], buff);
       switch (menuselect(14, -1, 5, list, -1)) {
         case 0:
-          system("FDISK /AUTO"); /* TODO DRIVE SHOULD BE SPECIFIED FOR MULTI-DRIVE SYSTEMS ! */
+          sprintf(buff, "FDISK /AUTO %d", driveid);
+          system(buff);
           break;
         case 1:
           video_clear(0x0700, 0, 0);
           video_movecursor(0, 0);
-          system("FDISK");  /* TODO DRIVE SHOULD BE SPECIFIED FOR MULTI-DRIVE SYSTEMS ! */
+          sprintf(buff, "FDISK %d", driveid);
+          system(buff);
           break;
         case 2:
           return(MENUQUIT);
         default:
           return(-1);
+      }
       /* write a temporary MBR which only skips the drive (in case BIOS would
        * try to boot off the not-yet-ready C: disk) */
+      sprintf(buff, "FDISK /AMBR %d", driveid);
-      system("FDISK /AMBR"); /* writes BOOT.MBR into actual MBR */  /* TODO DRIVE SHOULD BE SPECIFIED FOR MULTI-DRIVE SYSTEMS ! */
+      system(buff); /* writes BOOT.MBR into actual MBR */
       newscreen(2);
       putstringnls(10, 10, COLOR_BODY[mono], 3, 1, "Your computer will reboot now.");
       putstringnls(12, 10, COLOR_BODY[mono], 0, 5, "Press any key...");
       input_getkey();
       reboot();
     /* check total disk space */
     ds = disksize(selecteddrive);
     if (ds < SVARDOS_DISK_REQ) {
       int y = 9;
       newscreen(2);
-      snprintf(buff, sizeof(buff), kittengets(3, 4, "ERROR: Drive %c: is not big enough! SvarDOS requires a disk of at least %d MiB."), cselecteddrive);
+      snprintf(buff, sizeof(buff), kittengets(3, 4, "ERROR: Drive %c: is not big enough! SvarDOS requires a disk of at least %d MiB."), cselecteddrive, SVARDOS_DISK_REQ);
       y += putstringwrap(y, 1, COLOR_BODY[mono], buff);
       putstringnls(++y, 1, COLOR_BODY[mono], 0, 5, "Press any key...");
       input_getkey();
       return(MENUQUIT);
+    }
       video_putstring(7, -1, COLOR_BODY[mono], buff, -1);
       choice = menuselect(10, -1, 4, list, -1);
       if (choice < 0) return(MENUPREV);
       if (choice == 1) return(MENUQUIT);
       snprintf(buff, sizeof(buff), "SYS %c: %c: > NUL", sourcedrv, cselecteddrive);
+      puts(buff);
+      system(buff);
+      sprintf(buff, "FDISK /MBR %d", driveid);
+      puts(buff);
       system(buff);
-      system("FDISK /MBR"); /* TODO DRIVE SHOULD BE SPECIFIED FOR MULTI-DRIVE SYSTEMS ! */
       snprintf(buff, sizeof(buff), "%c:\\TEMP", cselecteddrive);
+      puts(buff);
       mkdir(buff);
       return(cselecteddrive);
+    }
+  }
+}
   fd = fopen(buff, "wb");
   if (fd == NULL) return;
   fprintf(fd, "DOS=UMB,HIGH\r\n"
               "LASTDRIVE=Z\r\n"
               "FILES=50\r\n");
-  fprintf(fd, "DEVICE=%c:\\SVARDOS\\BIN\\HIMEMX.EXE\r\n", targetdrv);
+  fprintf(fd, "DEVICE=C:\\SVARDOS\\BIN\\HIMEMX.EXE\r\n");
   if (strcmp(locales->lang, "EN") == 0) {
     strcpy(buff, "COMMAND");
   } else {
     snprintf(buff, sizeof(buff), "CMD-%s", locales->lang);
+  }
  WelcomeScreen:
   action = welcomescreen(); /* what svardos is, ask whether to run live dos or install */
   if (action == MENUQUIT) goto Quit;
   if (action == MENUPREV) goto SelectLang;
-  targetdrv = preparedrive(sourcedrv); /* what drive should we install to? check avail. space */
+  targetdrv = preparedrive(sourcedrv); /* what drive should we install from? check avail. space */
   if (targetdrv == MENUQUIT) goto Quit;
   if (targetdrv == MENUPREV) goto WelcomeScreen;
   bootfilesgen(targetdrv, &locales); /* generate boot files and other configurations */
   if (installpackages(targetdrv, sourcedrv, &locales) != 0) goto Quit;    /* install packages */
   /*localcfg();*/ /* show local params (currency, etc), and propose to change them (based on localcfg) */

Subversion Repositories SvarDOS

(root)/install/trunk/install.c @ 1125 – Rev 310 → 312