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/menus.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/menus.c')
-rw-r--r-- | usr.sbin/sade/menus.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 6bd7d9f..7b5bd15 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -1182,7 +1182,7 @@ DMenu MenuInstallCustom = { "INSTALL", { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { "2 Options", "View/Set various installation options", NULL, optionsEditor }, -#ifdef __alpha__ +#if defined(__alpha__) || defined(__sparc64__) { "3 Label", "Label disk partitions", NULL, diskLabelEditor }, { "4 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions }, { "5 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia }, @@ -1320,14 +1320,17 @@ DMenu MenuStartup = { dmenuVarCheck, dmenuToggleVariable, NULL, "accounting_enable=YES" }, { " lpd", "This host has a printer and wants to run lpd.", dmenuVarCheck, dmenuToggleVariable, NULL, "lpd_enable=YES" }, -#ifdef __i386__ { " linux", "This host wants to be able to run linux binaries.", dmenuVarCheck, configLinux, NULL, VAR_LINUX_ENABLE "=YES" }, - { " SVR4", "This host wants to be able to run SVR4 binaries.", - dmenuVarCheck, dmenuToggleVariable, NULL, "svr4_enable=YES" }, +#ifdef __i386__ { " SCO", "This host wants to be able to run IBCS2 binaries.", dmenuVarCheck, dmenuToggleVariable, NULL, "ibcs2_enable=YES" }, -#elif __alpha__ +#endif +#if defined(__i386__) || defined(__sparc64__) + { " SVR4", "This host wants to be able to run SVR4 binaries.", + dmenuVarCheck, dmenuToggleVariable, NULL, "svr4_enable=YES" }, +#endif +#ifdef __alpha__ { " OSF/1", "This host wants to be able to run DEC OSF/1 binaries.", dmenuVarCheck, dmenuToggleVariable, NULL, "osf1_enable=YES" }, #endif |