diff options
| author | kensmith <kensmith@FreeBSD.org> | 2007-12-17 23:22:58 +0000 |
|---|---|---|
| committer | kensmith <kensmith@FreeBSD.org> | 2007-12-17 23:22:58 +0000 |
| commit | 689ad394ea97e0ed441a03367cead5d7f0232947 (patch) | |
| tree | 444e14b917cc28434bf528a8edc1aced2b88040d /usr.sbin | |
| parent | d7ca70a3f746e08acee8a9f25f69f41290ff3f99 (diff) | |
| download | FreeBSD-src-689ad394ea97e0ed441a03367cead5d7f0232947.zip FreeBSD-src-689ad394ea97e0ed441a03367cead5d7f0232947.tar.gz | |
A few more adjustments needed because of changes in xorg. Just installing
xorg-server doesn't include any video drivers so install xorg-drivers as
well. And if font-alias isn't installed the X server won't start,
complaining it can't find the font "fixed".
Insta-MFC coming, this was tested with a RELENG_6_3 release build and
the necessary packages as part of the first round of testing for 6.3-RC2.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sysinstall/dist.c | 2 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/dist.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index 52ccc87..c76d2bc 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -140,6 +140,7 @@ static Distribution XOrgDistTable[] = { DTE_PACKAGE("Xprog", &XOrgDists, XORG_IMAKE, "imake"), DTE_PACKAGE("Xsrv", &XOrgDists, XORG_SERVER, "xorg-server"), + DTE_PACKAGE("Xdrv", &XOrgDists, XORG_DRIVERS, "xorg-drivers"), DTE_PACKAGE("Xnest", &XOrgDists, XORG_NESTSERVER, "xorg-nestserver"), DTE_PACKAGE("Xvfb", &XOrgDists, XORG_VFBSERVER, "xorg-vfbserver"), @@ -149,6 +150,7 @@ static Distribution XOrgDistTable[] = { DTE_PACKAGE("Xfcyr", &XOrgDists, XORG_FONTS_CYR, "xorg-fonts-cyrillic"), DTE_PACKAGE("Xft1", &XOrgDists, XORG_FONTS_T1, "xorg-fonts-type1"), DTE_PACKAGE("Xftt", &XOrgDists, XORG_FONTS_TT, "xorg-fonts-truetype"), + DTE_PACKAGE("Xfali", &XOrgDists, XORG_FONTS_ALIAS, "font-alias"), DTE_END, }; diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h index d9510d0..f8e0f8a 100644 --- a/usr.sbin/sysinstall/dist.h +++ b/usr.sbin/sysinstall/dist.h @@ -54,7 +54,8 @@ #define DIST_XORG_IMAKE 0x000010 #define DIST_XORG_SERVER 0x000100 -#define DIST_XORG_NESTSERVER 0x000200 +#define DIST_XORG_DRIVERS 0x000200 +#define DIST_XORG_NESTSERVER 0x000400 #define DIST_XORG_VFBSERVER 0x000800 #define DIST_XORG_FONTS_MISC 0x010000 @@ -63,6 +64,7 @@ #define DIST_XORG_FONTS_CYR 0x080000 #define DIST_XORG_FONTS_T1 0x100000 #define DIST_XORG_FONTS_TT 0x200000 +#define DIST_XORG_FONTS_ALIAS 0x400000 #define DIST_XORG_MISC_ALL 0x00001f #define DIST_XORG_SERVER_ALL 0x000f00 @@ -79,7 +81,7 @@ #define _DIST_XORG_FONTS_BASE \ (DIST_XORG_FONTS_MISC | DIST_XORG_FONTS_75 | DIST_XORG_FONTS_100 | \ - DIST_XORG_FONTS_TT) + DIST_XORG_FONTS_TT | DIST_XORG_FONTS_ALIAS) #define _DIST_USER \ ( DIST_BASE | DIST_KERNEL | DIST_DOC | DIST_MANPAGES | DIST_DICT ) |
