From: Evan Broder Date: Sat, 25 Oct 2008 21:59:59 +0000 (-0400) Subject: sipb-xen-dom0 -> invirt-xen-config X-Git-Tag: 0.0.1~6 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-xen-config.git/commitdiff_plain/57a29a823f478cf8ad7d86d3749093d702c25224 sipb-xen-dom0 -> invirt-xen-config svn path=/trunk/packages/invirt-xen-config/; revision=1257 --- diff --git a/debian/changelog b/debian/changelog index 119aaed..cf6b3a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-xen-config (0.0.1) unstable; urgency=low + + * Rename sipb-xen-dom0 -> invirt-xen-config + + -- Evan Broder Sat, 25 Oct 2008 15:22:45 -0400 + sipb-xen-dom0 (2.10) unstable; urgency=low * Fix DHCP checksum error for ParaVMs diff --git a/debian/control b/debian/control index 1bd0fcc..438a2cb 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,14 @@ -Source: sipb-xen-dom0 +Source: invirt-xen-config Section: base Priority: extra -Maintainer: SIPB Xen Project +Maintainer: Invirt project Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0) Standards-Version: 3.7.2 -Package: sipb-xen-dom0 +Package: invirt-xen-config Architecture: all -Depends: ${misc:Depends}, emacs, nullmailer, dsniff, - xen-hypervisor, xen-utils, linux-image-xen-amd64|linux-xen, lvm2, grub, - sipb-xen-base -Description: SIPB Xen domain 0 configuration - This package includes the dependencies and configuration for - a domain 0 sipb-xen server. +Depends: ${misc:Depends}, nullmailer, dsniff, lvm2, grub, + ubuntu-xen-server, sipb-xen-base +Description: Invirt Xen domain 0 configuration + This package includes the dependencies and configuration for a domain + 0 Invirt server. diff --git a/debian/invirt-xen-config.init b/debian/invirt-xen-config.init new file mode 100644 index 0000000..857497d --- /dev/null +++ b/debian/invirt-xen-config.init @@ -0,0 +1,22 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: invirt-xen-config +# Required-Start: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Startup script for the Invirt Xen host +# Description: +### END INIT INFO + +set -e + +case $1 in + start) + echo 1 >/proc/sys/net/ipv4/ip_forward + for foo in all default; do + echo 1 >/proc/sys/net/ipv4/conf/$foo/rp_filter + echo 1 >/proc/sys/net/ipv4/conf/$foo/proxy_arp + done + ;; + esac diff --git a/debian/invirt-xen-config.install b/debian/invirt-xen-config.install new file mode 100644 index 0000000..9da31b3 --- /dev/null +++ b/debian/invirt-xen-config.install @@ -0,0 +1 @@ +files/* . diff --git a/debian/sipb-xen-dom0.dirs b/debian/sipb-xen-dom0.dirs deleted file mode 100644 index b4a3120..0000000 --- a/debian/sipb-xen-dom0.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/sipb-xen-dom0 diff --git a/debian/sipb-xen-dom0.init b/debian/sipb-xen-dom0.init deleted file mode 100644 index a726848..0000000 --- a/debian/sipb-xen-dom0.init +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e - -case $1 in - start) - echo 1 >/proc/sys/net/ipv4/ip_forward - for foo in all default; do - echo 1 >/proc/sys/net/ipv4/conf/$foo/rp_filter - echo 1 >/proc/sys/net/ipv4/conf/$foo/proxy_arp - done - ;; - esac diff --git a/debian/sipb-xen-dom0.install b/debian/sipb-xen-dom0.install deleted file mode 100644 index 4340096..0000000 --- a/debian/sipb-xen-dom0.install +++ /dev/null @@ -1,2 +0,0 @@ -files/* . -xend-config.sxp usr/share/sipb-xen-dom0 diff --git a/files/etc/modprobe.d/loop-maxloop b/files/etc/modprobe.d/loop-maxloop deleted file mode 100644 index d8b6bd4..0000000 --- a/files/etc/modprobe.d/loop-maxloop +++ /dev/null @@ -1 +0,0 @@ -options loop max_loop=64 diff --git a/files/etc/xen/qemu-ifup b/files/etc/xen/qemu-ifup index b62ff06..d50b412 100755 --- a/files/etc/xen/qemu-ifup +++ b/files/etc/xen/qemu-ifup @@ -13,4 +13,4 @@ XENBUS_PATH=/local/domain/0/backend/vif/${domid}/0 vif=vif${domid}.0 export vif qemu_online XENBUS_PATH dev -exec /etc/xen/scripts/vif-sipbroute online +exec /etc/xen/scripts/vif-invirtroute online diff --git a/files/etc/xen/scripts/vif-sipbroute b/files/etc/xen/scripts/vif-invirtroute similarity index 100% rename from files/etc/xen/scripts/vif-sipbroute rename to files/etc/xen/scripts/vif-invirtroute diff --git a/files/usr/sbin/qemu-dm-sipb b/files/usr/sbin/qemu-dm-invirt similarity index 100% rename from files/usr/sbin/qemu-dm-sipb rename to files/usr/sbin/qemu-dm-invirt diff --git a/files/usr/sbin/sipb-xen-losetup b/files/usr/sbin/sipb-xen-losetup deleted file mode 100755 index b876187..0000000 --- a/files/usr/sbin/sipb-xen-losetup +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python2.5 - -import sys -import os -from subprocess import call, Popen, PIPE - -def losetup(source, offset=0): - lockfilename = '/tmp/losetup.lock' - os.close(os.open(lockfilename, os.O_CREAT+os.O_EXCL)) #lock - try: - loopdevice = Popen(['losetup', '-f'], stdout=PIPE).communicate()[0].rstrip() - if loopdevice == '': - raise RuntimeError('out of loop devices for copying VM image: too many at once?') - if call(['losetup', '-o', str(offset), loopdevice, source]) != 0: - raise RuntimeError('losetup failed') - finally: - os.unlink(lockfilename) #unlock - return loopdevice - -def main(*argv): - args = argv[1:] - os.environ['PATH'] = '/usr/sbin:/usr/bin:/sbin:/bin' - if not (1 <= len(args) <= 2): - print >>sys.stderr, 'usage: %s sourcedevice [offset]' % argv[0] - print >>sys.stderr, 'prints resulting loopback device; don\'t forget to losetup -d' - return 2 - print losetup(*args) - return 0 - -if __name__ == '__main__': - sys.exit(main(*sys.argv)) diff --git a/xend-config.sxp b/xend-config.sxp deleted file mode 100644 index 44f628b..0000000 --- a/xend-config.sxp +++ /dev/null @@ -1,135 +0,0 @@ -# -*- sh -*- - -# -# Xend configuration file. -# - -# This example configuration is appropriate for an installation that -# utilizes a bridged network configuration. Access to xend via http -# is disabled. - -# Commented out entries show the default for that entry, unless otherwise -# specified. - -#(logfile /var/log/xen/xend.log) -#(loglevel DEBUG) - -#(xend-http-server no) -#(xend-unix-server no) -#(xend-tcp-xmlrpc-server no) -#(xend-unix-xmlrpc-server yes) -#(xend-relocation-server no) - -#(xend-unix-path /var/lib/xend/xend-socket) - -# Port xend should use for the HTTP interface, if xend-http-server is set. -#(xend-port 8000) - -# Port xend should use for the relocation interface, if xend-relocation-server -# is set. -#(xend-relocation-port 8002) - -# Address xend should listen on for HTTP connections, if xend-http-server is -# set. -# Specifying 'localhost' prevents remote connections. -# Specifying the empty string '' (the default) allows all connections. -#(xend-address '') -#(xend-address localhost) - -# Address xend should listen on for relocation-socket connections, if -# xend-relocation-server is set. -# Meaning and default as for xend-address above. -#(xend-relocation-address '') - -# The hosts allowed to talk to the relocation port. If this is empty (the -# default), then all connections are allowed (assuming that the connection -# arrives on a port and interface on which we are listening; see -# xend-relocation-port and xend-relocation-address above). Otherwise, this -# should be a space-separated sequence of regular expressions. Any host with -# a fully-qualified domain name or an IP address that matches one of these -# regular expressions will be accepted. -# -# For example: -# (xend-relocation-hosts-allow '^localhost$ ^.*\.example\.org$') -# -#(xend-relocation-hosts-allow '') - -# The limit (in kilobytes) on the size of the console buffer -#(console-limit 1024) - -## -# To bridge network traffic, like this: -# -# dom0: fake eth0 -> vif0.0 -+ -# | -# bridge -> real eth0 -> the network -# | -# domU: fake eth0 -> vifN.0 -+ -# -# use -# -# (network-script network-bridge) -# -# Your default ethernet device is used as the outgoing interface, by default. -# To use a different one (e.g. eth1) use -# -# (network-script 'network-bridge netdev=eth1') -# -# The bridge is named xenbr0, by default. To rename the bridge, use -# -# (network-script 'network-bridge bridge=') -# -# It is possible to use the network-bridge script in more complicated -# scenarios, such as having two outgoing interfaces, with two bridges, and -# two fake interfaces per guest domain. To do things like this, write -# yourself a wrapper script, and call network-bridge from it, as appropriate. -# -(network-script network-bridge) - -# The script used to control virtual interfaces. This can be overridden on a -# per-vif basis when creating a domain or a configuring a new vif. The -# vif-bridge script is designed for use with the network-bridge script, or -# similar configurations. -# -# If you have overridden the bridge name using -# (network-script 'network-bridge bridge=') then you may wish to do the -# same here. The bridge name can also be set when creating a domain or -# configuring a new vif, but a value specified here would act as a default. -# -# If you are using only one bridge, the vif-bridge script will discover that, -# so there is no need to specify it explicitly. -# -(vif-script vif-bridge) - - -## Use the following if network traffic is routed, as an alternative to the -# settings for bridged networking given above. -#(network-script network-route) -#(vif-script vif-route) - - -## Use the following if network traffic is routed with NAT, as an alternative -# to the settings for bridged networking given above. -#(network-script network-nat) -#(vif-script vif-nat) - - -# Dom0 will balloon out when needed to free memory for domU. -# dom0-min-mem is the lowest memory level (in MB) dom0 will get down to. -# If dom0-min-mem=0, dom0 will never balloon out. -(dom0-min-mem 1024) - -# In SMP system, dom0 will use dom0-cpus # of CPUS -# If dom0-cpus = 0, dom0 will take all cpus available -(dom0-cpus 0) - -# Whether to enable core-dumps when domains crash. -#(enable-dump no) - -# The tool used for initiating virtual TPM migration -#(external-migration-tool '') - -# The interface for VNC servers to listen on. Defaults -# to 127.0.0.1 To restore old 'listen everywhere' behaviour -# set this to 0.0.0.0 -#(vnc-listen '127.0.0.1')