cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
todd 2008-12-10 23:30:33 +00:00
parent cb8395549b
commit f76e29a76b
4 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emulators/qemu/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.37 2008/09/22 15:17:54 mpf Exp $
# $OpenBSD: Makefile,v 1.38 2008/12/10 23:30:33 todd Exp $
# no success building on other archs yet
ONLY_FOR_ARCHS= amd64 i386 powerpc
@ -6,7 +6,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc
COMMENT= multi system emulator
DISTNAME= qemu-0.9.1
PKGNAME= ${DISTNAME}p4
PKGNAME= ${DISTNAME}p5
CATEGORIES= emulators
HOMEPAGE= http://bellard.org/qemu/
@ -49,7 +49,7 @@ WANTLIB+= pthread
.endif
pre-configure:
@perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g;" ${WRKSRC}/vl.c ${WRKSRC}/qemu-doc.texi
@${SUBST_CMD} ${WRKSRC}/vl.c ${WRKSRc}/qemu-doc.texi
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qemu
@ -57,5 +57,6 @@ post-install:
@${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown ${PREFIX}/share/examples/qemu
@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/qemu
@${INSTALL_SCRIPT} ${FILESDIR}/README.OpenBSD ${PREFIX}/share/doc/qemu
@${SUBST_CMD} ${PREFIX}/share/doc/qemu/README.OpenBSD
.include <bsd.port.mk>

41
emulators/qemu/files/README.OpenBSD
View File

@ -19,7 +19,7 @@ README for OpenBSD users
By default, qemu sets up the equivalent of the following networking:
-net nic,vlan=0,model=ne2k_pci,macaddr=52:54:00:12:34:56
-net nic,vlan=0,model=rtl8139,macaddr=52:54:00:12:34:56
-net user,vlan=0
Also, inside this virtual usermode network, it uses the 10.0.2.0/24 and
@ -34,9 +34,6 @@ README for OpenBSD users
makes userland network calls for tcp/udp operations. icmp and other things
are not possible in this mode.
It is recommended to use this if at all possible, because other options
involve running qemu as root.
Note: If you use one '-net' cmdline argument, qemu assumes you know what you
want and clears defaults for the rest of the -net defaults.
@ -48,11 +45,35 @@ README for OpenBSD users
2. tap mode
Sometimes it is desirable to configure qemu to access a network via layer2
directly. This has the side effect that currently it requires root
privileges to open and configure /dev/tunN. There is no way to drop from
root privileges at this point.
directly. One way of doing this without having to run qemu as root is to
let root open /dev/tunN and pass the file descriptor to qemu. The tun(4)
interface should preferrably be configured before starting qemu:
%SYSCONFDIR%/qemu-ifup contains some default settings that permit one to do
$ sudo ifconfig tun0 192.168.0.254 link0
The interface can also be configured as part of a bridge(4), in which case
the ip address can be omitted:
$ sudo ifconfig tun0 link0
$ sudo ifconfig bridge0 create
$ sudo brconfig bridge0 add tun0 add em0 up
The tunnel and bridge interfaces can also be configured at system startup by
editing ${SYSCONFDIR}/hostname.tunN and ${SYSCONFDIR}/bridgename.bridgeN,
respectively (see hostname.if(5)).
After configuring the virtual network we can use sudo to let root open the
tunnel device and then use sudo again to drop privileges and start qemu:
$ sudo sh -c "sudo -u $USER qemu -nographic -net nic -net tap,fd=3 \
virtual.hd 3<>/dev/tun0"
An alternative to the procedure described above is to have qemu set up the
network via ${SYSCONFDIR}/qemu-ifup. This is not recommended however, since
you would have to run qemu as root, and there is no way to drop from root
privileges at this point.
${SYSCONFDIR}/qemu-ifup contains some default settings that permit one to do
the following:
# qemu -net nic -net tap virtual.hd
@ -155,13 +176,13 @@ README for OpenBSD users
is a complete example that may be cut-and-pasted into rc.local:
hddir=/var/vm
if [ -x /usr/local/bin/qemu ]; then
if [ -x ${TRUEPREFIX}/bin/qemu ]; then
echo -n 'Qemu: vmi386'
(
export ETHER=trunk101
export BRIDGE=bridge101
/usr/local/bin/qemu \
${TRUEPREFIX}/bin/qemu \
-daemonize \
-nographic \
-net nic,vlan=0,model=rtl8139,macaddr=52:54:00:4e:62:8f \

4
emulators/qemu/patches/patch-qemu-doc_texi
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-qemu-doc_texi,v 1.4 2008/06/19 05:51:17 todd Exp $
$OpenBSD: patch-qemu-doc_texi,v 1.5 2008/12/10 23:30:33 todd Exp $
--- qemu-doc.texi.orig Sun Jan 6 13:38:42 2008
+++ qemu-doc.texi Tue Jun 17 19:48:00 2008
@@ -632,7 +632,7 @@ or @file{C:\WINNT\SYSTEM32\DRIVERS\ETC\LMHOSTS} (Windo
@ -6,7 +6,7 @@ $OpenBSD: patch-qemu-doc_texi,v 1.4 2008/06/19 05:51:17 todd Exp $
Note that a SAMBA server must be installed on the host OS in
-@file{/usr/sbin/smbd}. QEMU was tested successfully with smbd version
+@file{!!LOCALBASE!!/libexec/smbd}. QEMU was tested successfully with smbd version
+@file{${LOCALBASE}/libexec/smbd}. QEMU was tested successfully with smbd version
2.2.7a from the Red Hat 9 and version 3.0.10-1.fc3 from Fedora Core 3.
@item -redir [tcp|udp]:@var{host-port}:[@var{guest-host}]:@var{guest-port}

4
emulators/qemu/patches/patch-vl_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-vl_c,v 1.19 2008/09/22 15:17:54 mpf Exp $
$OpenBSD: patch-vl_c,v 1.20 2008/12/10 23:30:33 todd Exp $
--- vl.c.orig Sun Jan 6 13:38:42 2008
+++ vl.c Tue Jun 17 19:48:00 2008
@@ -61,7 +61,8 @@
@ -16,7 +16,7 @@ $OpenBSD: patch-vl_c,v 1.19 2008/09/22 15:17:54 mpf Exp $
#define SMBD_COMMAND "/usr/sfw/sbin/smbd"
#else
-#define SMBD_COMMAND "/usr/sbin/smbd"
+#define SMBD_COMMAND "!!LOCALBASE!!/libexec/smbd"
+#define SMBD_COMMAND "${LOCALBASE}/libexec/smbd"
#endif
//#define DEBUG_UNUSED_IOPORT