← Back to branch summary

~ubuntu-branches/ubuntu/utopic/usb-modeswitch/utopic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/redirect_dispatcher_output.patch

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2014-04-07 11:39:41 UTC
  • mfrom: (17.1.11 sid)
  • Revision ID: package-import@ubuntu.com-20140407113941-b4dwfneyd07pgijf
Tags: 2.1.1+repack0-1ubuntu1
https://launchpad.net/bugs/1280546
https://launchpad.net/bugs/1155975
* Merge with Debian unstable; remaining changes: (LP: #1280546)
  - patch to rewrite dispatcher to C.
  - debian/patches/redirect_dispatcher_output.patch: redirect all dispatcher
    output when called from udev to /dev/null.
  - Replace libjim depends with libpipeline-dev, libudev-dev.
* Fixed some bugs in dispatcher rewrite. (LP: #1155975)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/redirect_dispatcher_output.patch
4
4
We really don't care about it anyway, and in some weird cases it causes the
5
5
dispatcher to crash.
6
6
 
7
 
Index: usb-modeswitch/usb_modeswitch.sh
 
7
---
 
8
 usb_modeswitch.sh |    4 ++--
 
9
 1 file changed, 2 insertions(+), 2 deletions(-)
 
10
 
 
11
Index: b/usb_modeswitch.sh
8
12
===================================================================
9
 
--- usb-modeswitch.orig/usb_modeswitch.sh       2012-02-09 01:16:23.704164000 -0500
10
 
+++ usb-modeswitch/usb_modeswitch.sh    2012-02-09 01:19:19.952673430 -0500
11
 
@@ -68,7 +68,7 @@
 
13
--- a/usb_modeswitch.sh
 
14
+++ b/usb_modeswitch.sh
 
15
@@ -68,7 +68,7 @@ case "$1" in
12
16
                if [ "$?" = "1" ]; then
13
17
                        . /lib/udev/hotplug.functions
14
18
                        wait_for_file /usr/sbin/usb_modeswitch_dispatcher
17
21
                fi
18
22
                exit 0
19
23
                ;;
20
 
@@ -77,7 +77,7 @@
21
 
 (
22
 
        . /lib/udev/hotplug.functions
23
 
        wait_for_file /usr/sbin/usb_modeswitch_dispatcher
24
 
-       exec usb_modeswitch_dispatcher --switch-mode $1 $0 &
25
 
+       exec usb_modeswitch_dispatcher --switch-mode $1 $0 >>/dev/null 2>&1 &
26
 
        exit 0
 
24
@@ -82,7 +82,7 @@ exec 1<&- 2<&- 5<&- 7<&-
 
25
                elif [ -d "/run/systemd/system/" ]; then # Test if systemd is running
 
26
                        exec /bin/systemctl --no-block start usb_modeswitch@$1.service
 
27
                else
 
28
-                       exec /usr/sbin/usb_modeswitch_dispatcher --switch-mode $1 &
 
29
+                       exec /usr/sbin/usb_modeswitch_dispatcher --switch-mode $1 >>/dev/null 2>&1 &
 
30
                fi
 
31
                exit 0
27
32
 ) &
28
 
 exit 0