diff options
author | kensmith <kensmith@FreeBSD.org> | 2008-12-14 06:40:04 +0000 |
---|---|---|
committer | kensmith <kensmith@FreeBSD.org> | 2008-12-14 06:40:04 +0000 |
commit | 3d479167c5e2fbfd86505a5c2aeedda62323cc7d (patch) | |
tree | da6bb977f700119a51d5c4020347bd10a51daeed /usr.sbin/sysinstall/label.c | |
parent | b49ff9470f7dbb22bdaf2559126968d5394d4c9f (diff) | |
download | FreeBSD-src-3d479167c5e2fbfd86505a5c2aeedda62323cc7d.zip FreeBSD-src-3d479167c5e2fbfd86505a5c2aeedda62323cc7d.tar.gz |
Clean out the remaining alpha-isms.
Diffstat (limited to 'usr.sbin/sysinstall/label.c')
-rw-r--r-- | usr.sbin/sysinstall/label.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c index a60c8dc..08690f6 100644 --- a/usr.sbin/sysinstall/label.c +++ b/usr.sbin/sysinstall/label.c @@ -61,7 +61,7 @@ /* * Minimum partition sizes */ -#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__) +#if defined(__ia64__) || defined(__sparc64__) || defined(__amd64__) #define ROOT_MIN_SIZE 128 #else #define ROOT_MIN_SIZE 118 @@ -1094,27 +1094,6 @@ diskLabel(Device *dev) break; } -#ifdef __alpha__ - /* - * SRM requires that the root partition is at the - * begining of the disk and cannot boot otherwise. - * Warn Alpha users if they are about to shoot themselves in - * the foot in this way. - * - * Since partitions may not start precisely at offset 0 we - * check for a "close to 0" instead. :-( - */ - if ((flags & CHUNK_IS_ROOT) && (tmp->offset > 1024)) { - msgConfirm("Your root partition `a' does not seem to be the first\n" - "partition. The Alpha's firmware can only boot from the\n" - "first partition. So it is unlikely that your current\n" - "disk layout will be bootable boot after installation.\n" - "\n" - "Please allocate the root partition before allocating\n" - "any others.\n"); - } -#endif /* alpha */ - tmp->private_data = p; tmp->private_free = safe_free; if (variable_cmp(DISK_LABELLED, "written")) |