aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/console/command/config/delete.php
diff options
context:
space:
mode:
authorMáté Bartus <mate.bartus@gmail.com>2016-02-28 14:50:32 +0100
committerMáté Bartus <mate.bartus@gmail.com>2016-02-28 14:50:32 +0100
commit72bdbf52ccd0e504e69947e157d4d24d327d34a8 (patch)
tree4ec2ff54f2588c2332eac8f7115e363aae8408a7 /phpBB/phpbb/console/command/config/delete.php
parentf259a451bb99fc138bc3a753ee26903a20de5c54 (diff)
parentf0a33dca7255e2fb643d1a1e5fa4cfe42934fe2b (diff)
downloadforums-72bdbf52ccd0e504e69947e157d4d24d327d34a8.tar
forums-72bdbf52ccd0e504e69947e157d4d24d327d34a8.tar.gz
forums-72bdbf52ccd0e504e69947e157d4d24d327d34a8.tar.bz2
forums-72bdbf52ccd0e504e69947e157d4d24d327d34a8.tar.xz
forums-72bdbf52ccd0e504e69947e157d4d24d327d34a8.zip
Merge branch '3.2.x'
* 3.2.x: [ticket/14503] Enable superglobals in cli
Diffstat (limited to 'phpBB/phpbb/console/command/config/delete.php')
0 files changed, 0 insertions, 0 deletions
'>
1 files changed, 1 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post
index 43b7126e..8110d324 100755
--- a/sysconfig/network-scripts/ifup-post
+++ b/sysconfig/network-scripts/ifup-post
@@ -34,7 +34,7 @@ if [ "$DEVICETYPE" = ppp -a "$PEERDNS" != no -a -n "$DNS1" ] &&
# and do not know if sed is capable of this...
current_replacement="$DNS1"
next_replacement="$DNS2"
- while read answer < /etc/resolv.conf ; do
+ cat /etc/resolv.conf | while read answer ; do
case $answer in
nameserver*)
if [ -n "$current_replacement" ] ; then