Please merge uml-utilities 20070815-1 from Debian Unstable

[Joe Jaxx]

Binary package hint: uml-utilities

Ubuntu Differences:

- debian/uml-utilities.init: create /var/run/uml-utilities if it does not exist (Closes: Malone #53609).

Changelog (With Merged Ubuntu Changes):

uml-utilities (20070815-1) unstable; urgency=low

  * New upstream version (Closes: #438457) (Closes: #393263)
  [Stefano Melchior]
    * added the humfsify man page
    * added the uml_mount man page
    * updated policy version in debian/control
    * added correction in the tunctl man page (Closes: #395020)
    * added LSB support with patch from David Härdeman (Closes: #385906)
  [Mattia Dongili]:
    * Remove obsolete MAKEDEV invocation and udev/makedev dependencies
      (Closes: #434161)
    * Create /var/run/uml-utilities if it doesn't exist at uml_switch startup
      (Closes: #434784)
    * set a decent name for the _maintenance_ team.
    * add UML_SWITCH_CTL to defaults file for easier customization.
    * add uml_mkcow and jail_uml manpages.
    * mention COW files advantages and how to see their actual
      disk usage in uml_moo and uml_mkcow manpages. (Closes: #173302)

 -- Mattia Dongili <email address hidden> Sun, 19 Aug 2007 15:39:38 +0900

uml-utilities (20060323-3ubuntu2) gutsy; urgency=low

  * debian/control: Update maintainer fields according to debian-
    maintainer-field spec.

 -- Martin Pitt <email address hidden> Wed, 15 Aug 2007 08:10:56 +0000

uml-utilities (20060323-3ubuntu1) edgy; urgency=low

  * debian/uml-utilities.init: create /var/run/uml-utilities if it does not
    exist (Closes: Malone #53609).

 -- Jeremie Corbier <email address hidden> Fri, 21 Jul 2006 14:24:52 +0200

[Joe Jaxx (joejaxx)]

Here is a debdiff with the merge completed.

[Joe Jaxx (joejaxx)]

Here is an updated debdiff wit the merge completed.

[Cesare Tirabassi (norsetto)]

Why is the status in progress?

[Cesare Tirabassi (norsetto)]

Can you please resubmit this as a sync? Thanks!

[Andrea Gasparini (gaspa)]

I think this is not a sync, it have also this change:

 * debian/uml-utilities.init: create /var/run/uml-utilities if it does not
    exist (Closes: Malone #53609).

that doesn't exists in debian.

[Cesare Tirabassi (norsetto)]

@Andrea

This change :

  * debian/uml-utilities.init: create /var/run/uml-utilities if it does not
    exist (Closes: Malone #53609).

applied to uml-utilities.init (in 20060323-3ubuntu1) as follows:

+UML_RUN_DIR=$(dirname $UML_SWITCH_CTL)
+
+test -d $UML_RUN_DIR || {
+ mkdir -p $UML_RUN_DIR
+ chown $UML_SWITCH_USER:$UML_SWITCH_USER $UML_RUN_DIR
+}
+

is covered by this change in 20070815-1:

    * Create /var/run/uml-utilities if it doesn't exist at uml_switch startup
      (Closes: #434784)

see this snippet:

UML_DIR=/var/run/uml-utilities
.
.
 # create $UML_DIR if it doesn't exist (RAMRUN=yes in /etc/default/rcS)
 if [ ! -d "$UML_DIR" ] ; then
  mkdir -p $UML_DIR
  chown uml-net:uml-net $UML_DIR
.
.

Note that the only difference is that the debian change only applies in the start case, which is actually more correct.
As a final check you may want to read the relative bug reports (where you have the confirmation that it is the same issue):

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=434784
https://bugs.launchpad.net/ubuntu/+source/uml-utilities/+bug/53609

[Andrea Gasparini (gaspa)]

yes, you're right ;)

[Walter Tautz (wtautz)]

Just a comment from a user. The current man page of tunctl on AMD64/Gutsy has NO mention
(probably true on other releases)
of the -b option. A rather useful option inside a script. I noticed it when I ran the following

tunctl -d
tunctl: option requires an argument -- d
Create: tunctl [-b] [-u owner] [-t device-name] [-f tun-clone-device]
Delete: tunctl -d device-name [-f tun-clone-device]

The default tun clone device is /dev/net/tun - some systems use
/dev/misc/net/tun instead

-b will result in brief output (just the device name)

which illustrates that it exists and I confirmed it really does do what it claims.

[Cesare Tirabassi (norsetto)]

@walter

can you report this as a separate bug?

Thanks.

[Cesare Tirabassi (norsetto)]

uml-utilities (20070815-1) unstable; urgency=low

  * New upstream version (Closes: #438457) (Closes: #393263)
  [Stefano Melchior]
    * added the humfsify man page
    * added the uml_mount man page
    * updated policy version in debian/control
    * added correction in the tunctl man page (Closes: #395020)
    * added LSB support with patch from David Härdeman (Closes: #385906)
  [Mattia Dongili]:
    * Remove obsolete MAKEDEV invocation and udev/makedev dependencies
      (Closes: #434161)
    * Create /var/run/uml-utilities if it doesn't exist at uml_switch startup
      (Closes: #434784)
    * set a decent name for the _maintenance_ team.
    * add UML_SWITCH_CTL to defaults file for easier customization.
    * add uml_mkcow and jail_uml manpages.
    * mention COW files advantages and how to see their actual
      disk usage in uml_moo and uml_mkcow manpages. (Closes: #173302)

 -- Martin Pitt < <email address hidden>> Tue, 04 Dec 2007 09:11:28 +0000