diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-21 22:39:42 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-21 22:39:42 +0100 |
| commit | 8ed9be3faccb865204de46d2a8ed3e96e59281b6 (patch) | |
| tree | 77ba4c90cda569048bc9ce2e414ede1567130c88 /gnu/packages/patches/usb-modeswitch-accept-config-arg.patch | |
| parent | 36930b2463fc933e7c5580f49413dbd14cf1df48 (diff) | |
| parent | 715110a8a2e9e4b1a89635950744eb5260b8ee7f (diff) | |
| download | guix-patches-8ed9be3faccb865204de46d2a8ed3e96e59281b6.tar guix-patches-8ed9be3faccb865204de46d2a8ed3e96e59281b6.tar.gz | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/patches/usb-modeswitch-accept-config-arg.patch')
| -rw-r--r-- | gnu/packages/patches/usb-modeswitch-accept-config-arg.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/gnu/packages/patches/usb-modeswitch-accept-config-arg.patch b/gnu/packages/patches/usb-modeswitch-accept-config-arg.patch deleted file mode 100644 index 9c050f7ee6..0000000000 --- a/gnu/packages/patches/usb-modeswitch-accept-config-arg.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- old/usb_modeswitch.tcl 1970-01-01 01:00:00.000000000 +0100 -+++ usb_modeswitch.tcl 2019-06-12 08:39:42.140000000 +0200 -@@ -41,7 +41,7 @@ - global scsi usb config match device flags setup devdir loginit - - set flags(config) "" --Log "[ParseGlobalConfig]" -+Log "[ParseGlobalConfig $argv]" - - if {$flags(stordelay) > 0} { - SetStorageDelay $flags(stordelay) -@@ -496,9 +496,21 @@ - # end of proc {MatchDevice} - - --proc {ParseGlobalConfig} {} { -+proc {ParseGlobalConfig} {argv} { - - global flags -+ -+set configFileParam "" -+for {set i 0} {$i < [llength $argv]} {incr i} { -+ switch -glob -- [set v [lindex $argv $i]] { -+ --config-file=* { -+ set configFileParam $v -+ } -+ } -+} -+if {$configFileParam != ""} { -+ set configFile [string range $configFileParam [string length "--config-file="] end] -+} else { - set configFile "" - set places [list /etc/usb_modeswitch.conf /etc/sysconfig/usb_modeswitch /etc/default/usb_modeswitch] - foreach cfg $places { -@@ -507,6 +519,7 @@ - break - } - } -+} - if {$configFile == ""} {return} - - set rc [open $configFile r] |