diff options
author | obrien <obrien@FreeBSD.org> | 2000-01-18 15:50:23 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2000-01-18 15:50:23 +0000 |
commit | 3005c00a64df52d1c5d631814a99d0c94d7cfee6 (patch) | |
tree | 18769371737ce8d99b03509c9081fd93dee80203 /usr.sbin/sade | |
parent | b6aa8ae2646523b92baa2172c59b27169a90a146 (diff) | |
download | FreeBSD-src-3005c00a64df52d1c5d631814a99d0c94d7cfee6.zip FreeBSD-src-3005c00a64df52d1c5d631814a99d0c94d7cfee6.tar.gz |
* add SVR4 and OSF/1 enabling in the Start Up config menu
* deals with X11 install when all we have is the Port (such as on the Alpha)
Ok'ed by: JKH
Diffstat (limited to 'usr.sbin/sade')
-rw-r--r-- | usr.sbin/sade/Makefile | 3 | ||||
-rw-r--r-- | usr.sbin/sade/install.c | 17 | ||||
-rw-r--r-- | usr.sbin/sade/menus.c | 9 | ||||
-rw-r--r-- | usr.sbin/sade/sade.h | 1 |
4 files changed, 30 insertions, 0 deletions
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile index 00c3be2..83ee350 100644 --- a/usr.sbin/sade/Makefile +++ b/usr.sbin/sade/Makefile @@ -19,6 +19,9 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c dhcp.c kget.c \ CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} CFLAGS+= -I${.CURDIR}/../../sys +.if ${MACHINE_ARCH} != "i386" +CFLAGS+= -DX_AS_PKG +.endif DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO} LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index ec508e1..5f187b7 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -797,6 +797,21 @@ installFixupBin(dialogMenuItem *self) return DITEM_SUCCESS | DITEM_RESTORE; } +#ifdef X_AS_PKG +int +installX11package(dialogMenuItem *self) +{ + WINDOW *w = savescr(); + int i; + + dialog_clear_norefresh(); + msgNotify("Installing XFree86 package..."); + i = package_add("XFree86"); + restorescr(w); + return i; +} +#endif + /* Fix side-effects from the the XFree86 installation */ int installFixupXFree(dialogMenuItem *self) @@ -808,12 +823,14 @@ installFixupXFree(dialogMenuItem *self) vsystem("chmod -R a+r /usr/X11R6"); vsystem("find /usr/X11R6 -type d | xargs chmod a+x"); +#ifndef X_AS_PKG /* Also do bogus minimal package registration so ports don't whine */ if (file_readable("/usr/X11R6/lib/X11/pkgreg.tar.gz")) { dialog_clear_norefresh(); msgNotify("Installing package metainfo.."); vsystem("tar xpzf /usr/X11R6/lib/X11/pkgreg.tar.gz -C / && rm /usr/X11R6/lib/X11/pkgreg.tar.gz"); } +#endif } return DITEM_SUCCESS | DITEM_RESTORE; } diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 47ebafe..55ed712 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -871,7 +871,11 @@ DMenu MenuSubDistributions = { { " local", "Local additions collection", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL}, { " XFree86", "The XFree86 3.3.6 distribution", +#ifdef X_AS_PKG + dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_XF86 }, +#else x11FlagCheck, distSetXF86 }, +#endif { NULL } }, }; @@ -1304,8 +1308,13 @@ DMenu MenuStartup = { #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" }, { " SCO", "This host wants to be able to run IBCS2 binaries.", dmenuVarCheck, dmenuToggleVariable, NULL, "ibcs2_enable=YES" }, +#elif __alpha__ + { " OSF/1", "This host wants to be able to run DEC OSF/1 binaries.", + dmenuVarCheck, dmenuToggleVariable, NULL, "osf1_enable=YES" }, #endif { " quotas", "This host wishes to check quotas on startup.", dmenuVarCheck, dmenuToggleVariable, NULL, "check_quotas=YES" }, diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index 43eeab0..c395785 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.h @@ -568,6 +568,7 @@ extern int installUpgrade(dialogMenuItem *self); extern int installFilesystems(dialogMenuItem *self); extern int installVarDefaults(dialogMenuItem *self); extern void installEnvironment(void); +extern int installX11package(dialogMenuItem *self); extern Boolean copySelf(void); /* kget.c */ |