diff options
| author | obrien <obrien@FreeBSD.org> | 2002-10-11 22:30:09 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2002-10-11 22:30:09 +0000 |
| commit | c48c3e3e1c8e962ff7bd7da96280a1a2d071282e (patch) | |
| tree | e0595bfb73138d57a8ad33f40655209e07fd7996 /usr.sbin/sade/install.c | |
| parent | edc920d80d67ec9fe56566b02c06a40770fa5303 (diff) | |
| download | FreeBSD-src-c48c3e3e1c8e962ff7bd7da96280a1a2d071282e.zip FreeBSD-src-c48c3e3e1c8e962ff7bd7da96280a1a2d071282e.tar.gz | |
* Negative #if's are harder to read as they don't tell exactly what arch
something applies to. So change #ifndef to an explicit list of defines.
* Treate sparc64 and ia64 as 64-bit platforms, which means larger roots.
* sparc64 should halt back to the firmware, not reset.
* sparc64 doesn't need to play MS-DOS/BIOS partition crap games.
Reviewed by: jake
Diffstat (limited to 'usr.sbin/sade/install.c')
| -rw-r--r-- | usr.sbin/sade/install.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 9ab38a4..8cfc955 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -518,7 +518,7 @@ installExpress(dialogMenuItem *self) dialog_clear_norefresh(); variable_set2(SYSTEM_STATE, "express", 0); -#ifndef __alpha__ +#if defined(__i386__) || defined(__ia64__) if (DITEM_STATUS((i = diskPartitionEditor(self))) == DITEM_FAILURE) return i; #endif @@ -546,7 +546,7 @@ installStandard(dialogMenuItem *self) variable_set2(SYSTEM_STATE, "standard", 0); dialog_clear_norefresh(); -#ifndef __alpha__ +#if defined(__i386__) || defined(__ia64__) msgConfirm("In the next menu, you will need to set up a DOS-style (\"fdisk\") partitioning\n" "scheme for your hard disk. If you simply wish to devote all disk space\n" "to FreeBSD (overwriting anything else that might be on the disk(s) selected)\n" @@ -566,16 +566,16 @@ nodisks: } #endif -#ifdef __alpha__ - msgConfirm("Now you need to create BSD partitions on the disk which you are\n" - "installing to. If you have a reasonable amount of disk space (200MB or more)\n" +#if defined(__i386__) || defined(__ia64__) + msgConfirm("Now you need to create BSD partitions inside of the fdisk partition(s)\n" + "just created. If you have a reasonable amount of disk space (200MB or more)\n" "and don't have any special requirements, simply use the (A)uto command to\n" "allocate space automatically. If you have more specific needs or just don't\n" "care for the layout chosen by (A)uto, press F1 for more information on\n" "manual layout."); #else - msgConfirm("Now you need to create BSD partitions inside of the fdisk partition(s)\n" - "just created. If you have a reasonable amount of disk space (200MB or more)\n" + msgConfirm("Now you need to create BSD partitions on the disk which you are\n" + "installing to. If you have a reasonable amount of disk space (200MB or more)\n" "and don't have any special requirements, simply use the (A)uto command to\n" "allocate space automatically. If you have more specific needs or just don't\n" "care for the layout chosen by (A)uto, press F1 for more information on\n" |
