RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-02-18 13:06:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

6in4: don't use /dev/stdout for wget calls

Browse Source 
Busybox ash does not implement /dev/stdout, therfore any wget output
is written into a file /dev/stdout instead of onto the standard output.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44301
This commit is contained in:
Jo-Philipp Wich 2015-02-07 13:33:15 +00:00
parent 834417623d
commit 84c6ee610b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/network/ipv6/6in4/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2010-2014 OpenWrt.org # Copyright (C) 2010-2015 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=6in4 PKG_NAME:=6in4
PKG_VERSION:=18 PKG_VERSION:=19
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

6
package/network/ipv6/6in4/files/6in4.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# 6in4.sh - IPv6-in-IPv4 tunnel backend # 6in4.sh - IPv6-in-IPv4 tunnel backend
# Copyright (c) 2010-2014 OpenWrt.org # Copyright (c) 2010-2015 OpenWrt.org
[ -n "$INCLUDE_ONLY" ] || { [ -n "$INCLUDE_ONLY" ] || {
. /lib/functions.sh . /lib/functions.sh
@ -68,7 +68,7 @@ proto_6in4_setup() {
local http="http" local http="http"
local urlget="wget" local urlget="wget"
local urlget_opts="-qO/dev/stdout" local urlget_opts="-qO-"
local ca_path="${SSL_CERT_DIR-/etc/ssl/certs}" local ca_path="${SSL_CERT_DIR-/etc/ssl/certs}"
if [ -n "$(which curl)" ]; then if [ -n "$(which curl)" ]; then
@ -82,7 +82,7 @@ proto_6in4_setup() {
if [ "$http" = "http" ] && if [ "$http" = "http" ] &&
wget --version 2>&1 | grep -qF "+https"; then wget --version 2>&1 | grep -qF "+https"; then
urlget="wget" urlget="wget"
urlget_opts="-qO/dev/stdout --ca-directory=$ca_path" urlget_opts="-qO- --ca-directory=$ca_path"
http="https" http="https"
fi fi
[ "$http" = "https" -a -z "$(find $ca_path -name "*.0" 2>/dev/null)" ] && { [ "$http" = "https" -a -z "$(find $ca_path -name "*.0" 2>/dev/null)" ] && {