diff options
| author | marcel <marcel@FreeBSD.org> | 2008-07-03 20:53:15 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2008-07-03 20:53:15 +0000 |
| commit | 9da015cb79b951a016251984ac4d4b67397b8824 (patch) | |
| tree | 8f1ef2a4969fe044ce30124f7f3267ce1f4a08a5 /sbin/Makefile | |
| parent | ad8d26540646f926989b137116276a9d8c078ada (diff) | |
| download | FreeBSD-src-9da015cb79b951a016251984ac4d4b67397b8824.zip FreeBSD-src-9da015cb79b951a016251984ac4d4b67397b8824.tar.gz | |
Stop building bsdlabel(8) and fdisk(8) on ia64. Both tools are
obsoleted by gpart(8). This avoids the following bugs in fdisk:
- initializing a disk without MBR bogusly emits the error:
fdisk: invalid fdisk partition table found
- initializing a disk with or without MBR bogusly emits either:
fdisk: Class not found
or
fdisk: Geom not found: "XXX"
- the default geometry for non-ATA and non-SCSI disks is either
invalid or sub-optimizal.
Diffstat (limited to 'sbin/Makefile')
| -rw-r--r-- | sbin/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sbin/Makefile b/sbin/Makefile index eafc31f..3d187cf 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -9,7 +9,7 @@ SUBDIR= adjkerntz \ atacontrol \ ${_atm} \ badsect \ - bsdlabel \ + ${_bsdlabel} \ camcontrol \ ccdconfig \ clri \ @@ -113,6 +113,10 @@ _ping6= ping6 _rtsol= rtsol .endif +.if ${MACHINE_ARCH} != "ia64" +_bsdlabel= bsdlabel +.endif + .if ${MACHINE_ARCH} == "i386" .if ${MACHINE} == "i386" _fdisk= fdisk @@ -131,7 +135,6 @@ _fdisk= fdisk .endif .if ${MACHINE_ARCH} == "ia64" -_fdisk= fdisk _mca= mca .endif |
