| 1 |
vapier 08/03/29 19:47:55 |
| 2 |
|
| 3 |
Modified: dhcp-3.0.3-dhclient-ntp.patch |
| 4 |
dhcp-3.1.0a1-dhclient-resolvconf.patch |
| 5 |
dhcp-3.0.3-dhclient-resolvconf.patch |
| 6 |
Log: |
| 7 |
Convert `echo -e` to `printf` #208558 by Davide Pesavento. |
| 8 |
(Portage version: 2.2_pre5) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.4 net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch?rev=1.4&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch?rev=1.4&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch?r1=1.3&r2=1.4 |
| 16 |
|
| 17 |
Index: dhcp-3.0.3-dhclient-ntp.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch,v |
| 20 |
retrieving revision 1.3 |
| 21 |
retrieving revision 1.4 |
| 22 |
diff -u -r1.3 -r1.4 |
| 23 |
--- dhcp-3.0.3-dhclient-ntp.patch 22 Mar 2006 17:49:30 -0000 1.3 |
| 24 |
+++ dhcp-3.0.3-dhclient-ntp.patch 29 Mar 2008 19:47:54 -0000 1.4 |
| 25 |
@@ -30,7 +30,7 @@ |
| 26 |
+ done |
| 27 |
+ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n" |
| 28 |
+ conf="${conf}logfile /var/log/ntp.log\n" |
| 29 |
-+ echo -e "${conf}" > /etc/ntp.conf |
| 30 |
++ printf "${conf}" > /etc/ntp.conf |
| 31 |
+ chmod 644 /etc/ntp.conf |
| 32 |
+ fi |
| 33 |
+ fi |
| 34 |
@@ -59,7 +59,7 @@ |
| 35 |
+ done |
| 36 |
+ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n" |
| 37 |
+ conf="${conf}logfile /var/log/ntp.log\n" |
| 38 |
-+ echo -e "${conf}" > /etc/ntp.conf |
| 39 |
++ printf "${conf}" > /etc/ntp.conf |
| 40 |
+ chmod 644 /etc/ntp.conf |
| 41 |
+ fi |
| 42 |
+ fi |
| 43 |
@@ -90,7 +90,7 @@ |
| 44 |
+ done |
| 45 |
+ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n" |
| 46 |
+ conf="${conf}logfile /var/log/ntp.log\n" |
| 47 |
-+ echo -e "${conf}" > /etc/ntp.conf |
| 48 |
++ printf "${conf}" > /etc/ntp.conf |
| 49 |
+ chmod 644 /etc/ntp.conf |
| 50 |
+ fi |
| 51 |
+ fi |
| 52 |
@@ -119,7 +119,7 @@ |
| 53 |
+ done |
| 54 |
+ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n" |
| 55 |
+ conf="${conf}logfile /var/log/ntp.log\n" |
| 56 |
-+ echo -e "${conf}" > /etc/ntp.conf |
| 57 |
++ printf "${conf}" > /etc/ntp.conf |
| 58 |
+ chmod 644 /etc/ntp.conf |
| 59 |
+ fi |
| 60 |
+ fi |
| 61 |
@@ -148,7 +148,7 @@ |
| 62 |
+ done |
| 63 |
+ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n" |
| 64 |
+ conf="${conf}logfile /var/log/ntp.log\n" |
| 65 |
-+ echo -e "${conf}" > /etc/ntp.conf |
| 66 |
++ printf "${conf}" > /etc/ntp.conf |
| 67 |
+ chmod 644 /etc/ntp.conf |
| 68 |
+ fi |
| 69 |
+ fi |
| 70 |
@@ -177,7 +177,7 @@ |
| 71 |
+ done |
| 72 |
+ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n" |
| 73 |
+ conf="${conf}logfile /var/log/ntp.log\n" |
| 74 |
-+ echo -e "${conf}" > /etc/ntp.conf |
| 75 |
++ printf "${conf}" > /etc/ntp.conf |
| 76 |
+ chmod 644 /etc/ntp.conf |
| 77 |
+ fi |
| 78 |
+ fi |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
1.2 net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch |
| 83 |
|
| 84 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch?rev=1.2&view=markup |
| 85 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch?rev=1.2&content-type=text/plain |
| 86 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch?r1=1.1&r2=1.2 |
| 87 |
|
| 88 |
Index: dhcp-3.1.0a1-dhclient-resolvconf.patch |
| 89 |
=================================================================== |
| 90 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch,v |
| 91 |
retrieving revision 1.1 |
| 92 |
retrieving revision 1.2 |
| 93 |
diff -u -r1.1 -r1.2 |
| 94 |
--- dhcp-3.1.0a1-dhclient-resolvconf.patch 7 Sep 2006 19:53:36 -0000 1.1 |
| 95 |
+++ dhcp-3.1.0a1-dhclient-resolvconf.patch 29 Mar 2008 19:47:54 -0000 1.2 |
| 96 |
@@ -24,9 +24,9 @@ |
| 97 |
+ conf="${conf}nameserver $nameserver\n" |
| 98 |
+ done |
| 99 |
+ if [ -x /sbin/resolvconf ]; then |
| 100 |
-+ echo -e "$conf" | resolvconf -a "$interface" |
| 101 |
++ printf "$conf" | resolvconf -a "$interface" |
| 102 |
+ else |
| 103 |
-+ echo -e "$conf" > /etc/resolv.conf |
| 104 |
++ printf "$conf" > /etc/resolv.conf |
| 105 |
+ chmod 644 /etc/resolv.conf |
| 106 |
+ fi |
| 107 |
fi |
| 108 |
@@ -84,9 +84,9 @@ |
| 109 |
- if [ $exit_status -ne 0 ]; then |
| 110 |
- $LOGGER "Error while writing new /etc/resolv.conf." |
| 111 |
+ if [ -x /sbin/resolvconf ]; then |
| 112 |
-+ echo -e "$conf" | resolvconf -a "$interface" |
| 113 |
++ printf "$conf" | resolvconf -a "$interface" |
| 114 |
+ else |
| 115 |
-+ echo -e "$conf" > /etc/resolv.conf |
| 116 |
++ printf "$conf" > /etc/resolv.conf |
| 117 |
+ chmod 644 /etc/resolv.conf |
| 118 |
fi |
| 119 |
fi |
| 120 |
@@ -118,9 +118,9 @@ |
| 121 |
+ conf="${conf}nameserver $nameserver\n" |
| 122 |
+ done |
| 123 |
+ if [ -x /sbin/resolvconf ]; then |
| 124 |
-+ echo -e "$conf" | resolvconf -a "$interface" |
| 125 |
++ printf "$conf" | resolvconf -a "$interface" |
| 126 |
+ else |
| 127 |
-+ echo -e "$conf" > /etc/resolv.conf |
| 128 |
++ printf "$conf" > /etc/resolv.conf |
| 129 |
+ chmod 644 /etc/resolv.conf |
| 130 |
+ fi |
| 131 |
fi |
| 132 |
@@ -158,9 +158,9 @@ |
| 133 |
+ conf="${conf}nameserver $nameserver\n" |
| 134 |
+ done |
| 135 |
+ if [ -x /sbin/resolvconf ]; then |
| 136 |
-+ echo -e "$conf" | resolvconf -a "$interface" |
| 137 |
++ printf "$conf" | resolvconf -a "$interface" |
| 138 |
+ else |
| 139 |
-+ echo -e "$conf" > /etc/resolv.conf |
| 140 |
++ printf "$conf" > /etc/resolv.conf |
| 141 |
+ chmod 644 /etc/resolv.conf |
| 142 |
+ fi |
| 143 |
fi |
| 144 |
@@ -198,9 +198,9 @@ |
| 145 |
+ conf="${conf}nameserver $nameserver\n" |
| 146 |
+ done |
| 147 |
+ if [ -x /sbin/resolvconf ]; then |
| 148 |
-+ echo -e "$conf" | resolvconf -a "$interface" |
| 149 |
++ printf "$conf" | resolvconf -a "$interface" |
| 150 |
+ else |
| 151 |
-+ echo -e "$conf" > /etc/resolv.conf |
| 152 |
++ printf "$conf" > /etc/resolv.conf |
| 153 |
+ chmod 644 /etc/resolv.conf |
| 154 |
+ fi |
| 155 |
fi |
| 156 |
@@ -238,9 +238,9 @@ |
| 157 |
+ conf="${conf}nameserver $nameserver\n" |
| 158 |
+ done |
| 159 |
+ if [ -x /sbin/resolvconf ]; then |
| 160 |
-+ echo -e "$conf" | resolvconf -a "$interface" |
| 161 |
++ printf "$conf" | resolvconf -a "$interface" |
| 162 |
+ else |
| 163 |
-+ echo -e "$conf" > /etc/resolv.conf |
| 164 |
++ printf "$conf" > /etc/resolv.conf |
| 165 |
+ chmod 644 /etc/resolv.conf |
| 166 |
+ fi |
| 167 |
fi |
| 168 |
|
| 169 |
|
| 170 |
|
| 171 |
1.6 net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch |
| 172 |
|
| 173 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch?rev=1.6&view=markup |
| 174 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch?rev=1.6&content-type=text/plain |
| 175 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch?r1=1.5&r2=1.6 |
| 176 |
|
| 177 |
Index: dhcp-3.0.3-dhclient-resolvconf.patch |
| 178 |
=================================================================== |
| 179 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch,v |
| 180 |
retrieving revision 1.5 |
| 181 |
retrieving revision 1.6 |
| 182 |
diff -u -r1.5 -r1.6 |
| 183 |
--- dhcp-3.0.3-dhclient-resolvconf.patch 23 May 2006 13:03:28 -0000 1.5 |
| 184 |
+++ dhcp-3.0.3-dhclient-resolvconf.patch 29 Mar 2008 19:47:54 -0000 1.6 |
| 185 |
@@ -19,9 +19,9 @@ |
| 186 |
+ conf="${conf}nameserver $nameserver\n" |
| 187 |
+ done |
| 188 |
+ if [ -x /sbin/resolvconf ]; then |
| 189 |
-+ echo -e "$conf" | resolvconf -a "$interface" |
| 190 |
++ printf "$conf" | resolvconf -a "$interface" |
| 191 |
+ else |
| 192 |
-+ echo -e "$conf" > /etc/resolv.conf |
| 193 |
++ printf "$conf" > /etc/resolv.conf |
| 194 |
+ chmod 644 /etc/resolv.conf |
| 195 |
+ fi |
| 196 |
+ fi |
| 197 |
@@ -60,9 +60,9 @@ |
| 198 |
+ conf="${conf}nameserver $nameserver\n" |
| 199 |
done |
| 200 |
+ if [ -x /sbin/resolvconf ]; then |
| 201 |
-+ echo -e "$conf" | resolvconf -a "$interface" |
| 202 |
++ printf "$conf" | resolvconf -a "$interface" |
| 203 |
+ else |
| 204 |
-+ echo -e "$conf" > /etc/resolv.conf |
| 205 |
++ printf "$conf" > /etc/resolv.conf |
| 206 |
+ chmod 644 /etc/resolv.conf |
| 207 |
+ fi |
| 208 |
fi |
| 209 |
@@ -90,9 +90,9 @@ |
| 210 |
+ conf="${conf}nameserver $nameserver\n" |
| 211 |
+ done |
| 212 |
+ if [ -x /sbin/resolvconf ]; then |
| 213 |
-+ echo -e "$conf" | resolvconf -a "$interface" |
| 214 |
++ printf "$conf" | resolvconf -a "$interface" |
| 215 |
+ else |
| 216 |
-+ echo -e "$conf" > /etc/resolv.conf |
| 217 |
++ printf "$conf" > /etc/resolv.conf |
| 218 |
+ chmod 644 /etc/resolv.conf |
| 219 |
+ fi |
| 220 |
+ fi |
| 221 |
@@ -120,9 +120,9 @@ |
| 222 |
+ conf="${conf}nameserver $nameserver\n" |
| 223 |
+ done |
| 224 |
+ if [ -x /sbin/resolvconf ]; then |
| 225 |
-+ echo -e "$conf" | resolvconf -a "$interface" |
| 226 |
++ printf "$conf" | resolvconf -a "$interface" |
| 227 |
+ else |
| 228 |
-+ echo -e "$conf" > /etc/resolv.conf |
| 229 |
++ printf "$conf" > /etc/resolv.conf |
| 230 |
+ chmod 644 /etc/resolv.conf |
| 231 |
+ fi |
| 232 |
+ fi |
| 233 |
@@ -150,9 +150,9 @@ |
| 234 |
+ conf="${conf}nameserver $nameserver\n" |
| 235 |
+ done |
| 236 |
+ if [ -x /sbin/resolvconf ]; then |
| 237 |
-+ echo -e "$conf" | resolvconf -a "$interface" |
| 238 |
++ printf "$conf" | resolvconf -a "$interface" |
| 239 |
+ else |
| 240 |
-+ echo -e "$conf" > /etc/resolv.conf |
| 241 |
++ printf "$conf" > /etc/resolv.conf |
| 242 |
+ chmod 644 /etc/resolv.conf |
| 243 |
+ fi |
| 244 |
+ fi |
| 245 |
@@ -180,9 +180,9 @@ |
| 246 |
+ conf="${conf}nameserver $nameserver\n" |
| 247 |
+ done |
| 248 |
+ if [ -x /sbin/resolvconf ]; then |
| 249 |
-+ echo -e "$conf" | resolvconf -a "$interface" |
| 250 |
++ printf "$conf" | resolvconf -a "$interface" |
| 251 |
+ else |
| 252 |
-+ echo -e "$conf" > /etc/resolv.conf |
| 253 |
++ printf "$conf" > /etc/resolv.conf |
| 254 |
+ chmod 644 /etc/resolv.conf |
| 255 |
+ fi |
| 256 |
+ fi |
| 257 |
|
| 258 |
|
| 259 |
|
| 260 |
-- |
| 261 |
gentoo-commits@l.g.o mailing list |
Archives