Wed Jan 12 18:32:19 2011 UTC ()
Pullup ticket #3323 - requested by jym
sysutils/xentools3: improve NetBSD support
sysutils/xentools33: improve NetBSD support

Revisions pulled up:
- sysutils/xentools3/Makefile			1.23
- sysutils/xentools3/PLIST			1.4
- sysutils/xentools3/files/vif-bridge-nbsd	1.2
- sysutils/xentools3/files/vif-ip-nbsd		1.2
- sysutils/xentools3/files/xen-subr-nbsd	1.1
- sysutils/xentools33/Makefile			1.23
- sysutils/xentools33/PLIST			1.10
- sysutils/xentools33/files/vif-bridge-nbsd	1.2
- sysutils/xentools33/files/vif-ip-nbsd		1.2
- sysutils/xentools33/files/xen-subr-nbsd	1.1
---
Module Name:	pkgsrc
Committed By:	jym
Date:		Wed Jan 12 00:11:20 UTC 2011

Modified Files:
	pkgsrc/sysutils/xentools3: Makefile PLIST
	pkgsrc/sysutils/xentools3/files: vif-bridge-nbsd vif-ip-nbsd
Added Files:
	pkgsrc/sysutils/xentools3/files: xen-subr-nbsd

Log Message:
Add support for "vifname" keys inside XenStore. Its value is the
interface name for the vif, e.g. xvif(4) for dom0, and xennet(4)
for domU.

This allows querying the XenStore for the vif names, rather than
hardcoding their syntax in vif-* scripts.

Add a xen-subr shell script that can contain customized functions, and
include it in the vif-ip/vif-bridge scripts.
Introduce xenstore_read_default that returns the value of a specific
key from XenStore, or the default specified value when key is absent.

Bump revision.

ok bouyer@.

See http://mail-index.netbsd.org/port-xen/2011/01/11/msg006405.html
---
Module Name:	pkgsrc
Committed By:	jym
Date:		Wed Jan 12 00:12:14 UTC 2011

Modified Files:
	pkgsrc/sysutils/xentools33: Makefile PLIST
	pkgsrc/sysutils/xentools33/files: vif-bridge-nbsd vif-ip-nbsd
Added Files:
	pkgsrc/sysutils/xentools33/files: xen-subr-nbsd

Log Message:
Add support for "vifname" keys inside XenStore. Its value is the
interface name for the vif, e.g. xvif(4) for dom0, and xennet(4)
for domU.

This allows querying the XenStore for the vif names, rather than
hardcoding their syntax in vif-* scripts.

Add a xen-subr shell script that can contain customized functions, and
include it in the vif-ip/vif-bridge scripts.
Introduce xenstore_read_default that returns the value of a specific
key from XenStore, or the default specified value when key is absent.

Bump revision.

ok bouyer@.

See http://mail-index.netbsd.org/port-xen/2011/01/11/msg006405.html


(tron)
diff -r1.22 -r1.22.4.1 pkgsrc/sysutils/xentools3/Makefile
diff -r1.3 -r1.3.14.1 pkgsrc/sysutils/xentools3/PLIST
diff -r1.1.1.1 -r1.1.1.1.34.1 pkgsrc/sysutils/xentools3/files/vif-bridge-nbsd
diff -r1.1.1.1 -r1.1.1.1.34.1 pkgsrc/sysutils/xentools3/files/vif-ip-nbsd
diff -r0 -r1.1.2.2 pkgsrc/sysutils/xentools3/files/xen-subr-nbsd
diff -r1.22 -r1.22.2.1 pkgsrc/sysutils/xentools33/Makefile
diff -r1.9 -r1.9.12.1 pkgsrc/sysutils/xentools33/PLIST
diff -r1.1.1.1 -r1.1.1.1.22.1 pkgsrc/sysutils/xentools33/files/vif-bridge-nbsd
diff -r1.1.1.1 -r1.1.1.1.22.1 pkgsrc/sysutils/xentools33/files/vif-ip-nbsd
diff -r0 -r1.1.2.2 pkgsrc/sysutils/xentools33/files/xen-subr-nbsd
cvs diff -r1.22 -r1.22.4.1 pkgsrc/sysutils/xentools3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools3/Attic/Makefile 2010/10/08 04:58:58 1.22
+++ pkgsrc/sysutils/xentools3/Attic/Makefile 2011/01/12 18:32:18 1.22.4.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.22 2010/10/08 04:58:58 obache Exp $ 1# $NetBSD: Makefile,v 1.22.4.1 2011/01/12 18:32:18 tron Exp $
2# 2#
3 3
4VERSION= 3.1.4 4VERSION= 3.1.4
5DISTNAME= xen-${VERSION} 5DISTNAME= xen-${VERSION}
6PKGNAME= xentools3-${VERSION} 6PKGNAME= xentools3-${VERSION}
7PKGREVISION= 6 7PKGREVISION= 7
8CATEGORIES= sysutils 8CATEGORIES= sysutils
9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ 9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
10EXTRACT_SUFX= .tar.gz 10EXTRACT_SUFX= .tar.gz
11 11
12MAINTAINER= bouyer@NetBSD.org 12MAINTAINER= bouyer@NetBSD.org
13HOMEPAGE= http://xen.org/ 13HOMEPAGE= http://xen.org/
14COMMENT= Userland Tools for Xen 14COMMENT= Userland Tools for Xen
15 15
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18#DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted 18#DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
19DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline 19DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
20 20
@@ -118,27 +118,27 @@ SUBST_STAGE.proc= pre-configure @@ -118,27 +118,27 @@ SUBST_STAGE.proc= pre-configure
118SUBST_FILES.proc= python/xen/xend/XendVnet.py 118SUBST_FILES.proc= python/xen/xend/XendVnet.py
119SUBST_FILES.proc+= xenstore/xs_lib.c 119SUBST_FILES.proc+= xenstore/xs_lib.c
120SUBST_SED.proc= -e "s|/proc|/kern|g" 120SUBST_SED.proc= -e "s|/proc|/kern|g"
121PROCPATH= /kern 121PROCPATH= /kern
122.else 122.else
123PROCPATH= /proc 123PROCPATH= /proc
124.endif 124.endif
125 125
126RCD_SCRIPTS= xend xenbackendd xendomains 126RCD_SCRIPTS= xend xenbackendd xendomains
127FILES_SUBST+= RCD_INTERPRETER=${PYTHONBIN:Q} 127FILES_SUBST+= RCD_INTERPRETER=${PYTHONBIN:Q}
128FILES_SUBST+= PROCPATH=${PROCPATH:Q} 128FILES_SUBST+= PROCPATH=${PROCPATH:Q}
129FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} 129FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
130 130
131XEND_SCRIPTS= block vif-bridge vif-ip 131XEND_SCRIPTS= block vif-bridge vif-ip xen-subr
132 132
133CONF_FILES= ${EGDIR}/xend-config.sxp \ 133CONF_FILES= ${EGDIR}/xend-config.sxp \
134 ${PKG_SYSCONFDIR}/xend-config.sxp 134 ${PKG_SYSCONFDIR}/xend-config.sxp
135.for s in ${XEND_SCRIPTS} 135.for s in ${XEND_SCRIPTS}
136CONF_FILES_PERMS+= ${EGDIR}/${s} ${PKG_SYSCONFDIR}/scripts/${s} \ 136CONF_FILES_PERMS+= ${EGDIR}/${s} ${PKG_SYSCONFDIR}/scripts/${s} \
137 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755 137 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
138.endfor 138.endfor
139 139
140OWN_DIRS= ${PKG_SYSCONFDIR}/scripts /var/log/xen 140OWN_DIRS= ${PKG_SYSCONFDIR}/scripts /var/log/xen
141 141
142pre-build: 142pre-build:
143.if !exists(/usr/include/xen/xenio.h) 143.if !exists(/usr/include/xen/xenio.h)
144 ${MKDIR} ${WRKSRC}/libxc/xen 144 ${MKDIR} ${WRKSRC}/libxc/xen
cvs diff -r1.3 -r1.3.14.1 pkgsrc/sysutils/xentools3/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools3/Attic/PLIST 2009/06/14 18:16:21 1.3
+++ pkgsrc/sysutils/xentools3/Attic/PLIST 2011/01/12 18:32:18 1.3.14.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:16:21 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.3.14.1 2011/01/12 18:32:18 tron Exp $
2bin/pygrub 2bin/pygrub
3bin/readnotes 3bin/readnotes
4bin/xc_restore 4bin/xc_restore
5bin/xc_save 5bin/xc_save
6bin/xencons 6bin/xencons
7bin/xenconsole 7bin/xenconsole
8bin/xenperf 8bin/xenperf
9bin/xenstore-chmod 9bin/xenstore-chmod
10bin/xenstore-control 10bin/xenstore-control
11bin/xenstore-exists 11bin/xenstore-exists
12bin/xenstore-list 12bin/xenstore-list
13bin/xenstore-ls 13bin/xenstore-ls
14bin/xenstore-read 14bin/xenstore-read
@@ -356,18 +356,19 @@ sbin/xenconsoled @@ -356,18 +356,19 @@ sbin/xenconsoled
356sbin/xend 356sbin/xend
357sbin/xenperf 357sbin/xenperf
358sbin/xenstored 358sbin/xenstored
359sbin/xentop 359sbin/xentop
360sbin/xen-python-path 360sbin/xen-python-path
361sbin/xm 361sbin/xm
362share/examples/rc.d/xenbackendd 362share/examples/rc.d/xenbackendd
363share/examples/rc.d/xend 363share/examples/rc.d/xend
364share/examples/rc.d/xendomains 364share/examples/rc.d/xendomains
365share/examples/xen/block 365share/examples/xen/block
366share/examples/xen/netbsd1 366share/examples/xen/netbsd1
367share/examples/xen/vif-bridge 367share/examples/xen/vif-bridge
368share/examples/xen/vif-ip 368share/examples/xen/vif-ip
 369share/examples/xen/xen-subr
369share/examples/xen/xend-config.sxp 370share/examples/xen/xend-config.sxp
370share/examples/xen/xmexample1 371share/examples/xen/xmexample1
371share/examples/xen/xmexample2 372share/examples/xen/xmexample2
372share/examples/xen/xmexample3 373share/examples/xen/xmexample3
373share/xen/create.dtd 374share/xen/create.dtd
cvs diff -r1.1.1.1 -r1.1.1.1.34.1 pkgsrc/sysutils/xentools3/files/Attic/vif-bridge-nbsd (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools3/files/Attic/vif-bridge-nbsd 2007/06/14 19:39:45 1.1.1.1
+++ pkgsrc/sysutils/xentools3/files/Attic/vif-bridge-nbsd 2011/01/12 18:32:18 1.1.1.1.34.1
@@ -1,35 +1,38 @@ @@ -1,35 +1,38 @@
1#!/bin/sh -e 1#!/bin/sh -e
2 2
3# $NetBSD: vif-bridge-nbsd,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $ 3# $NetBSD: vif-bridge-nbsd,v 1.1.1.1.34.1 2011/01/12 18:32:18 tron Exp $
4# Called by xenbackendd 4# Called by xenbackendd
5# Usage: vif-bridge xsdir_backend_path state 5# Usage: vif-bridge xsdir_backend_path state
6 6
 7dir=$(dirname $0)
 8. "$dir/xen-subr"
 9
7PATH=/bin:/usr/bin:@PREFIX@/bin:/sbin:/usr/sbin:@PREFIX@/sbin 10PATH=/bin:/usr/bin:@PREFIX@/bin:/sbin:/usr/sbin:@PREFIX@/sbin
8export PATH 11export PATH
9 12
10xpath=$1 13xpath=$1
11xstatus=$2 14xstatus=$2
12 15
13case $xstatus in 16case $xstatus in
146) 176)
15 # device removed 18 # device removed
16 xenstore-rm $xpath 19 xenstore-rm $xpath
17 exit 0 20 exit 0
18 ;; 21 ;;
192) 222)
20 xbridge=$(xenstore-read "$xpath/bridge") 23 xbridge=$(xenstore-read "$xpath/bridge")
21 xfid=$(xenstore-read "$xpath/frontend-id") 24 xfid=$(xenstore-read "$xpath/frontend-id")
22 xhandle=$(xenstore-read "$xpath/handle") 25 xhandle=$(xenstore-read "$xpath/handle")
23 iface=xvif$xfid.$xhandle 26 iface=$(xenstore_read_default "$xpath/vifname" "xvif$xfid.$xhandle")
24 echo ifconfig $iface up 27 echo ifconfig $iface up
25 ifconfig $iface up 28 ifconfig $iface up
26 brconfig $xbridge add $iface 29 brconfig $xbridge add $iface
27 echo brconfig $xbridge add $iface 30 echo brconfig $xbridge add $iface
28 xenstore-write $xpath/hotplug-status connected 31 xenstore-write $xpath/hotplug-status connected
29 echo xenstore-write $xpath/hotplug-status connected 32 echo xenstore-write $xpath/hotplug-status connected
30 exit 0 33 exit 0
31 ;; 34 ;;
32*) 35*)
33 exit 0 36 exit 0
34 ;; 37 ;;
35esac 38esac
cvs diff -r1.1.1.1 -r1.1.1.1.34.1 pkgsrc/sysutils/xentools3/files/Attic/vif-ip-nbsd (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools3/files/Attic/vif-ip-nbsd 2007/06/14 19:39:45 1.1.1.1
+++ pkgsrc/sysutils/xentools3/files/Attic/vif-ip-nbsd 2011/01/12 18:32:18 1.1.1.1.34.1
@@ -1,33 +1,36 @@ @@ -1,33 +1,36 @@
1#!/bin/sh -e 1#!/bin/sh -e
2 2
3# $NetBSD: vif-ip-nbsd,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $ 3# $NetBSD: vif-ip-nbsd,v 1.1.1.1.34.1 2011/01/12 18:32:18 tron Exp $
4# Called by xenbackendd 4# Called by xenbackendd
5# Usage: vif-ip xsdir_backend_path state 5# Usage: vif-ip xsdir_backend_path state
6 6
 7dir=$(dirname $0)
 8. "$dir/xen-subr"
 9
7PATH=/bin:/usr/bin:@PREFIX@/bin:/sbin:/usr/sbin:@PREFIX@/sbin 10PATH=/bin:/usr/bin:@PREFIX@/bin:/sbin:/usr/sbin:@PREFIX@/sbin
8export PATH 11export PATH
9 12
10xpath=$1 13xpath=$1
11xstatus=$2 14xstatus=$2
12 15
13case $xstatus in 16case $xstatus in
146) 176)
15 # device removed 18 # device removed
16 xenstore-rm $xpath 19 xenstore-rm $xpath
17 exit 0 20 exit 0
18 ;; 21 ;;
192) 222)
20 xip=$(xenstore-read "$xpath/ip") 23 xip=$(xenstore-read "$xpath/ip")
21 xfid=$(xenstore-read "$xpath/frontend-id") 24 xfid=$(xenstore-read "$xpath/frontend-id")
22 xhandle=$(xenstore-read "$xpath/handle") 25 xhandle=$(xenstore-read "$xpath/handle")
23 iface=xvif$xfid.$xhandle 26 iface=$(xenstore_read_default "$xpath/vifname" "xvif$xfid.$xhandle")
24 echo ifconfig $iface $xip up 27 echo ifconfig $iface $xip up
25 ifconfig $iface $xip up 28 ifconfig $iface $xip up
26 xenstore-write $xpath/hotplug-status connected 29 xenstore-write $xpath/hotplug-status connected
27 echo xenstore-write $xpath/hotplug-status connected 30 echo xenstore-write $xpath/hotplug-status connected
28 exit 0 31 exit 0
29 ;; 32 ;;
30*) 33*)
31 exit 0 34 exit 0
32 ;; 35 ;;
33esac 36esac
File Added: pkgsrc/sysutils/xentools3/files/Attic/xen-subr-nbsd
# $NetBSD: xen-subr-nbsd,v 1.1.2.2 2011/01/12 18:32:18 tron Exp $
#
# Contains commonly used functions which are used by Xen scripts

# xenstore_read_default path default
#
# Read the given path in XenStore. Return default if path does not exist
#
xenstore_read_default() {
  xenstore-read "$1" 2>/dev/null || echo "$2"
}
cvs diff -r1.22 -r1.22.2.1 pkgsrc/sysutils/xentools33/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools33/Attic/Makefile 2010/10/30 20:06:52 1.22
+++ pkgsrc/sysutils/xentools33/Attic/Makefile 2011/01/12 18:32:19 1.22.2.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.22 2010/10/30 20:06:52 tnn Exp $ 1# $NetBSD: Makefile,v 1.22.2.1 2011/01/12 18:32:19 tron Exp $
2# 2#
3 3
4VERSION= 3.3.2 4VERSION= 3.3.2
5DISTNAME= xen-${VERSION} 5DISTNAME= xen-${VERSION}
6PKGNAME= xentools33-${VERSION} 6PKGNAME= xentools33-${VERSION}
7PKGREVISION= 4 7PKGREVISION= 5
8CATEGORIES= sysutils 8CATEGORIES= sysutils
9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ 9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
10EXTRACT_SUFX= .tar.gz 10EXTRACT_SUFX= .tar.gz
11 11
12MAINTAINER= cegger@NetBSD.org 12MAINTAINER= cegger@NetBSD.org
13HOMEPAGE= http://xen.org/ 13HOMEPAGE= http://xen.org/
14COMMENT= Userland Tools for Xen 3.3.x 14COMMENT= Userland Tools for Xen 3.3.x
15 15
16LICENSE= gnu-gpl-v2 16LICENSE= gnu-gpl-v2
17 17
18PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
19 19
20#DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted 20#DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
@@ -123,27 +123,27 @@ SUBST_FILES.proc= python/xen/xend/XendVn @@ -123,27 +123,27 @@ SUBST_FILES.proc= python/xen/xend/XendVn
123SUBST_SED.proc= -e "s|/proc|/kern|g" 123SUBST_SED.proc= -e "s|/proc|/kern|g"
124PROCPATH= /kern 124PROCPATH= /kern
125.else 125.else
126PROCPATH= /proc 126PROCPATH= /proc
127.endif 127.endif
128 128
129RCD_SCRIPTS= xend xenbackendd xendomains 129RCD_SCRIPTS= xend xenbackendd xendomains
130FILES_SUBST+= RCD_INTERPRETER=${PYTHONBIN:Q} 130FILES_SUBST+= RCD_INTERPRETER=${PYTHONBIN:Q}
131FILES_SUBST+= PROCPATH=${PROCPATH:Q} 131FILES_SUBST+= PROCPATH=${PROCPATH:Q}
132FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} 132FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
133 133
134BLKTAP_FILES= blk_netbsd.c blktapctrl_netbsd.c 134BLKTAP_FILES= blk_netbsd.c blktapctrl_netbsd.c
135 135
136XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup 136XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup xen-subr
137 137
138CONF_FILES= ${EGDIR}/formats ${PKG_SYSCONFDIR}/formats 138CONF_FILES= ${EGDIR}/formats ${PKG_SYSCONFDIR}/formats
139 139
140CONF_FILES+= ${EGDIR}/xend-config.sxp \ 140CONF_FILES+= ${EGDIR}/xend-config.sxp \
141 ${PKG_SYSCONFDIR}/xend-config.sxp 141 ${PKG_SYSCONFDIR}/xend-config.sxp
142.for s in ${XEND_SCRIPTS} 142.for s in ${XEND_SCRIPTS}
143CONF_FILES_PERMS+= ${EGDIR}/${s} ${PKG_SYSCONFDIR}/scripts/${s} \ 143CONF_FILES_PERMS+= ${EGDIR}/${s} ${PKG_SYSCONFDIR}/scripts/${s} \
144 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755 144 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
145.endfor 145.endfor
146 146
147OWN_DIRS= ${PKG_SYSCONFDIR}/scripts /var/log/xen 147OWN_DIRS= ${PKG_SYSCONFDIR}/scripts /var/log/xen
148 148
149pre-build: 149pre-build:
cvs diff -r1.9 -r1.9.12.1 pkgsrc/sysutils/xentools33/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools33/Attic/PLIST 2009/08/07 12:49:21 1.9
+++ pkgsrc/sysutils/xentools33/Attic/PLIST 2011/01/12 18:32:19 1.9.12.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.9 2009/08/07 12:49:21 cegger Exp $ 1@comment $NetBSD: PLIST,v 1.9.12.1 2011/01/12 18:32:19 tron Exp $
2bin/lsevtchn 2bin/lsevtchn
3bin/pygrub 3bin/pygrub
4bin/readnotes 4bin/readnotes
5bin/xc_restore 5bin/xc_restore
6bin/xc_save 6bin/xc_save
7bin/xen-detect 7bin/xen-detect
8bin/xencons 8bin/xencons
9bin/xenconsole 9bin/xenconsole
10bin/xenctx 10bin/xenctx
11bin/xenstore 11bin/xenstore
12bin/xenstore-chmod 12bin/xenstore-chmod
13bin/xenstore-control 13bin/xenstore-control
14bin/xenstore-exists 14bin/xenstore-exists
@@ -502,26 +502,27 @@ sbin/xm @@ -502,26 +502,27 @@ sbin/xm
502sbin/xsview 502sbin/xsview
503share/doc/xen/README.blktap 503share/doc/xen/README.blktap
504share/doc/xen/README.xenmon 504share/doc/xen/README.xenmon
505share/examples/rc.d/xenbackendd 505share/examples/rc.d/xenbackendd
506share/examples/rc.d/xend 506share/examples/rc.d/xend
507share/examples/rc.d/xendomains 507share/examples/rc.d/xendomains
508share/examples/xen/block 508share/examples/xen/block
509share/examples/xen/formats 509share/examples/xen/formats
510share/examples/xen/hvm 510share/examples/xen/hvm
511share/examples/xen/${LOWER_OPSYS}1 511share/examples/xen/${LOWER_OPSYS}1
512share/examples/xen/qemu-ifup 512share/examples/xen/qemu-ifup
513share/examples/xen/vif-bridge 513share/examples/xen/vif-bridge
514share/examples/xen/vif-ip 514share/examples/xen/vif-ip
 515share/examples/xen/xen-subr
515share/examples/xen/xend-config.sxp 516share/examples/xen/xend-config.sxp
516share/examples/xen/xmexample1 517share/examples/xen/xmexample1
517share/examples/xen/xmexample2 518share/examples/xen/xmexample2
518share/examples/xen/xmexample3 519share/examples/xen/xmexample3
519share/xen/create.dtd 520share/xen/create.dtd
520share/xen/qemu/keymaps/ar 521share/xen/qemu/keymaps/ar
521share/xen/qemu/keymaps/common 522share/xen/qemu/keymaps/common
522share/xen/qemu/keymaps/da 523share/xen/qemu/keymaps/da
523share/xen/qemu/keymaps/de 524share/xen/qemu/keymaps/de
524share/xen/qemu/keymaps/de-ch 525share/xen/qemu/keymaps/de-ch
525share/xen/qemu/keymaps/en-gb 526share/xen/qemu/keymaps/en-gb
526share/xen/qemu/keymaps/en-us 527share/xen/qemu/keymaps/en-us
527share/xen/qemu/keymaps/es 528share/xen/qemu/keymaps/es
cvs diff -r1.1.1.1 -r1.1.1.1.22.1 pkgsrc/sysutils/xentools33/files/Attic/vif-bridge-nbsd (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools33/files/Attic/vif-bridge-nbsd 2008/08/07 20:26:57 1.1.1.1
+++ pkgsrc/sysutils/xentools33/files/Attic/vif-bridge-nbsd 2011/01/12 18:32:19 1.1.1.1.22.1
@@ -1,35 +1,38 @@ @@ -1,35 +1,38 @@
1#!/bin/sh -e 1#!/bin/sh -e
2 2
3# $NetBSD: vif-bridge-nbsd,v 1.1.1.1 2008/08/07 20:26:57 cegger Exp $ 3# $NetBSD: vif-bridge-nbsd,v 1.1.1.1.22.1 2011/01/12 18:32:19 tron Exp $
4# Called by xenbackendd 4# Called by xenbackendd
5# Usage: vif-bridge xsdir_backend_path state 5# Usage: vif-bridge xsdir_backend_path state
6 6
 7dir=$(dirname $0)
 8. "$dir/xen-subr"
 9
7PATH=/bin:/usr/bin:@PREFIX@/bin:/sbin:/usr/sbin:@PREFIX@/sbin 10PATH=/bin:/usr/bin:@PREFIX@/bin:/sbin:/usr/sbin:@PREFIX@/sbin
8export PATH 11export PATH
9 12
10xpath=$1 13xpath=$1
11xstatus=$2 14xstatus=$2
12 15
13case $xstatus in 16case $xstatus in
146) 176)
15 # device removed 18 # device removed
16 xenstore-rm $xpath 19 xenstore-rm $xpath
17 exit 0 20 exit 0
18 ;; 21 ;;
192) 222)
20 xbridge=$(xenstore-read "$xpath/bridge") 23 xbridge=$(xenstore-read "$xpath/bridge")
21 xfid=$(xenstore-read "$xpath/frontend-id") 24 xfid=$(xenstore-read "$xpath/frontend-id")
22 xhandle=$(xenstore-read "$xpath/handle") 25 xhandle=$(xenstore-read "$xpath/handle")
23 iface=xvif$xfid.$xhandle 26 iface=$(xenstore_read_default "$xpath/vifname" "xvif$xfid.$xhandle")
24 echo ifconfig $iface up 27 echo ifconfig $iface up
25 ifconfig $iface up 28 ifconfig $iface up
26 brconfig $xbridge add $iface 29 brconfig $xbridge add $iface
27 echo brconfig $xbridge add $iface 30 echo brconfig $xbridge add $iface
28 xenstore-write $xpath/hotplug-status connected 31 xenstore-write $xpath/hotplug-status connected
29 echo xenstore-write $xpath/hotplug-status connected 32 echo xenstore-write $xpath/hotplug-status connected
30 exit 0 33 exit 0
31 ;; 34 ;;
32*) 35*)
33 exit 0 36 exit 0
34 ;; 37 ;;
35esac 38esac
cvs diff -r1.1.1.1 -r1.1.1.1.22.1 pkgsrc/sysutils/xentools33/files/Attic/vif-ip-nbsd (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools33/files/Attic/vif-ip-nbsd 2008/08/07 20:26:57 1.1.1.1
+++ pkgsrc/sysutils/xentools33/files/Attic/vif-ip-nbsd 2011/01/12 18:32:19 1.1.1.1.22.1
@@ -1,33 +1,36 @@ @@ -1,33 +1,36 @@
1#!/bin/sh -e 1#!/bin/sh -e
2 2
3# $NetBSD: vif-ip-nbsd,v 1.1.1.1 2008/08/07 20:26:57 cegger Exp $ 3# $NetBSD: vif-ip-nbsd,v 1.1.1.1.22.1 2011/01/12 18:32:19 tron Exp $
4# Called by xenbackendd 4# Called by xenbackendd
5# Usage: vif-ip xsdir_backend_path state 5# Usage: vif-ip xsdir_backend_path state
6 6
 7dir=$(dirname $0)
 8. "$dir/xen-subr"
 9
7PATH=/bin:/usr/bin:@PREFIX@/bin:/sbin:/usr/sbin:@PREFIX@/sbin 10PATH=/bin:/usr/bin:@PREFIX@/bin:/sbin:/usr/sbin:@PREFIX@/sbin
8export PATH 11export PATH
9 12
10xpath=$1 13xpath=$1
11xstatus=$2 14xstatus=$2
12 15
13case $xstatus in 16case $xstatus in
146) 176)
15 # device removed 18 # device removed
16 xenstore-rm $xpath 19 xenstore-rm $xpath
17 exit 0 20 exit 0
18 ;; 21 ;;
192) 222)
20 xip=$(xenstore-read "$xpath/ip") 23 xip=$(xenstore-read "$xpath/ip")
21 xfid=$(xenstore-read "$xpath/frontend-id") 24 xfid=$(xenstore-read "$xpath/frontend-id")
22 xhandle=$(xenstore-read "$xpath/handle") 25 xhandle=$(xenstore-read "$xpath/handle")
23 iface=xvif$xfid.$xhandle 26 iface=$(xenstore_read_default "$xpath/vifname" "xvif$xfid.$xhandle")
24 echo ifconfig $iface $xip up 27 echo ifconfig $iface $xip up
25 ifconfig $iface $xip up 28 ifconfig $iface $xip up
26 xenstore-write $xpath/hotplug-status connected 29 xenstore-write $xpath/hotplug-status connected
27 echo xenstore-write $xpath/hotplug-status connected 30 echo xenstore-write $xpath/hotplug-status connected
28 exit 0 31 exit 0
29 ;; 32 ;;
30*) 33*)
31 exit 0 34 exit 0
32 ;; 35 ;;
33esac 36esac
File Added: pkgsrc/sysutils/xentools33/files/Attic/xen-subr-nbsd
# $NetBSD: xen-subr-nbsd,v 1.1.2.2 2011/01/12 18:32:19 tron Exp $
#
# Contains commonly used functions which are used by Xen scripts

# xenstore_read_default path default
#
# Read the given path in XenStore. Return default if path does not exist
#
xenstore_read_default() {
  xenstore-read "$1" 2>/dev/null || echo "$2"
}