diff options
| author | jhb <jhb@FreeBSD.org> | 2002-12-03 19:36:12 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2002-12-03 19:36:12 +0000 |
| commit | 9a29be5ff2dcaa6e17b0d0239444f3f15301a4eb (patch) | |
| tree | 539398ba84ba1ef5d533460ada8d149aeb3b330b | |
| parent | ea268a7016db23d1e0fa7017ef98351925280ce7 (diff) | |
| download | FreeBSD-src-9a29be5ff2dcaa6e17b0d0239444f3f15301a4eb.zip FreeBSD-src-9a29be5ff2dcaa6e17b0d0239444f3f15301a4eb.tar.gz | |
Rename installX11package() to installPackage() and tweak it so that it
can be used to install any arbitrary package.
Approved by: re
| -rw-r--r-- | usr.sbin/sade/install.c | 8 | ||||
| -rw-r--r-- | usr.sbin/sade/sade.h | 2 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 8 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/sysinstall.h | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index b9fe9b2..9862e56 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -842,20 +842,18 @@ installFixupBin(dialogMenuItem *self) return DITEM_SUCCESS | DITEM_RESTORE; } -#ifdef X_AS_PKG int -installX11package(dialogMenuItem *self) +installPackage(dialogMenuItem *self, char *desc, char *package) { WINDOW *w = savescr(); int i; dialog_clear_norefresh(); - msgNotify("Installing XFree86 package..."); - i = package_add("XFree86-4"); + msgNotify("Installing %s package...", desc); + i = package_add(package); restorescr(w); return i; } -#endif /* Fix side-effects from the the XFree86 installation */ int diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index 81fdd35..1a0e20a 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.h @@ -642,7 +642,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 int installPackage(dialogMenuItem *self, char *package, char *desc); extern Boolean copySelf(void); /* kget.c */ diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index b9fe9b2..9862e56 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -842,20 +842,18 @@ installFixupBin(dialogMenuItem *self) return DITEM_SUCCESS | DITEM_RESTORE; } -#ifdef X_AS_PKG int -installX11package(dialogMenuItem *self) +installPackage(dialogMenuItem *self, char *desc, char *package) { WINDOW *w = savescr(); int i; dialog_clear_norefresh(); - msgNotify("Installing XFree86 package..."); - i = package_add("XFree86-4"); + msgNotify("Installing %s package...", desc); + i = package_add(package); restorescr(w); return i; } -#endif /* Fix side-effects from the the XFree86 installation */ int diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index 81fdd35..1a0e20a 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -642,7 +642,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 int installPackage(dialogMenuItem *self, char *package, char *desc); extern Boolean copySelf(void); /* kget.c */ |
