Changed description of upgrade function in WebUI

Details

Message ID	1468503361-16635-1-git-send-email-mayosemmel@gmail.com
State	Accepted, archived
Commit	7f613812726809744e749de6010d95131443f65b
Headers	show Return-Path: <franken-dev-bounces@freifunk.net> From: Jan Kraus <mayosemmel@googlemail.com> To: franken-dev@freifunk.net Subject: [PATCH] Changed description of upgrade function in WebUI Date: Thu, 14 Jul 2016 15:36:01 +0200 Message-Id: <1468503361-16635-1-git-send-email-mayosemmel@gmail.com> Cc: Jan Kraus <mayosemmel@gmail.com> Precedence: list Reply-To: Jan Kraus <mayosemmel@googlemail.com>, franken-dev@freifunk.net MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: franken-dev-bounces@freifunk.net Sender: "franken-dev" <franken-dev-bounces@freifunk.net>

Message ID

1468503361-16635-1-git-send-email-mayosemmel@gmail.com

State

Accepted, archived

Commit

7f613812726809744e749de6010d95131443f65b

Headers

show

Return-Path: <franken-dev-bounces@freifunk.net>
X-Original-To: patchwork@server2.heidler.eu
Delivered-To: patchwork@server2.heidler.eu
Received: from pferd.in-berlin.de (pferd.in-berlin.de
	[IPv6:2001:bf0:c000:a::1:122])
	by server2.heidler.eu (Postfix) with ESMTP id C344BC027B
	for <patchwork@server2.heidler.eu>;
	Thu, 14 Jul 2016 15:38:35 +0200 (CEST)
Received: from pferd.in-berlin.de (localhost [127.0.0.1])
	by pferd.in-berlin.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id
	u6EDaPpZ027647; Thu, 14 Jul 2016 15:36:25 +0200
X-Mailman-Handler: $Id: mm-handler 5100 2002-04-05 19:41:09Z bwarsaw $
Received: from einhorn-in.in-berlin.de (einhorn-in.in-berlin.de
	[192.109.42.16])
	by pferd.in-berlin.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id
	u6EDaNTQ027639
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256
	verify=NOT) for <franken-dev+freifunk.net@mailman1.in-berlin.de>;
	Thu, 14 Jul 2016 15:36:23 +0200
Received: from argali.in-berlin.de (argali.in-berlin.de [192.109.42.10])
	by einhorn-in.in-berlin.de (8.14.4/8.14.4/Debian-4) with ESMTP id
	u6EDaIii020834
	for <franken-dev@freifunk.net>; Thu, 14 Jul 2016 15:36:18 +0200
X-Envelope-From: mayosemmel@googlemail.com
X-Envelope-To: <franken-dev@freifunk.net>
Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com
	[74.125.82.67])
	by argali.in-berlin.de (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id
	u6EDaDM6018699
	(version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT)
	for <franken-dev@freifunk.net>; Thu, 14 Jul 2016 15:36:15 +0200
Received: by mail-wm0-f67.google.com with SMTP id o80so9245529wme.0
	for <franken-dev@freifunk.net>; Thu, 14 Jul 2016 06:36:14 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=googlemail.com; s=20120113;
	h=from:to:cc:subject:date:message-id;
	bh=menQV+L9J5v/PIJ8OmGvITJsXLe3g/G/NekD2sNGGlw=;
	b=n9T+6i5kWio984l9DFQM3QyQxBZwGia5PCuLUwqbKJoCu1IHmmPp2er9Y9VFfFKs7E
	wk9zKWSL/wFfA9a30k+y1SjJ2VHr505HkVEt0kSwqkhvB7/BHIV+tpJ8gn3YyOvUUEHS
	g/zx4oHMb3XlouiQg+rcrFBwzrqjqOOM1HAkIlyGWWUP2BjTrMkRTLPhUDFAjdFtl8DM
	//ZAPbh1CxBtVFl0kSvof+Y80fuYclmqKXSij4V9ZjzUEN/j0qXR1lsgpp2LATk9ZYnU
	pU2N38g7kw4nRWmiXJzYtcCoH0+w/kkDgd2wZgktg8VwBfHSWgRjGpaY/xyNqcbhwA17
	8N3Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:from:to:cc:subject:date:message-id;
	bh=menQV+L9J5v/PIJ8OmGvITJsXLe3g/G/NekD2sNGGlw=;
	b=cf38FnOwVnJBy7hpoujB4oGjbDsdIgW37lj9Yb/df3MiaAhzAwJraJnkcoBwW2iDXy
	jBHagm1yaPe6FOrK2bvqU6RE0w6eO483PeS2ngk2+I+Wg0J4UciAIYFtv0HrXkTUPWwE
	GM83/Hy3iVmtwQ1SNJIlxfJ0tny/BmDMjc67dUov66Abes7YJPQtj1ECQDOMrVPPmYEB
	y1kzF0WrbCzNFSFUUKKATERGFXfb+UWftSRjrSGy/94irXy+GiSLVtKWTV2LuNUPjV40
	apL8q4odvGqLDYJ7m2gIUp43lY/rXWzg3grhdDcyBSjWB+bqYQcXiaDk4Z+s2kMePAtG
	/Hsw==
X-Gm-Message-State: ALyK8tI2/J5+xyHHaT4PE7nggqIMrCsH70MMK1U3GJJ8P6f48WhFn1KNtv0sNvf5I2bBEg==
X-Received: by 10.28.111.213 with SMTP id c82mr25657916wmi.47.1468503373138; 
	Thu, 14 Jul 2016 06:36:13 -0700 (PDT)
Received: from mayosemmel-e6220.home.kraus.moe
	(dslb-092-074-108-183.092.074.pools.vodafone-ip.de. [92.74.108.183])
	by smtp.gmail.com with ESMTPSA id
	a2sm36698715wma.2.2016.07.14.06.36.12
	(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
	Thu, 14 Jul 2016 06:36:12 -0700 (PDT)
From: Jan Kraus <mayosemmel@googlemail.com>
X-Google-Original-From: Jan Kraus <mayosemmel@gmail.com>
To: franken-dev@freifunk.net
Subject: [PATCH] Changed description of upgrade function in WebUI
Date: Thu, 14 Jul 2016 15:36:01 +0200
Message-Id: <1468503361-16635-1-git-send-email-mayosemmel@gmail.com>
X-Mailer: git-send-email 2.1.4
X-Spam-Score: (-2.6) BAYES_00,SPF_PASS
Cc: Jan Kraus <mayosemmel@gmail.com>
X-BeenThere: franken-dev@freifunk.net
X-Mailman-Version: 2.1.15
Precedence: list
Reply-To: Jan Kraus <mayosemmel@googlemail.com>, franken-dev@freifunk.net
List-Id: <franken-dev-freifunk.net>
List-Unsubscribe: <http://lists.freifunk.net/mailman/options/franken-dev-freifunk.net>,
	<mailto:franken-dev-request@freifunk.net?subject=unsubscribe>
List-Archive: <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/>
List-Post: <mailto:franken-dev@freifunk.net>
List-Help: <mailto:franken-dev-request@freifunk.net?subject=help>
List-Subscribe: <http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net>,
	<mailto:franken-dev-request@freifunk.net?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Errors-To: franken-dev-bounces@freifunk.net
Sender: "franken-dev" <franken-dev-bounces@freifunk.net>

Commit Message

Jan Kraus July 14, 2016, 1:36 p.m.

Flashing of stock firmware is different for different devices.
At least on TP-Link Images it's not working via sysupgrade.

Signed-off-by: Jan Kraus <mayosemmel@gmail.com>
---
 src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html
index 601d97b..e9f2d07 100755
--- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html
+++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html
@@ -42,7 +42,7 @@  fi
 		<tr><th>Konfiguration&nbsp;erhalten:</th><td><input type="checkbox" name="keep_config" checked /></td></tr>
 		<tr><td colspan="2"><input type="submit" name="upgrade" value="Upgrade" /></td></tr>
 		<tr><td colspan="2"></td></tr>
-		<tr><td colspan="2">Hier kann ein Freifunk-Image verwendet werden (*-sysupgrade.bin) oder die Firmware des Routerherstellers.</td></tr>
+		<tr><td colspan="2">Hier kann ein Freifunk- oder OpenWRT-Image verwendet werden (*-sysupgrade.bin).</td></tr>
 	</table>
 </fieldset>
 </td><td>

Comments

Christian Dresel July 15, 2016, 9:44 p.m.

hi

Reviewed-by: Christian Dresel <fff@chrisi01.de>

mfg

Christian

On 14.07.2016 15:36, Jan Kraus wrote:
> Flashing of stock firmware is different for different devices.
> At least on TP-Link Images it's not working via sysupgrade.
>
> Signed-off-by: Jan Kraus <mayosemmel@gmail.com>
> ---
>  src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html
> index 601d97b..e9f2d07 100755
> --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html
> +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html
> @@ -42,7 +42,7 @@ fi
>  		<tr><th>Konfiguration&nbsp;erhalten:</th><td><input type="checkbox" name="keep_config" checked /></td></tr>
>  		<tr><td colspan="2"><input type="submit" name="upgrade" value="Upgrade" /></td></tr>
>  		<tr><td colspan="2"></td></tr>
> -		<tr><td colspan="2">Hier kann ein Freifunk-Image verwendet werden (*-sysupgrade.bin) oder die Firmware des Routerherstellers.</td></tr>
> +		<tr><td colspan="2">Hier kann ein Freifunk- oder OpenWRT-Image verwendet werden (*-sysupgrade.bin).</td></tr>
>  	</table>
>  </fieldset>
>  </td><td>

Tim Niemeyer July 16, 2016, 7:24 a.m.

Am Freitag, den 15.07.2016, 23:44 +0200 schrieb Christian Dresel:
> hi
> 
> Reviewed-by: Christian Dresel <fff@chrisi01.de>
Dem schließe ich mich an.

Und Applied.

Tim

> 
> mfg
> 
> Christian
> 
> On 14.07.2016 15:36, Jan Kraus wrote:
> > Flashing of stock firmware is different for different devices.
> > At least on TP-Link Images it's not working via sysupgrade.
> >
> > Signed-off-by: Jan Kraus <mayosemmel@gmail.com>
> > ---
> >  src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html
> > index 601d97b..e9f2d07 100755
> > --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html
> > +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html
> > @@ -42,7 +42,7 @@ fi
> >  		<tr><th>Konfiguration&nbsp;erhalten:</th><td><input type="checkbox" name="keep_config" checked /></td></tr>
> >  		<tr><td colspan="2"><input type="submit" name="upgrade" value="Upgrade" /></td></tr>
> >  		<tr><td colspan="2"></td></tr>
> > -		<tr><td colspan="2">Hier kann ein Freifunk-Image verwendet werden (*-sysupgrade.bin) oder die Firmware des Routerherstellers.</td></tr>
> > +		<tr><td colspan="2">Hier kann ein Freifunk- oder OpenWRT-Image verwendet werden (*-sysupgrade.bin).</td></tr>
> >  	</table>
> >  </fieldset>
> >  </td><td>
> 
> 
> -- 
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net