From b2e08638f38cfca2c912c945e5aed15c28ea4976 Mon Sep 17 00:00:00 2001 From: neil Date: Sat, 11 Nov 2006 00:13:52 +0000 Subject: [PATCH] The installer used to get the device name to partition by looking at expansion.library's boot nodes. This somehow seemed to work for blank drives, but it didn't work for drives with existing non-AROS partitions. It's now hard coded to ata.device. Also removed some redundant code, fixed a typo and enabled debugging messages. git-svn-id: https://svn.aros.org:8080/svn/aros/trunk/AROS@24958 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/tools/InstallAROS/install.h | 2 +- workbench/tools/InstallAROS/main.c | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/workbench/tools/InstallAROS/install.h b/workbench/tools/InstallAROS/install.h index 8b9487370..8b7684f6f 100644 --- a/workbench/tools/InstallAROS/install.h +++ b/workbench/tools/InstallAROS/install.h @@ -8,7 +8,7 @@ MUIX_L " " MUIX_B"\nWelcome to the Amiga Research OS\n" "the " MUIX_B "pre-alpha" MUIX_N " version of AROS\n" "onto your computer system.\n\n" "Since it is still in pre-alpha state, performance\n" -"may be sluggish - and stabilty isn't guaranteed\n\n"; +"may be sluggish - and stability isn't guaranteed\n\n"; static const char* KMsgPartitionDH0 = "You do not have a DH0: partition.\n" diff --git a/workbench/tools/InstallAROS/main.c b/workbench/tools/InstallAROS/main.c index 8cd03286f..e1417fa03 100644 --- a/workbench/tools/InstallAROS/main.c +++ b/workbench/tools/InstallAROS/main.c @@ -6,7 +6,7 @@ #define INTUITION_NO_INLINE_STDARG #define USE_FORMAT64 -#define DEBUG 0 +#define DEBUG 1 #include #include @@ -88,15 +88,13 @@ struct ExpansionBase *ExpansionBase = NULL; -char *firstfound_path=NULL; - char *source_Path=NULL; /* full path to source "tree" */ char *source_Name=NULL; char *dest_Path=NULL; /* VOLUME NAME of part used to store "aros" */ char *work_Path=NULL; /* VOLUME NAME of part used to store "work" */ -char *boot_Device=NULL; +char *boot_Device="ata.device"; ULONG boot_Unit = 0; Object* check_copytowork = NULL; @@ -365,7 +363,7 @@ BOOL myCheckFloppy( struct DosEnvec *DriveEnv ) return FALSE; } -/* returns the first "AROS" supported filesystems name */ +/* Returns the first AROS-supported filesystem's name */ char *FindPartition(struct PartitionHandle *root) { struct PartitionHandle *partition = NULL; @@ -466,11 +464,6 @@ IPTR Install__MUIM_FindDrives CloseRootPartition(root); } } - if (result != NULL) - { - firstfound_path = result; - break; - } } return result; -- 2.11.4.GIT