diff options
| author | Alexander von Gernler <grunk@cvs.openbsd.org> | 2007-05-26 21:39:47 +0000 |
|---|---|---|
| committer | Alexander von Gernler <grunk@cvs.openbsd.org> | 2007-05-26 21:39:47 +0000 |
| commit | 9f65466b6f504723ac103132c13c720f68a407e4 (patch) | |
| tree | 9ac2fb15b0656179bd3605842ed67e8b397cfee9 /sbin | |
| parent | afb4101e1eb4bee57c262077106449b8c41436f9 (diff) | |
link mount_vnd to the build, and remove usr.sbin/vnconfig, which is now
completely contained at the new place. provide a legacy link to /usr/sbin
to go away after next release.
ok deraadt@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/Makefile | 4 | ||||
| -rw-r--r-- | sbin/mount_vnd/Makefile | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sbin/Makefile b/sbin/Makefile index b42b8588dd1..f207c62757c 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.82 2007/05/18 16:08:12 deraadt Exp $ +# $OpenBSD: Makefile,v 1.83 2007/05/26 21:39:45 grunk Exp $ SUBDIR= atactl badsect bioctl brconfig ccdconfig clri dhclient \ disklabel dmesg dump dumpfs fdisk fsck fsck_ext2fs fsck_ffs \ @@ -6,7 +6,7 @@ SUBDIR= atactl badsect bioctl brconfig ccdconfig clri dhclient \ isakmpd kbd lmccontrol mknod modload modunload mount \ mount_ados mount_cd9660 mount_ext2fs mount_ffs mount_msdos \ mount_nfs mount_ntfs mount_portal mount_procfs mount_udf \ - mount_xfs mountd ncheck_ffs newfs newfs_msdos \ + mount_vnd mount_xfs mountd ncheck_ffs newfs newfs_msdos \ nfsd nmeaattach nologin pdisk pfctl pflogd ping ping6 quotacheck \ raidctl reboot restore route routed rtsol savecore scan_ffs \ scsi shutdown slattach swapctl sysctl ttyflags tunefs \ diff --git a/sbin/mount_vnd/Makefile b/sbin/mount_vnd/Makefile index 6b869d77050..071a2560dac 100644 --- a/sbin/mount_vnd/Makefile +++ b/sbin/mount_vnd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2007/05/26 03:37:45 grunk Exp $ +# $OpenBSD: Makefile,v 1.3 2007/05/26 21:39:45 grunk Exp $ PROG= mount_vnd SRCS= mount_vnd.c pkcs5_pbkdf2.c @@ -8,6 +8,10 @@ DPADD= ${LIBUTIL} LINKS= ${BINDIR}/mount_vnd ${BINDIR}/vnconfig MLINKS= mount_vnd.8 vnconfig.8 +# XXX compatibility +afterinstall: + (cd ${DESTDIR}/usr/sbin && ln -sf ../../sbin/vnconfig .) + MAN= mount_vnd.8 .include <bsd.prog.mk> |