[Pkg-uml-commit] r4 - in
uml-utilities-20060110/uml-utilities/trunk: . debian humfsify
jail mconsole moo tunctl uml_net uml_router
Stefano Melchior
stex-guest at costa.debian.org
Thu Jan 12 14:22:22 UTC 2006
Author: stex-guest
Date: 2006-01-12 14:21:38 +0000 (Thu, 12 Jan 2006)
New Revision: 4
Added:
uml-utilities-20060110/uml-utilities/trunk/debian/
uml-utilities-20060110/uml-utilities/trunk/debian/README.Debian
uml-utilities-20060110/uml-utilities/trunk/debian/changelog
uml-utilities-20060110/uml-utilities/trunk/debian/control
uml-utilities-20060110/uml-utilities/trunk/debian/copyright
uml-utilities-20060110/uml-utilities/trunk/debian/interfaces.example
uml-utilities-20060110/uml-utilities/trunk/debian/postinst
uml-utilities-20060110/uml-utilities/trunk/debian/rules
uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.default
uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.examples
uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.if-pre-up.d
uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.if-up.d
uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.init
uml-utilities-20060110/uml-utilities/trunk/mconsole/uml_mconsole.sgml
uml-utilities-20060110/uml-utilities/trunk/moo/uml_moo.sgml
uml-utilities-20060110/uml-utilities/trunk/tunctl/tunctl.sgml
uml-utilities-20060110/uml-utilities/trunk/uml_router/uml_switch.sgml
Removed:
uml-utilities-20060110/uml-utilities/trunk/uml_router/core
uml-utilities-20060110/uml-utilities/trunk/uml_util.spec
Modified:
uml-utilities-20060110/uml-utilities/trunk/humfsify/humfsify
uml-utilities-20060110/uml-utilities/trunk/jail/Makefile
uml-utilities-20060110/uml-utilities/trunk/uml_net/host.c
uml-utilities-20060110/uml-utilities/trunk/uml_net/uml_net.c
Log:
Load uml-utilities-20060110 into
uml-utilities-20060110/uml-utilities/trunk.
Added: uml-utilities-20060110/uml-utilities/trunk/debian/README.Debian
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/debian/README.Debian 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/debian/README.Debian 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,54 @@
+The easiest way to use virtual networking is to use the "daemon"
+transport with the uml_switch instance which is configured and running
+by default.
+
+1. Add an entry to /etc/network/interfaces to configure a persistent
+tap interface on the host:
+
+auto tap0
+iface tap0 inet static
+ address 192.168.1.1
+ netmask 255.255.255.0
+ tunctl_user uml-net
+
+2. Configure uml_switch to connect to this interface by editing
+/etc/default/uml-utilities:
+
+UML_SWITCH_OPTIONS="-tap tap0"
+
+3. Activate the tap interface:
+
+# ifup tap0
+
+4. Restart the daemon
+
+# /etc/init.d/uml-utilities restart
+
+5. Use the "daemon" transport with UML:
+
+$ linux eth0=daemon
+
+You should then be able to pass traffic between UML and the host over
+the tap interface. You may also set up forwarding, masquerading,
+etc. in order to communicate beyond the host. It is convenient to run
+dhcpd on the host, configured to listen on the tap0 interface and
+provide configuration information for UMLs as needed.
+
+As an alternative to the above procedure, to enable virtual networking
+using TUN/TAP directly from UML (the "tuntap" transport), add trusted
+users to the uml-net group, e.g.:
+
+adduser bill uml-net
+
+If you wish to use a different group or different permissions, use a
+statoverride for /usr/lib/uml/uml_net. Note that members of the
+uml-net group will have privileges to do potentially harmful things to
+the system, such as reconfiguring network interfaces.
+
+Note also that the uml_net helper is installed in a different place in this
+package than by the upstream distribution (/usr/lib/uml/uml_net rather than
+PREFIX/bin/uml_net). This is done in order to comply with FHS. because
+uml_net is not meant to be executed by users, it does not belong in the system
+PATH.
+
+ -- Matt Zimmerman <mdz at debian.org>, Sun Sep 28 23:08:26 2003
Added: uml-utilities-20060110/uml-utilities/trunk/debian/changelog
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/debian/changelog 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/debian/changelog 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,374 @@
+uml-utilities (20060110-1) unstable; urgency=low
+
+ * Fixed libreadline5-dev build dependency (closes: #326287)
+ * Fixed space left on daemon stoping from Loic Minier <lool at dooz.org>> (closes: #236467)
+
+ -- Stefano Melchior <stefano.melchior at openlabs.it> Wed, 11 Jan 2006 00:25:40 +0100
+
+uml-utilities (20040406-1) unstable; urgency=low
+
+ * New upstream release
+ * Patch from Carlos Perelló Marín to fix uml_proxy_arp with multiple
+ addresses (Closes: #243834)
+
+ -- Matt Zimmerman <mdz at debian.org> Wed, 14 Apr 2004 17:59:45 -0700
+
+uml-utilities (20040114-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Matt Zimmerman <mdz at debian.org> Mon, 16 Feb 2004 23:01:35 -0800
+
+uml-utilities (20030903-7) unstable; urgency=low
+
+ * Add a note about using dhcpd to README.Debian
+ * Patch from Clint Adams <schizo at debian.org> to support multiple
+ proxy_arp addresses in /etc/network/interfaces (Closes: #222014)
+
+ -- Matt Zimmerman <mdz at debian.org> Sun, 11 Jan 2004 22:52:13 -0800
+
+uml-utilities (20030903-6) unstable; urgency=low
+
+ * Documentation improvements to reflect user feedback
+ * Add some comments to interfaces.example explaining how they are used
+ * Add "ifup tap0" in the step-by-step instructions in README.Debian
+ * Clarify the README.Debian to indicate that there are multiple methods
+ of networking being documented
+
+ -- Matt Zimmerman <mdz at debian.org> Fri, 19 Sep 2003 01:02:23 -0400
+
+uml-utilities (20030903-5) unstable; urgency=low
+
+ * Fix typo in daemon transport instructions in README.Debian
+ (Closes: #209250)
+
+ -- Matt Zimmerman <mdz at debian.org> Wed, 17 Sep 2003 16:40:08 -0400
+
+uml-utilities (20030903-4) unstable; urgency=low
+
+ * Oops, the switch socket needs to be writable and executable as well.
+ This means the chmod is back.
+
+ -- Matt Zimmerman <mdz at debian.org> Sat, 6 Sep 2003 12:37:59 -0400
+
+uml-utilities (20030903-3) unstable; urgency=low
+
+ * Don't chgrp/chmod the uml_switch socket. uml_switch is now a public
+ service to local users and requires no additional privileges.
+ (Closes: #208770)
+ * Add documentation to README.Debian about the uml_switch setup
+
+ -- Matt Zimmerman <mdz at debian.org> Fri, 5 Sep 2003 20:13:59 -0400
+
+uml-utilities (20030903-2) unstable; urgency=low
+
+ * Use sysconf rather than PAGE_SIZE in uml_mkcow (Closes: #208795)
+
+ -- Matt Zimmerman <mdz at debian.org> Fri, 5 Sep 2003 13:06:21 -0400
+
+uml-utilities (20030903-1) unstable; urgency=low
+
+ * New upstream release
+ * Update uml_mconsole(1) to document all commands. Added documentation
+ for cad, sysrq, stop, go and log.
+ * Update init script to match new uml_switch syntax
+
+ -- Matt Zimmerman <mdz at debian.org> Thu, 4 Sep 2003 16:55:26 -0400
+
+uml-utilities (20030605-5) unstable; urgency=low
+
+ * Tweak interfaces example to use uml-net user, as an example of how to
+ let uml_switch connect to the tap interface
+ * I give up, invoke adduser with --no-create-home. Why should system
+ users have home directories in /home by default? (Closes: #208351)
+ * Don't let the init script fail if the uml-net user does not exist,
+ since that could have failed in postinst
+
+ -- Matt Zimmerman <mdz at debian.org> Tue, 2 Sep 2003 19:20:19 -0400
+
+uml-utilities (20030605-4) unstable; urgency=low
+
+ * Update uml_switch man page to include new options -tap, -daemon,
+ -compat-v0
+ * Add an init script which automatically starts up a uml_switch daemon,
+ which will be accessible by all users in the uml-net group
+
+ -- Matt Zimmerman <mdz at debian.org> Mon, 1 Sep 2003 14:02:30 -0400
+
+uml-utilities (20030605-3) unstable; urgency=medium
+
+ * Depends: makedev (>= 2.3.1-62), as that is when tun support was
+ added (Closes: #204520)
+ * Include if-pre-up.d and if-up.d scripts and example
+ /etc/network/interfaces from Clint Adams <schizo at debian.org>
+ (Closes: #196523)
+
+ -- Matt Zimmerman <mdz at debian.org> Sat, 16 Aug 2003 16:13:43 -0400
+
+uml-utilities (20030605-2) unstable; urgency=low
+
+ * Add explanation of uml_net location to README.Debian
+ * Depends: adduser (Closes: #201188)
+
+ -- Matt Zimmerman <mdz at debian.org> Mon, 14 Jul 2003 08:57:33 -0400
+
+uml-utilities (20030605-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Matt Zimmerman <mdz at debian.org> Sat, 7 Jun 2003 00:06:09 -0400
+
+uml-utilities (20030312-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Matt Zimmerman <mdz at debian.org> Fri, 14 Mar 2003 21:38:11 -0500
+
+uml-utilities (20030205-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Matt Zimmerman <mdz at debian.org> Thu, 6 Feb 2003 22:56:55 -0500
+
+uml-utilities (20030202-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Matt Zimmerman <mdz at debian.org> Sun, 2 Feb 2003 20:25:13 -0500
+
+uml-utilities (20030122-2) unstable; urgency=low
+
+ * Actually create the tun device (changelog error)
+
+ -- Matt Zimmerman <mdz at debian.org> Tue, 28 Jan 2003 01:13:30 -0500
+
+uml-utilities (20030122-1) unstable; urgency=low
+
+ * New upstream release
+ * Depends on makedev >= 2.3.1-62 and create tun device in postinst
+ (Closes: #174730)
+
+ -- Matt Zimmerman <mdz at debian.org> Mon, 27 Jan 2003 12:22:19 -0500
+
+uml-utilities (20021102-1) unstable; urgency=low
+
+ * New upstream release
+ * Fixes a data corruption bug in uml_moo
+ * Use getent rather than sg to check for the existence of uml-net
+
+ -- Matt Zimmerman <mdz at debian.org> Sun, 3 Nov 2002 15:26:21 -0500
+
+uml-utilities (20020906-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Matt Zimmerman <mdz at debian.org> Sat, 14 Sep 2002 12:01:13 -0400
+
+uml-utilities (20020821-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Matt Zimmerman <mdz at debian.org> Tue, 3 Sep 2002 16:38:07 -0400
+
+uml-utilities (20020729-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Matt Zimmerman <mdz at debian.org> Mon, 29 Jul 2002 21:01:57 -0400
+
+uml-utilities (20020718-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Matt Zimmerman <mdz at debian.org> Thu, 18 Jul 2002 22:51:28 -0400
+
+uml-utilities (20020707-1) unstable; urgency=low
+
+ * New upstream release
+ - Fixes large file handling in uml_moo (Closes: #146395)
+ - Provides a destructive merge option for uml_moo (Closes: #146399)
+
+ -- Matt Zimmerman <mdz at debian.org> Mon, 8 Jul 2002 19:45:33 -0400
+
+uml-utilities (20020604-1) unstable; urgency=low
+
+ * New upstream release
+ * Includes uml_watchdog
+
+ -- Matt Zimmerman <mdz at debian.org> Wed, 5 Jun 2002 21:19:20 -0400
+
+uml-utilities (20020521-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Matt Zimmerman <mdz at debian.org> Tue, 21 May 2002 20:39:40 -0400
+
+uml-utilities (20020428-2) unstable; urgency=low
+
+ * Use #ifdef around use of SA_NOCLDWAIT to allow building on ia64 again
+ (Closes: #145409)
+
+ -- Matt Zimmerman <mdz at debian.org> Thu, 2 May 2002 16:14:42 -0400
+
+uml-utilities (20020428-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Matt Zimmerman <mdz at debian.org> Sun, 28 Apr 2002 23:03:05 -0400
+
+uml-utilities (20020427-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Matt Zimmerman <mdz at debian.org> Sat, 27 Apr 2002 15:46:25 -0400
+
+uml-utilities (20020415-3) unstable; urgency=high
+
+ * Aaarrgghh...forgot to change back to Architecture: any
+
+ -- Matt Zimmerman <mdz at debian.org> Thu, 25 Apr 2002 22:22:36 -0400
+
+uml-utilities (20020415-2) unstable; urgency=low
+
+ * Hack debian/rules to avoid building or installing tunctl on arm
+ (Closes: #142740)
+
+ -- Matt Zimmerman <mdz at debian.org> Sun, 21 Apr 2002 23:32:33 -0400
+
+uml-utilities (20020415-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Matt Zimmerman <mdz at debian.org> Sun, 21 Apr 2002 23:08:20 -0400
+
+uml-utilities (20020410-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Matt Zimmerman <mdz at debian.org> Wed, 10 Apr 2002 23:06:38 -0400
+
+uml-utilities (20020407-1) unstable; urgency=low
+
+ * New upstream release
+ * Needed for 2.4.18-15um
+
+ -- Matt Zimmerman <mdz at debian.org> Tue, 9 Apr 2002 00:47:18 -0400
+
+uml-utilities (20020320-3) unstable; urgency=high
+
+ * Limit architectures to everything except ARM in hopes of getting into
+ testing (and getting user-mode-linux 2.4.18 there). No other changes
+ whatsoever.
+
+ -- Matt Zimmerman <mdz at debian.org> Sun, 7 Apr 2002 17:57:08 -0400
+
+uml-utilities (20020320-2) unstable; urgency=low
+
+ * Update tunctl(1) to reflect new syntax (Closes: #140702)
+ * Add README.Debian which briefly explains about access control for
+ virtual networking
+
+ -- Matt Zimmerman <mdz at debian.org> Tue, 2 Apr 2002 08:55:55 -0500
+
+uml-utilities (20020320-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Matt Zimmerman <mdz at debian.org> Thu, 21 Mar 2002 22:24:21 -0500
+
+uml-utilities (20020318-1) unstable; urgency=low
+
+ * New upstream release.
+ * The uml_switch protocol has changed, and this version is required for
+ 2.4.18-8um
+ * libuml-perl is gone, superseded by the UML test suite tarball which is
+ not packaged yet
+ * Only suggest user-mode-linux (Closes: #137990)
+
+ -- Matt Zimmerman <mdz at debian.org> Tue, 19 Mar 2002 08:44:43 -0500
+
+uml-utilities (20020212-2) unstable; urgency=low
+
+ * Remove uml_mkdebianfs. It was a quick hack, and not terribly useful.
+ Instead, use rootstrap, which is now in unstable. It is much more
+ feature-rich, configurable and extensible.
+ * Removal of uml_mkdebianfs Closes: #134635
+ * Create a group for users authorized to run uml_net as root. If you
+ want this to be different, use dpkg-statoverride. (Closes: #136219)
+
+ -- Matt Zimmerman <mdz at debian.org> Sat, 9 Mar 2002 17:57:41 -0500
+
+uml-utilities (20020212-1) unstable; urgency=low
+
+ * New upstream release.
+ * Includes a new tool, tunctl
+
+ -- Matt Zimmerman <mdz at debian.org> Tue, 12 Feb 2002 22:59:51 -0500
+
+uml-utilities (20020125-1) unstable; urgency=low
+
+ * New upstream release.
+ * Include my simplistic uml_mkdebianfs script for building Debian root
+ images for UML
+
+ -- Matt Zimmerman <mdz at debian.org> Fri, 25 Jan 2002 22:20:37 -0500
+
+uml-utilities (20020104-2) unstable; urgency=medium
+
+ * Remove reference to nonexistent uml_net(1) from uml_switch(1)
+ * Only Recommend user-mode-linux, don't depend on it. This is necessary
+ if we ever want to make it into testing.
+
+ -- Matt Zimmerman <mdz at debian.org> Mon, 14 Jan 2002 19:05:27 -0500
+
+uml-utilities (20020104-1) unstable; urgency=low
+
+ * New upstream release.
+ * Should now handle version 2 COW files correctly (Closes: #123868)
+
+ -- Matt Zimmerman <mdz at debian.org> Fri, 4 Jan 2002 20:01:18 -0500
+
+uml-utilities (20011227-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Matt Zimmerman <mdz at debian.org> Sat, 29 Dec 2001 18:35:07 -0500
+
+uml-utilities (20011210-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add depends: libexpect-perl for libuml-perl
+
+ -- Matt Zimmerman <mdz at debian.org> Wed, 12 Dec 2001 19:18:55 -0500
+
+uml-utilities (20011209-2) unstable; urgency=low
+
+ * Package UML.pm in new binary package libuml-perl
+ * Fix an error in the (Debian-only) security fix to uml_net
+ (Closes: #123643)
+ * Add missing build-dep on libreadline-dev (Closes: #123647)
+
+ -- Matt Zimmerman <mdz at debian.org> Wed, 12 Dec 2001 18:47:29 -0500
+
+uml-utilities (20011209-1) unstable; urgency=low
+
+ * New upstream release.
+ * Includes security fixes
+
+ -- Matt Zimmerman <mdz at debian.org> Sun, 9 Dec 2001 19:30:43 -0500
+
+uml-utilities (20011124-2) unstable; urgency=low
+
+ * Apply security fixes to uml_net (also sent upstream)
+ * Ship uml_net setuid root, so that virtual networking works for
+ unprivileged users. dpkg-statoverride it if you don't want this.
+
+ -- Matt Zimmerman <mdz at debian.org> Sun, 9 Dec 2001 07:04:39 -0500
+
+uml-utilities (20011124-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Matt Zimmerman <mdz at debian.org> Wed, 5 Dec 2001 07:46:29 -0500
+
+
Added: uml-utilities-20060110/uml-utilities/trunk/debian/control
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/debian/control 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/debian/control 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,21 @@
+Source: uml-utilities
+Section: otherosfs
+Priority: extra
+Maintainer: Stefano Melchior <stefano.melchior at openlabs.it>
+Build-Depends: debhelper (>> 4.0.0), libreadline5-dev | libreadline-dev, docbook-to-man
+Standards-Version: 3.6.2
+
+Package: uml-utilities
+Architecture: any
+Depends: adduser, makedev (>= 2.3.1-62), ${shlibs:Depends}
+Suggests: user-mode-linux
+Description: User-mode Linux (utility programs)
+ User-mode Linux is a port of the Linux kernel to its own system call
+ interface. It provides a kind of virtual machine, which runs Linux
+ as a user process under another Linux kernel. This is useful for
+ kernel development, sandboxing, jailing, experimentation, and
+ many other things.
+ .
+ This package contains userspace utilities for use with User-mode
+ Linux, including uml_mconsole, uml_moo, uml_switch, uml_net and
+ tunctl.
Added: uml-utilities-20060110/uml-utilities/trunk/debian/copyright
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/debian/copyright 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/debian/copyright 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,15 @@
+This package was debianized by Matt Zimmerman <mdz at debian.org> on
+Wed, 5 Dec 2001 07:46:29 -0500.
+
+It was downloaded from http://user-mode-linux.sourceforge.net/
+
+Upstream Author: Jeff Dike <jdike at karaya.com>
+
+Copyright (from */*.c):
+
+/* Copyright 2001 Jeff Dike and others
+ * Licensed under the GPL
+ */
+
+On Debian systems, a copy of the GNU General Public License (GPL) may
+be found in /usr/share/common-licenses/GPL.
Added: uml-utilities-20060110/uml-utilities/trunk/debian/interfaces.example
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/debian/interfaces.example 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/debian/interfaces.example 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,19 @@
+# Use this stanza if you want to configure an interface to connect
+# the uml_switch daemon to the host via a tap interface
+auto tap0
+iface tap0 inet static
+ address 192.168.1.1
+ netmask 255.255.255.0
+ tunctl_user uml-net
+
+# This is an example of how to set up a tap device for a particular
+# user to use, with an IP address on the local network (eth0) via
+# proxy ARP
+auto tap1
+iface tap1 inet static
+ address 192.168.1.1
+ netmask 255.255.255.255
+ tunctl_user omega
+ uml_proxy_arp 192.168.100.52
+ #uml_proxy_arp 192.168.100.52 192.168.100.53 192.168.100.54
+ uml_proxy_ether eth0
Added: uml-utilities-20060110/uml-utilities/trunk/debian/postinst
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/debian/postinst 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/debian/postinst 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,67 @@
+#! /bin/sh
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+# Any necessary prompting should almost always be confined to the
+# post-installation script, and should be protected with a conditional
+# so that unnecessary prompting doesn't happen if a package's
+# installation fails and the `postinst' is called with `abort-upgrade',
+# `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+ configure)
+
+ if ! getent passwd uml-net >/dev/null; then
+ if getent group uml-net >/dev/null; then
+ # earlier versions only created a group
+ adduser --quiet --system --ingroup uml-net --no-create-home uml-net
+ else
+ adduser --quiet --system --group --no-create-home uml-net
+ fi
+ fi
+
+ if ! dpkg-statoverride --list /usr/lib/uml/uml_net >/dev/null; then
+ dpkg-statoverride --update --add root uml-net 04750 \
+ /usr/lib/uml/uml_net
+ fi
+
+ if ! dpkg-statoverride --list /var/run/uml-utilities >/dev/null; then
+ chown uml-net:uml-net /var/run/uml-utilities
+ fi
+
+ if [ ! -e /dev/.devfsd -a ! -e /dev/net/tun ]; then
+ (cd /dev && MAKEDEV tun)
+ fi
+
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Added: uml-utilities-20060110/uml-utilities/trunk/debian/rules
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/debian/rules 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/debian/rules 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,109 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=3
+export DEB_BUILD_ARCH?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+tmp:=$(CURDIR)/debian/uml-utilities
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+ dh_testdir
+
+ifeq "$(DEB_BUILD_ARCH)" "arm"
+ touch tunctl/tunctl
+endif
+ $(MAKE)
+
+ for man in */*.sgml; do \
+ docbook-to-man $$man > `dirname $$man`/`basename $$man .sgml`.1; \
+ done
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ -$(MAKE) clean
+ rm -f */*.1
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs usr/sbin usr/lib/uml \
+ etc/network/if-up.d etc/network/if-pre-up.d \
+ var/run/uml-utilities
+
+ $(MAKE) install DESTDIR=$(tmp)
+ mv $(tmp)/usr/bin/uml_net $(tmp)/usr/lib/uml
+ mv $(tmp)/usr/bin/tunctl $(tmp)/usr/sbin
+
+ chmod +x debian/uml-utilities.if-*.d
+ install -m 755 debian/uml-utilities.if-up.d $(tmp)/etc/network/if-up.d/uml-utilities
+ install -m 755 debian/uml-utilities.if-pre-up.d $(tmp)/etc/network/if-pre-up.d/uml-utilities
+
+ifeq "$(DEB_BUILD_ARCH)" "arm"
+ rm -f $(tmp)/usr/sbin/tunctl
+endif
+
+# Build architecture-independent files here.
+binary-indep: build install
+# dh_testdir -i
+# dh_testroot -i
+# dh_installdocs -i
+# dh_installchangelogs -i
+# dh_compress -i
+# dh_fixperms -i
+# dh_installdeb -i
+# dh_perl -i
+# dh_gencontrol -i
+# dh_md5sums -i
+# dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir -a
+ dh_testroot -a
+# dh_installdebconf -a
+ dh_installdocs -a
+ dh_installexamples -a
+# dh_installmenu -a
+# dh_installlogrotate -a
+# dh_installemacsen -a
+# dh_installpam -a
+# dh_installmime -a
+ dh_installinit -a
+# dh_installcron -a
+ dh_installman -a */*.1
+ dh_installinfo -a
+# dh_undocumented
+ dh_installchangelogs -a
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+# dh_makeshlibs -a
+ dh_installdeb -a
+# dh_perl -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Property changes on: uml-utilities-20060110/uml-utilities/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.default
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.default 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.default 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,7 @@
+# Options to pass to uml_switch.
+# For preconfigured tap setup, see
+# /usr/share/doc/uml-utilities/examples/interfaces.example
+#UML_SWITCH_OPTIONS="-tap tap0"
+
+# User as which to run uml_switch
+#UML_SWITCH_USER="uml-net"
Added: uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.examples
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.examples 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.examples 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,2 @@
+jail/tty_log.pl
+debian/interfaces.example
Added: uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.if-pre-up.d
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.if-pre-up.d 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.if-pre-up.d 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+test -x /usr/sbin/tunctl || exit 0
+test -n "${IF_TUNCTL_USER}" || exit 0
+
+/usr/sbin/tunctl -u "${IF_TUNCTL_USER}" -t "${IFACE}"
+
+#
+# why the hell does this need to be done?
+#
+chown root:uml-net /dev/net/tun
+chmod 660 /dev/net/tun
Added: uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.if-up.d
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.if-up.d 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.if-up.d 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+test -n "${IF_UML_PROXY_ARP}" || exit 0
+test -n "${IF_UML_PROXY_ETHER}" || exit 0
+
+sysctl -w net/ipv4/conf/"${IFACE}"/proxy_arp=1
+
+for i in ${IF_UML_PROXY_ARP};
+do
+ route add -host "$i" dev "${IFACE}"
+ arp -Ds "$i" "${IF_UML_PROXY_ETHER}" pub
+done
Added: uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.init
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.init 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/debian/uml-utilities.init 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,67 @@
+#! /bin/sh
+#
+# uml-utilities Provide some simple UML networking configuration
+# services
+#
+# Matt Zimmerman <mdz at debian.org>
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/uml_switch
+NAME=uml_switch
+DESC="User-mode networking switch"
+PIDFILE=/var/run/uml-utilities/$NAME.pid
+
+test -x $DAEMON || exit 0
+
+set -e
+
+UML_SWITCH_OPTIONS=""
+UML_SWITCH_USER="uml-net"
+UML_SWITCH_CTL="/var/run/uml-utilities/uml_switch.ctl"
+
+if [ -e /etc/default/uml-utilities ]; then
+ . /etc/default/uml-utilities
+fi
+
+OPTIONS="$UML_SWITCH_OPTIONS -unix $UML_SWITCH_CTL"
+
+case "$1" in
+ start)
+ echo -n "Starting $DESC: $NAME"
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --make-pidfile --background --chuid $UML_SWITCH_USER \
+ --exec $DAEMON -- $OPTIONS
+
+ WAIT=5
+ while ! test -e $UML_SWITCH_CTL; do
+ sleep 1
+ WAIT=$(($WAIT - 1))
+ if [ $WAIT -le 0 ]; then
+ echo "$DAEMON never created control socket $UML_SWITCH_CTL" >&2
+ exit 1
+ fi
+ done
+
+ chmod 777 $UML_SWITCH_CTL
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: $NAME"
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+ --oknodo --exec $DAEMON
+ rm -f $PIDFILE $UML_SWITCH_CTL $UML_SWITCH_DATA
+ echo "."
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ N=/etc/init.d/$NAME
+ # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+ echo "Usage: $N {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
Property changes on: uml-utilities-20060110/uml-utilities/trunk/humfsify/humfsify
___________________________________________________________________
Name: svn:executable
-
+ *
Modified: uml-utilities-20060110/uml-utilities/trunk/jail/Makefile
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/jail/Makefile 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/jail/Makefile 2006-01-12 14:21:38 UTC (rev 4)
@@ -1,5 +1,7 @@
all : jail_uml
+install:
+
jail_uml : jail_uml.c
# Don't install anything as yet
Added: uml-utilities-20060110/uml-utilities/trunk/mconsole/uml_mconsole.sgml
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/mconsole/uml_mconsole.sgml 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/mconsole/uml_mconsole.sgml 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,284 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+ page: `docbook-to-man manpage.sgml > manpage.1'. You may view
+ the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+ less'. A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+ docbook-to-man $< > $@
+ -->
+
+ <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+ <!ENTITY dhfirstname "<firstname>Matt</firstname>">
+ <!ENTITY dhsurname "<surname>Zimmerman</surname>">
+ <!-- Please adjust the date whenever revising the manpage. -->
+ <!ENTITY dhdate "<date>December 5, 2001</date>">
+ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+ allowed: see man(7), man(1). -->
+ <!ENTITY dhsection "<manvolnum>1</manvolnum>">
+ <!ENTITY dhemail "<email>mdz at debian.org</email>">
+ <!ENTITY dhusername "Matt Zimmerman">
+ <!ENTITY dhucpackage "<refentrytitle>UML_MCONSOLE</refentrytitle>">
+ <!ENTITY dhpackage "uml_mconsole">
+
+ <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhemail;
+ </address>
+ <author>
+ &dhfirstname;
+ &dhsurname;
+ </author>
+ <copyright>
+ <year>2001</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+ <refmeta>
+ &dhucpackage;
+
+ &dhsection;
+ </refmeta>
+ <refnamediv>
+ <refname>&dhpackage;</refname>
+
+ <refpurpose>attach to the management console of a user-mode Linux
+ kernel</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+
+ <arg><replaceable>socket</replaceable></arg>
+
+ <arg choice=opt rep=repeat><replaceable>command</replaceable></arg>
+
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This manual page documents briefly the
+ <command>&dhpackage;</command> command.</para>
+
+ <para>This manual page was written for the &debian; distribution
+ because the original program does not have a manual page.</para>
+
+ <para><command>&dhpackage;</command> is a program to connect to
+ the management console of a user-mode Linux kernel. The UML
+ management console is a low-level interface to the kernel,
+ somewhat like the i386 SysRq interface. Since there is a
+ full-blown operating system under UML, there is much greater
+ flexibility possible than with the SysRq mechanism.</para>
+
+ </refsect1>
+ <refsect1>
+ <title>OPTIONS</title>
+
+ <variablelist>
+ <varlistentry>
+ <term><replaceable>socket</replaceable></term>
+ <listitem>
+ <para>The pathname of the socket to which to connect. This
+ is printed when UML boots, for example:
+ <screen>
+ mconsole initialized on /tmp/umlNJ32yL/mconsole
+ </screen>
+ </para>
+
+ <para>In this example, you would start uml_mconsole like
+ this:
+ <screen>
+ <userinput>uml_mconsole umlNJ32yL</userinput>
+ </screen>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><replaceable>command</replaceable></term>
+ <listitem>
+ <para>Any of the commands listed in the
+ “COMMANDS” section.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>COMMANDS</title>
+
+ <variablelist>
+ <varlistentry>
+ <term>version</term>
+ <listitem>
+ <para>Prints the UML version number.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <varlistentry>
+ <term>halt</term>
+ <listitem>
+ <para>Shuts down the UML system immediately, without syncing
+ disks or cleanly shutting down swap space.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <varlistentry>
+ <term>reboot</term>
+ <listitem>
+ <para>Reboots the UML system immediately, without syncing
+ disks or cleanly shutting down swap space.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <varlistentry>
+ <term>log <replaceable>string</replaceable></term>
+ <listitem>
+ <para>Cause UML to log <replaceable>string</replaceable> to
+ the kernel log.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <varlistentry>
+ <term>cad</term>
+ <listitem>
+ <para>Invokes the Control-Alt-Delete handler.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <varlistentry>
+ <term>sysrq <replaceable>letter</replaceable></term>
+ <listitem>
+ <para>Performs the SysRq action controlled by
+ <replaceable>letter</replaceable>.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <varlistentry>
+ <term>stop</term>
+ <listitem>
+ <para>Pauses UML. UML will do nothing until the 'go'
+ command is issued.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <varlistentry>
+ <term>go</term>
+ <listitem>
+ <para>Resumes execution after a 'stop' command.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <varlistentry>
+ <term>config <option><replaceable>device</replaceable></option></term>
+ <listitem>
+ <para>Adds a new device to the virtual machine, or queries
+ the configuration of an existing device. It takes one
+ argument, which is either the device to add, with the same
+ syntax as the kernel command line, or the name of an
+ existing device. For example:</para>
+
+ <informalexample>
+ <screen>
+<prompt>(mconsole)</prompt> <userinput>config ubd3=root_fs_debian22</userinput>
+
+OK
+ </screen>
+ </informalexample>
+
+ <informalexample>
+ <screen>
+<prompt>(mconsole)</prompt> <userinput>config ubd3</userinput>
+
+OK root_fs_debian22
+ </screen>
+ </informalexample>
+
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <varlistentry>
+ <term>remove</term>
+ <listitem>
+ <para>Deletes a device from the virtual machine. Its
+ argument is the name of the device to be removed. In the
+ case of the ubd driver, the removed block device must not be
+ mounted, swapped on, or otherwise open, and in the case of
+ the network driver, the device must be down.</para>
+
+ <informalexample>
+ <screen>
+<prompt>(mconsole)</prompt> <userinput>remove ubd3</userinput>
+
+OK
+ </screen>
+ </informalexample>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ </refsect1>
+
+ <refsect1>
+ <title>SEE ALSO</title>
+
+ <para>linux(1)</para>
+
+ <para>The <ulink
+ url="http://user-mode-linux.sourceforge.net/UserModeLinux-HOWTO.html"
+ type=alternate>UserModeLinux-HOWTO</ulink></para>
+ </refsect1>
+ <refsect1>
+ <title>AUTHOR</title>
+
+ <para>&dhpackage; was written by Jeff Dike and others.</para>
+
+ <para>This manual page was written by &dhusername; &dhemail; for
+ the &debian; system, based on material in the
+ UserModeLinux-HOWTO by Rusty Russell, and the uml_mconsole
+ source code.</para>
+
+ </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
Added: uml-utilities-20060110/uml-utilities/trunk/moo/uml_moo.sgml
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/moo/uml_moo.sgml 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/moo/uml_moo.sgml 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,115 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+ page: `docbook-to-man manpage.sgml > manpage.1'. You may view
+ the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+ less'. A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+ docbook-to-man $< > $@
+ -->
+
+ <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+ <!ENTITY dhfirstname "<firstname>Matt</firstname>">
+ <!ENTITY dhsurname "<surname>Zimmerman</surname>">
+ <!-- Please adjust the date whenever revising the manpage. -->
+ <!ENTITY dhdate "<date>December 5, 2001</date>">
+ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+ allowed: see man(7), man(1). -->
+ <!ENTITY dhsection "<manvolnum>1</manvolnum>">
+ <!ENTITY dhemail "<email>mdz at debian.org</email>">
+ <!ENTITY dhusername "Matt Zimmerman">
+ <!ENTITY dhucpackage "<refentrytitle>UML_MOO</refentrytitle>">
+ <!ENTITY dhpackage "uml_moo">
+
+ <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhemail;
+ </address>
+ <author>
+ &dhfirstname;
+ &dhsurname;
+ </author>
+ <copyright>
+ <year>2001</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+ <refmeta>
+ &dhucpackage;
+
+ &dhsection;
+ </refmeta>
+ <refnamediv>
+ <refname>&dhpackage;</refname>
+
+ <refpurpose>merge a COW file with its backing file</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+
+ <arg><replaceable>COW file</replaceable></arg>
+
+ <arg><replaceable>new_backing_file</replaceable></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This manual page documents briefly the
+ <command>&dhpackage;</command> command.</para>
+
+ <para>This manual page was written for the &debian; distribution
+ because the original program does not have a manual page.
+ Instead, it has documentation in HTML format; see below.</para>
+
+ <para><command>&dhpackage;</command> is a program to merge a COW
+ (copy-on-write) file with its backing file, and write the result
+ to a new backing file. This can be used periodically to update
+ the backing file with the changes made in the COW file.</para>
+
+ </refsect1>
+
+ <refsect1>
+ <title>SEE ALSO</title>
+
+ <para>The <ulink
+ url="http://user-mode-linux.sourceforge.net/UserModeLinux-HOWTO.html"
+ type=alternate>UserModeLinux-HOWTO</ulink></para>
+ </refsect1>
+ <refsect1>
+ <title>AUTHOR</title>
+
+ <para>&dhpackage; was written by RidgeRun,Inc
+ <email>glonnon at ridgerun.com</email></para>
+
+ <para>This manual page was written by &dhusername; &dhemail; for
+ the &debian; system, based on material in the
+ UserModeLinux-HOWTO by Rusty Russell.</para>
+
+ </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
Added: uml-utilities-20060110/uml-utilities/trunk/tunctl/tunctl.sgml
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/tunctl/tunctl.sgml 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/tunctl/tunctl.sgml 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,164 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+ page: `docbook-to-man manpage.sgml > manpage.1'. You may view
+ the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+ less'. A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+ docbook-to-man $< > $@
+ -->
+
+ <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+ <!ENTITY dhfirstname "<firstname>Matt</firstname>">
+ <!ENTITY dhsurname "<surname>Zimmerman</surname>">
+ <!-- Please adjust the date whenever revising the manpage. -->
+ <!ENTITY dhdate "<date>February 12, 2002</date>">
+ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+ allowed: see man(7), man(1). -->
+ <!ENTITY dhsection "<manvolnum>8</manvolnum>">
+ <!ENTITY dhemail "<email>mdz at debian.org</email>">
+ <!ENTITY dhusername "Matt Zimmerman">
+ <!ENTITY dhucpackage "<refentrytitle>TUNCTL</refentrytitle>">
+ <!ENTITY dhpackage "tunctl">
+
+ <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhemail;
+ </address>
+ <author>
+ &dhfirstname;
+ &dhsurname;
+ </author>
+ <copyright>
+ <year>2001</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+ <refmeta>
+ &dhucpackage;
+
+ &dhsection;
+ </refmeta>
+ <refnamediv>
+ <refname>&dhpackage;</refname>
+
+ <refpurpose>create and manage persistent TUN/TAP interfaces</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+
+ <command>&dhpackage;</command>
+
+ <arg choice=opt><option>-f</option> <replaceable>tun-clone-device</replaceable></arg>
+
+ <arg><option>-u</option> <replaceable>owner</replaceable></arg>
+ <arg><option>-t</option> <replaceable>device-name</replaceable></arg>
+
+ </cmdsynopsis>
+
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+
+ <arg choice=opt><option>-f</option> <replaceable>tun-clone-device</replaceable></arg>
+ <arg choice=req><option>-d</option> <replaceable>device-name</replaceable></arg>
+ </cmdsynopsis>
+
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This manual page documents briefly the
+ <command>&dhpackage;</command> command.</para>
+
+ <para>This manual page was written for the &debian; distribution
+ because the original program does not have a manual page.
+ Instead, it has documentation in HTML format; see below.</para>
+
+ <para><command>&dhpackage;</command> allows the host sysadmin to
+ preconfigure a TUN/TAP device for use by a particular user. That
+ user may open and use the device, but may not change any aspects
+ of the host side of the interface.</para>
+
+ </refsect1>
+
+ <refsect1>
+ <title>USAGE</title>
+
+ <para>To create an interface for use by a particular user, invoke
+ tunctl without the -d option:</para>
+
+ <informalexample>
+ <screen>
+ <prompt>#</prompt> <userinput>tunctl -u someuser</userinput>
+
+ Set 'tap0' persistent and owned by uid 500
+ </screen>
+ </informalexample>
+
+ <para>Then, configure the interface as normal:</para>
+
+ <informalexample>
+ <screen>
+ <prompt>#</prompt> <userinput>ifconfig tap0 192.168.0.254 up</userinput>
+
+ <prompt>#</prompt> <userinput>route add -host 192.168.0.253 dev tap0</userinput>
+
+ <prompt>#</prompt> <userinput>bash -c 'echo 1 > /proc/sys/net/ipv4/conf/tap0/proxy_arp'</userinput>
+
+ <prompt>#</prompt> <userinput>arp -Ds 192.168.0.253 eth0 pub</userinput>
+ </screen>
+ </informalexample>
+
+ <para>To delete the interface, use the -d option:</para>
+
+ <informalexample>
+ <screen>
+ <prompt>#</prompt> <userinput>tunctl -d tap0</userinput>
+
+ Set 'tap0' nonpersistent
+ </screen>
+ </informalexample>
+ </refsect1>
+
+ <refsect1>
+ <title>SEE ALSO</title>
+
+ <para>The <ulink
+ url="http://user-mode-linux.sourceforge.net/UserModeLinux-HOWTO.html"
+ type=alternate>UserModeLinux-HOWTO</ulink></para>
+ </refsect1>
+ <refsect1>
+ <title>AUTHOR</title>
+
+ <para>&dhpackage; was written by Jeff Dike
+ <email>jdike at karaya.com</email></para>
+
+ <para>This manual page was written by &dhusername; &dhemail; for
+ the &debian; system, based on examples from Jeff Dike.</para>
+
+ </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
Modified: uml-utilities-20060110/uml-utilities/trunk/uml_net/host.c
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/uml_net/host.c 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/uml_net/host.c 2006-01-12 14:21:38 UTC (rev 4)
@@ -91,7 +91,8 @@
int n;
n = sscanf(buf, "%32s %lx %*x %*x %*x %*x %*x", iface, &if_addr);
if(n != 2){
- sprintf(out, "Didn't parse /proc/net/route, got %d\n on '%s'", n, buf);
+ snprintf(out, sizeof(out),
+ "Didn't parse /proc/net/route, got %d\n on '%s'", n, buf);
add_output(output, out, -1);
return;
}
Modified: uml-utilities-20060110/uml-utilities/trunk/uml_net/uml_net.c
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/uml_net/uml_net.c 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/uml_net/uml_net.c 2006-01-12 14:21:38 UTC (rev 4)
@@ -91,7 +91,9 @@
exit(1);
}
sa.sa_handler = handler;
+#ifdef SA_NOCLDWAIT
sa.sa_flags &= ~SA_NOCLDWAIT;
+#endif
sa.sa_flags |= SA_RESTART;
if(sigaction(SIGCHLD, &sa, NULL) < 0){
perror("sigaction");
Deleted: uml-utilities-20060110/uml-utilities/trunk/uml_router/core
===================================================================
(Binary files differ)
Added: uml-utilities-20060110/uml-utilities/trunk/uml_router/uml_switch.sgml
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/uml_router/uml_switch.sgml 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/uml_router/uml_switch.sgml 2006-01-12 14:21:38 UTC (rev 4)
@@ -0,0 +1,165 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+ page: `docbook-to-man manpage.sgml > manpage.1'. You may view
+ the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+ less'. A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+ docbook-to-man $< > $@
+ -->
+
+ <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+ <!ENTITY dhfirstname "<firstname>Matt</firstname>">
+ <!ENTITY dhsurname "<surname>Zimmerman</surname>">
+ <!-- Please adjust the date whenever revising the manpage. -->
+ <!ENTITY dhdate "<date>December 5, 2001</date>">
+ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+ allowed: see man(7), man(1). -->
+ <!ENTITY dhsection "<manvolnum>1</manvolnum>">
+ <!ENTITY dhemail "<email>mdz at debian.org</email>">
+ <!ENTITY dhusername "Matt Zimmerman">
+ <!ENTITY dhucpackage "<refentrytitle>UML_SWITCH</refentrytitle>">
+ <!ENTITY dhpackage "uml_switch">
+
+ <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhemail;
+ </address>
+ <author>
+ &dhfirstname;
+ &dhsurname;
+ </author>
+ <copyright>
+ <year>2001</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+ <refmeta>
+ &dhucpackage;
+
+ &dhsection;
+ </refmeta>
+ <refnamediv>
+ <refname>&dhpackage;</refname>
+
+ <refpurpose>switch daemon for user-mode Linux</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+ <arg><option>-unix</option> <replaceable>control_socket</replaceable> <replaceable>data_socket</replaceable></arg>
+ <arg><option>-hub</option></arg>
+ <arg><option>-tap <replaceable>tun device</replaceable></option></arg>
+ <arg><option>-compat-v0</option></arg>
+ <arg><option>-daemon</option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This manual page documents briefly the
+ <command>&dhpackage;</command> program.</para>
+
+ <para>This manual page was written for the &debian; distribution
+ because the original program does not have a manual page.</para>
+
+ <para><command>&dhpackage;</command> is a daemon for managing a
+ virtual network between user-mode Linux systems, with no
+ connection to the host system's network.</para>
+
+ <para>It will listen for connections on a pair of UNIX domain
+ sockets, and forward packets between clients which connect to
+ them.</para>
+
+ </refsect1>
+ <refsect1>
+ <title>OPTIONS</title>
+
+ <variablelist>
+ <varlistentry>
+ <term><option>-unix <replaceable>control_socket</replaceable> <replaceable>data_socket</replaceable>
+ </option></term>
+ <listitem>
+ <para>Listen on the specified pair of sockets, instead of
+ the defaults.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-hub</option></term>
+ <listitem>
+ <para>Act like a hub. This means that packets received will
+ be broadcast over all virtual links. The default is to act
+ as a switch, where packets are only sent to the link
+ matching the destination MAC address of the packet.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-tap <replaceable>tap device</replaceable></option></term>
+ <listitem>
+ <para>Connect the switch to a dynamically created tap device
+ on the host</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-compat-v0</option></term>
+ <listitem>
+ <para>Specify control protocol version 0 compatibility.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-daemon</option></term>
+ <listitem>
+ <para>Run in the background as a daemon.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+ <refsect1>
+ <title>SEE ALSO</title>
+
+ <para>linux(1)</para>
+
+ <para>The <ulink
+ url="http://user-mode-linux.sourceforge.net/UserModeLinux-HOWTO.html"
+ type=alternate>UserModeLinux-HOWTO</ulink></para>
+
+ </refsect1>
+ <refsect1>
+ <title>AUTHOR</title>
+
+ <para>&dhpackage; was written by Jeff Dike and others.</para>
+
+ <para>This manual page was written by &dhusername; &dhemail; for
+ the &debian; system (but may be used by others). Permission is
+ granted to copy, distribute and/or modify this document under
+ the terms of the <acronym>GNU</acronym> Free Documentation
+ License, Version 1.1 or any later version published by the Free
+ Software Foundation; with no Invariant Sections, no Front-Cover
+ Texts and no Back-Cover Texts.</para>
+
+ </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
Deleted: uml-utilities-20060110/uml-utilities/trunk/uml_util.spec
===================================================================
--- uml-utilities-20060110/uml-utilities/trunk/uml_util.spec 2006-01-12 14:19:19 UTC (rev 3)
+++ uml-utilities-20060110/uml-utilities/trunk/uml_util.spec 2006-01-12 14:21:38 UTC (rev 4)
@@ -1,46 +0,0 @@
-# Generated by RPM Workshop. v0.1
-
-# Macro definitions
-%define ver 20040406
-%define rel 1
-
-Name: uml_utilities
-Version: %{ver}
-Release: %{rel}
-Copyright: GPL
-Packager: Someone
-URL: http://user-mode-linux.sourceforge.net/index.html
-Source: http://prdownloads.sourceforge.net/user-mode-linux/uml_utilities_%{ver}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{ver}-root
-Group: System
-Summary: Utilities for user-mode linux kernel
-
-%description
-This package contains the utilities for user-mode linux for networking,
-COW, etc.
-
-
-%prep
-%setup -n tools
-
-%build
-make DESTDIR=$RPM_BUILD_ROOT
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT
-
-%files
-%attr(755,root,root) %{_bindir}/jailtest
-#%attr(755,root,root) %{_bindir}/mkrootfs
-%attr(755,root,root) %{_bindir}/tunctl
-%attr(755,root,root) %{_bindir}/uml_mconsole
-%attr(755,root,root) %{_bindir}/uml_moo
-%attr(4755,root,root) %{_bindir}/uml_net
-%attr(755,root,root) %{_bindir}/uml_switch
-%attr(755,root,root) %dir %{_libdir}/uml
-%attr(755,root,root) %{_bindir}/uml_mkcow
-%attr(755,root,root) %{_bindir}/uml_watchdog
-#%attr(755,root,root) %{_libdir}/uml/functions
-%attr(755,root,root) %{_libdir}/uml/port-helper
-
-%clean
More information about the Pkg-uml-commit
mailing list