From: | "Tim Harder (radhermit)" <radhermit@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in sys-block/vblade/files: init.d-vblade.vblade0 |
Date: | Wed, 22 May 2013 05:32:41 |
Message-Id: | 20130522053235.6C6A72171E@flycatcher.gentoo.org |
1 | radhermit 13/05/22 05:32:35 |
2 | |
3 | Modified: init.d-vblade.vblade0 |
4 | Log: |
5 | Update deprecated init script variables (bug #405531). |
6 | |
7 | (Portage version: 2.2.0_alpha175/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) |
8 | |
9 | Revision Changes Path |
10 | 1.6 sys-block/vblade/files/init.d-vblade.vblade0 |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/vblade/files/init.d-vblade.vblade0?rev=1.6&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/vblade/files/init.d-vblade.vblade0?rev=1.6&content-type=text/plain |
14 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/vblade/files/init.d-vblade.vblade0?r1=1.5&r2=1.6 |
15 | |
16 | Index: init.d-vblade.vblade0 |
17 | =================================================================== |
18 | RCS file: /var/cvsroot/gentoo-x86/sys-block/vblade/files/init.d-vblade.vblade0,v |
19 | retrieving revision 1.5 |
20 | retrieving revision 1.6 |
21 | diff -u -r1.5 -r1.6 |
22 | --- init.d-vblade.vblade0 23 Jul 2009 17:53:58 -0000 1.5 |
23 | +++ init.d-vblade.vblade0 22 May 2013 05:32:35 -0000 1.6 |
24 | @@ -1,24 +1,23 @@ |
25 | #!/sbin/runscript |
26 | -# Copyright 1999-2009 Gentoo Foundation |
27 | +# Copyright 1999-2013 Gentoo Foundation |
28 | # Distributed under the terms of the GNU General Public License, v2 or later |
29 | |
30 | -opts="${opts} checkconfig" |
31 | +extra_commands="checkconfig" |
32 | |
33 | depend() { |
34 | need net |
35 | } |
36 | |
37 | # bug #218043 |
38 | - |
39 | - if [ ! -f /etc/init.d/sysfs ]; then |
40 | - conf="$(add_suffix /etc/conf.d/vblade)" |
41 | - [[ -e "${conf}" ]] && source "${conf}" |
42 | - vblade_name="${myservice#*.}" |
43 | - else |
44 | - conf="/etc/conf.d/vblade" |
45 | - [[ -e "${conf}" ]] && source "${conf}" |
46 | - vblade_name="${RC_SVCNAME#*.}" |
47 | - fi |
48 | +if [ ! -f /etc/init.d/sysfs ]; then |
49 | + conf="$(add_suffix /etc/conf.d/vblade)" |
50 | + [[ -e "${conf}" ]] && source "${conf}" |
51 | + vblade_name="${myservice#*.}" |
52 | +else |
53 | + conf="/etc/conf.d/vblade" |
54 | + [[ -e "${conf}" ]] && source "${conf}" |
55 | + vblade_name="${RC_SVCNAME#*.}" |
56 | +fi |
57 | |
58 | vblade_conf_variable="config_${vblade_name}" |
59 | vblade_conf="${!vblade_conf_variable}" |
60 | @@ -37,7 +36,6 @@ |
61 | export shelf slot netif src |
62 | } |
63 | |
64 | - |
65 | checkconfig() { |
66 | if [ -z "${vblade_conf}" ]; then |
67 | eerror "vblade configuration not specified for ${vblade_name}" |