Changeset 1954 for Whitix/tags

Timestamp:

02/28/09 16:00:16 (3 years ago)

Author:

mwhitworth

Message:

Add extra checks in installer.

Files:

• Whitix/tags/0.2b/user/system/installer/textinstaller.c (modified) (4 diffs)

Whitix/tags/0.2b/user/system/installer/textinstaller.c

@@ -74 +74 @@
                 strcpy(dev, devName);
                 
-        sprintf(drive, "/System/Devices/Storage/%s\n", p);
+        sprintf(drive, "/System/Devices/Storage/%s", p);
         free(driveName);
 
@@ -122 +122 @@
                 return 0;
         }
+        
+        printf("Creating directories\n");
         
         /* Install files! */
@@ -141 +143 @@
         
         int fdDisk = SysOpen(drive, _SYS_FILE_READ | _SYS_FILE_WRITE, 0);
+        
+        if (fdDisk < 0)
+        {
+                printf("Could not open disk to copy over MBR and bootloader. drive = '%s', err = %d\n", drive, fdDisk);
+                return 0;
+        }
+        
         int fd2=SysOpen("/Boot/stage1", _SYS_FILE_READ | _SYS_FILE_FORCE_OPEN, 0);
 
@@ -213 +222 @@
         ModuleCopy("Filesystems/icfs.sys");
         ModuleCopy("Core/ata_ide.sys");
-        ModuleCopy("Core/startup.sys");
         ModuleCopy("Input/Ps2.sys");
         ModuleCopy("Input/keyboard.sys");