diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2001-05-24 02:38:02 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2001-05-24 02:38:02 +0000 |
| commit | 057f591a8157d3f7b23976c9cc6646a4ab54b2b4 (patch) | |
| tree | f193cfe414fccda6f95e10a150ef7aa0cb92889a /emulators/linux-vmware-toolbox6 | |
| parent | Update to 1.0. (diff) | |
Update to 2.0.4.1142.
Use mdconfig on 5-CURRENT.
PR: ports/27585
Submitted by: Makoto MATSUSHITA <matusita@jp.FreeBSD.org>,
knu (vn/md compatibility part)
Diffstat (limited to 'emulators/linux-vmware-toolbox6')
| -rw-r--r-- | emulators/linux-vmware-toolbox6/Makefile | 19 | ||||
| -rw-r--r-- | emulators/linux-vmware-toolbox6/distinfo | 2 |
2 files changed, 14 insertions, 7 deletions
diff --git a/emulators/linux-vmware-toolbox6/Makefile b/emulators/linux-vmware-toolbox6/Makefile index 11dba73ae845..0700d94f7652 100644 --- a/emulators/linux-vmware-toolbox6/Makefile +++ b/emulators/linux-vmware-toolbox6/Makefile @@ -26,16 +26,23 @@ RESTRICTED= "Not sure if we can redistribute this." LINUX_FLP?= ${DISTDIR}/linux.flp MOUNT_PT?= ${WRKDIR}/mnt .if exists(${LINUX_FLP}) +.if ${OSVERSION} >= 500018 +DEV_ATTACH= /usr/sbin/mdconfig -a -t vnode -f ${LINUX_FLP} -u ${MOUNT_DEV} +DEV_DETACH= /usr/sbin/mdconfig -d -u ${MOUNT_DEV} +MOUNT_DEV?= md0 +.else +DEV_ATTACH= /usr/sbin/vnconfig -c ${MOUNT_DEV} ${LINUX_FLP} +DEV_DETACH= /usr/sbin/vnconfig -u ${MOUNT_DEV} MOUNT_DEV?= vn0 +.endif .else MOUNT_DEV?= fd0 .endif -VMWARE_VER= 2.0.3 -BUILD_VER= 799 +VMWARE_VER= 2.0.4 +BUILD_VER= 1142 MOUNT= /sbin/mount UMOUNT= /sbin/umount -VNCONFIG= /usr/sbin/vnconfig pre-fetch: @${ECHO} "========================================================================" @@ -57,14 +64,14 @@ do-fetch: -@${UMOUNT} ${MOUNT_PT} 2>&1 >/dev/null -@${UMOUNT} /dev/${MOUNT_DEV} 2>&1 >/dev/null .if exists(${LINUX_FLP}) - -@${VNCONFIG} -u /dev/r${MOUNT_DEV} 2>&1 >/dev/null - ${VNCONFIG} -c /dev/r${MOUNT_DEV} ${LINUX_FLP} + -@${DEV_DETACH} 2>&1 >/dev/null + ${DEV_ATTACH} .endif ${MOUNT} -t msdos -r /dev/${MOUNT_DEV} ${MOUNT_PT} ${CP} ${MOUNT_PT}/${DISTFILES} ${DISTDIR} ${UMOUNT} /dev/${MOUNT_DEV} .if exists(${LINUX_FLP}) - ${VNCONFIG} -u /dev/r${MOUNT_DEV} + ${DEV_DETACH} .endif .endif diff --git a/emulators/linux-vmware-toolbox6/distinfo b/emulators/linux-vmware-toolbox6/distinfo index 8c6ba858c26e..560e5da53c57 100644 --- a/emulators/linux-vmware-toolbox6/distinfo +++ b/emulators/linux-vmware-toolbox6/distinfo @@ -1 +1 @@ -MD5 (vmware-linux-tools.tar.gz) = 65c4d975383fbcdbb6f92cbec6d59728 +MD5 (vmware-linux-tools.tar.gz) = f8b5dc7df50b19ea4a26c1c3e8b1f676 |