Date: Sun, 14 Dec 2008 06:40:04 +0000 (UTC) From: Ken Smith <kensmith@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r186075 - head/usr.sbin/sysinstall Message-ID: <200812140640.mBE6e4kA051604@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kensmith Date: Sun Dec 14 06:40:04 2008 New Revision: 186075 URL: http://svn.freebsd.org/changeset/base/186075 Log: Clean out the remaining alpha-isms. Modified: head/usr.sbin/sysinstall/cdrom.c head/usr.sbin/sysinstall/label.c head/usr.sbin/sysinstall/main.c head/usr.sbin/sysinstall/sysinstall.8 head/usr.sbin/sysinstall/sysinstall.h head/usr.sbin/sysinstall/system.c Modified: head/usr.sbin/sysinstall/cdrom.c ============================================================================== --- head/usr.sbin/sysinstall/cdrom.c Sun Dec 14 02:59:07 2008 (r186074) +++ head/usr.sbin/sysinstall/cdrom.c Sun Dec 14 06:40:04 2008 (r186075) @@ -164,9 +164,7 @@ mediaInitCDROM(Device *dev) } if ((cp = property_find(cd_attr, "CD_MACHINE_ARCH")) != NULL) { if (strcmp(cp, "any") && -#ifdef __alpha__ - strcmp(cp, "alpha")) { -#elif defined(PC98) +#if defined(PC98) strcmp(cp, "pc98")) { #elif defined(__sparc64__) strcmp(cp, "sparc64")) { Modified: head/usr.sbin/sysinstall/label.c ============================================================================== --- head/usr.sbin/sysinstall/label.c Sun Dec 14 02:59:07 2008 (r186074) +++ head/usr.sbin/sysinstall/label.c Sun Dec 14 06:40:04 2008 (r186075) @@ -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")) Modified: head/usr.sbin/sysinstall/main.c ============================================================================== --- head/usr.sbin/sysinstall/main.c Sun Dec 14 02:59:07 2008 (r186074) +++ head/usr.sbin/sysinstall/main.c Sun Dec 14 06:40:04 2008 (r186075) @@ -198,7 +198,7 @@ main(int argc, char **argv) choice = scroll = curr = max = 0; dmenuOpen(&MenuInitial, &choice, &scroll, &curr, &max, TRUE); if (getpid() != 1 -#if defined(__alpha__) || defined(__sparc64__) +#if defined(__sparc64__) || !msgNoYes("Are you sure you wish to exit? The system will halt.") #else || !msgNoYes("Are you sure you wish to exit? The system will reboot\n" Modified: head/usr.sbin/sysinstall/sysinstall.8 ============================================================================== --- head/usr.sbin/sysinstall/sysinstall.8 Sun Dec 14 02:59:07 2008 (r186074) +++ head/usr.sbin/sysinstall/sysinstall.8 Sun Dec 14 06:40:04 2008 (r186075) @@ -878,9 +878,9 @@ This property is normally only used with .Fx products that contain CDs for different architectures, to provide better error messages if -users try to install Alpha packages on an i386 machine. +users try to install packages built for the wrong architecture. For example, -.Dq Li "CD_MACHINE_ARCH = alpha" . +.Dq Li "CD_MACHINE_ARCH = amd64" . .It Va CD_VOLUME In a multi-volume collection (such as the .Fx Modified: head/usr.sbin/sysinstall/sysinstall.h ============================================================================== --- head/usr.sbin/sysinstall/sysinstall.h Sun Dec 14 02:59:07 2008 (r186074) +++ head/usr.sbin/sysinstall/sysinstall.h Sun Dec 14 06:40:04 2008 (r186075) @@ -52,7 +52,7 @@ /*** Defines ***/ -#if defined(__i386__) || defined(__alpha__) || defined(__amd64__) +#if defined(__i386__) || defined(__amd64__) #define WITH_SYSCONS #define WITH_MICE #endif Modified: head/usr.sbin/sysinstall/system.c ============================================================================== --- head/usr.sbin/sysinstall/system.c Sun Dec 14 02:59:07 2008 (r186074) +++ head/usr.sbin/sysinstall/system.c Sun Dec 14 06:40:04 2008 (r186075) @@ -190,10 +190,6 @@ systemInitialize(int argc, char **argv) setenv("PATH", "/stand:/bin:/sbin:/usr/sbin:/usr/bin:/mnt/bin:/mnt/sbin:/mnt/usr/sbin:/mnt/usr/bin:/usr/X11R6/bin", 1); setbuf(stdin, 0); setbuf(stderr, 0); -#ifdef __alpha__ - i = 0; - sysctlbyname("machdep.unaligned_print", NULL, 0, &i, sizeof(i)); -#endif #if 0 signal(SIGCHLD, reap_children); #endif @@ -261,7 +257,7 @@ systemShutdown(int status) if (RunningAsInit) { /* Put the console back */ ioctl(0, VT_ACTIVATE, 2); -#if defined(__alpha__) || defined(__sparc64__) +#if defined(__sparc64__) reboot(RB_HALT); #else reboot(RB_AUTOBOOT);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812140640.mBE6e4kA051604>