← Back to branch summary

~ubuntu-branches/ubuntu/quantal/lxc/quantal-201208081743

« back to all changes in this revision

Viewing changes to debian/patches/0089-lxc-netstat-exec

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2012-06-11 15:46:25 UTC
  • Revision ID: package-import@ubuntu.com-20120611154625-s5yxhd86bti3klv8
Tags: 0.8.0~rc1-4ubuntu13
https://launchpad.net/bugs/1011603
https://launchpad.net/bugs/1006332
https://launchpad.net/bugs/1007483
https://launchpad.net/bugs/1011739
* 0086-lxc-unshare-zero-args: fix lxc-unshare segfaulting when no command
  is given (LP: #1011603)
* 0087-lxc-ls-dash: fix lxc-ls for containers whose names start with a
  dash  (LP: #1006332)
* 0088-ubuntu-template-flock: don't fail when flock is busy, just wait,
  so concurrent lxc-creates don't break.  (LP: #1007483)
* 0089-lxc-netstat-exec: fix lxc-netstat errors (LP: #1011739)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0089-lxc-netstat-exec
 
1
Description: Fix two errors in lxc-netstat
 
2
 s/lxc_name/name/
 
3
 --exec does not require an argument
 
4
Author: Serge Hallyn <serge.hallyn@ubuntu.com>
 
5
Forwarded: yes
 
6
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1011739
 
7
 
 
8
Index: lxc-0.8.0~rc1/src/lxc/lxc-netstat.in
 
9
===================================================================
 
10
--- lxc-0.8.0~rc1.orig/src/lxc/lxc-netstat.in   2012-06-11 17:34:27.000000000 +0000
 
11
+++ lxc-0.8.0~rc1/src/lxc/lxc-netstat.in        2012-06-11 17:50:31.774178554 +0000
 
12
@@ -19,7 +19,7 @@
 
13
 }
 
14
 
 
15
 shortoptions='hn:'
 
16
-longoptions='help,name:,exec:'
 
17
+longoptions='help,name:,exec'
 
18
 
 
19
 getopt=$(getopt -o $shortoptions --longoptions  $longoptions -- "$@")
 
20
 if [ $? != 0 ]; then
 
21
@@ -39,7 +39,7 @@
 
22
                ;;
 
23
            -n|--name)
 
24
                shift
 
25
-               lxc_name=$1
 
26
+               name=$1
 
27
                shift
 
28
                ;;
 
29
            --exec)