Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/openrc:master commit in: net/, init.d/, sh/
Date: Mon, 04 Jul 2011 22:27:06
Message-Id: 49f1a8702b49e4f1bf121bf22d4196e7199bacfa.vapier@gentoo
1 commit: 49f1a8702b49e4f1bf121bf22d4196e7199bacfa
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 4 22:27:00 2011 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 4 22:27:00 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=49f1a870
7
8 eat trailing whitespace
9
10 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
11
12 ---
13 init.d/modules.in | 4 ++--
14 net/ethtool.sh | 2 +-
15 sh/udhcpc-hook.sh.in | 4 ++--
16 3 files changed, 5 insertions(+), 5 deletions(-)
17
18 diff --git a/init.d/modules.in b/init.d/modules.in
19 index 631e2e5..e673763 100644
20 --- a/init.d/modules.in
21 +++ b/init.d/modules.in
22 @@ -23,11 +23,11 @@ start()
23 # remove any KV_EXTRA options to just get the full version
24 x=${KV%%-*}
25 # now slowly strip them
26 - while [ -n "$x" ] && [ "$x" != "$y" ]; do
27 + while [ -n "$x" ] && [ "$x" != "$y" ]; do
28 kv_variant_list="${kv_variant_list} $x"
29 y=$x
30 x=${x%.*}
31 - done
32 + done
33
34 local list= x= xx= y= args= mpargs= cnt=0 a=
35 for x in $kv_variant_list ; do
36
37 diff --git a/net/ethtool.sh b/net/ethtool.sh
38 index d4dc11e..21a22b6 100644
39 --- a/net/ethtool.sh
40 +++ b/net/ethtool.sh
41 @@ -29,7 +29,7 @@ ethtool_pre_start() {
42
43 # Skip everything if no arguments
44 [ -z "${args}" ] && continue
45 -
46 +
47 # Split on \n
48 local IFS="$__IFS"
49
50
51 diff --git a/sh/udhcpc-hook.sh.in b/sh/udhcpc-hook.sh.in
52 index a14cac9..1a58104 100644
53 --- a/sh/udhcpc-hook.sh.in
54 +++ b/sh/udhcpc-hook.sh.in
55 @@ -30,7 +30,7 @@ update_ntp()
56 {
57 peer_var "${PEER_NTP}" && return
58 [ -z "${ntpsrv}" ] && return
59 -
60 +
61 conf="# Generated by udhcpc for interface ${interface}\n"
62 conf="${conf}restrict default noquery notrust nomodify\n"
63 conf="${conf}restrict 127.0.0.1\n"
64 @@ -64,7 +64,7 @@ update_interface()
65 update_routes()
66 {
67 peer_var "${PEER_ROUTERS}" && return
68 -
69 +
70 if [ -n "${router}" ] ; then
71 metric=
72 [ -n "${IF_METRIC}" ] && metric="metric ${IF_METRIC}"