Commit 2e33879a authored by Franco Fichtner's avatar Franco Fichtner

firmware: fix and tweak wording of `up to'; clean up license foo while there

parent 34a9a200
...@@ -2,14 +2,8 @@ ...@@ -2,14 +2,8 @@
/* /*
Copyright (C) 2004-2008 Scott Ullrich Copyright (C) 2004-2008 Scott Ullrich
Copyright (C) 2008-2009 Ermal Lu?i Copyright (C) 2008-2009 Ermal Luçi
All rights reserved.
function interfaces_wireless_configure is
Copyright (C) 2005 Espen Johansen Copyright (C) 2005 Espen Johansen
All rights reserved.
originally part of m0n0wall (http://m0n0.ch/wall)
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
All rights reserved. All rights reserved.
...@@ -33,12 +27,6 @@ ...@@ -33,12 +27,6 @@
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
pfSense_BUILDER_BINARIES: /sbin/dhclient /bin/sh /usr/bin/grep /usr/bin/xargs /usr/bin/awk /usr/local/sbin/choparp
pfSense_BUILDER_BINARIES: /sbin/ifconfig /sbin/route /usr/sbin/ngctl /usr/sbin/arp /bin/kill /usr/local/sbin/mpd5
pfSense_BUILDER_BINARIES: /usr/local/sbin/dhcp6c
pfSense_MODULE: interfaces
*/ */
/* include all configuration functions */ /* include all configuration functions */
...@@ -1896,7 +1884,7 @@ EOD; ...@@ -1896,7 +1884,7 @@ EOD;
else else
interface_setup_pppoe_reset_file($ppp['if']); interface_setup_pppoe_reset_file($ppp['if']);
} }
/* wait for upto 10 seconds for the interface to appear (ppp(oe)) */ /* wait for up to 10 seconds for the interface to appear (ppp(oe)) */
$i = 0; $i = 0;
while($i < 10) { while($i < 10) {
exec("/sbin/ifconfig " . escapeshellarg($ppp['if']) . " 2>&1", $out, $ret); exec("/sbin/ifconfig " . escapeshellarg($ppp['if']) . " 2>&1", $out, $ret);
......
<?php <?php
/* $Id$ */
/* /*
Copyright (C) 2014 Deciso B.V. Copyright (C) 2014 Deciso B.V.
Copyright (C) 2008 Scott Ullrich <sullrich@gmail.com> Copyright (C) 2008 Scott Ullrich <sullrich@gmail.com>
...@@ -207,7 +207,7 @@ include("head.inc"); ...@@ -207,7 +207,7 @@ include("head.inc");
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
function checkupdate() { function checkupdate() {
jQuery('#updatestatus').html('<span class="text-info">Updating.... (takes upto 30 seconds) </span>'); jQuery('#updatestatus').html('<span class="text-info">Updating.... (may take up to 30 seconds) </span>');
jQuery.ajax({ jQuery.ajax({
type: "POST", type: "POST",
url: '/system_firmware_check.php', url: '/system_firmware_check.php',
......
<?php <?php
/* /*
Copyright (C) 2014 Deciso B.V. Copyright (C) 2014 Deciso B.V.
Copyright 2007 Scott Dale Copyright (C) 2007 Scott Dale
Copyright (C) 2004-2005 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net> Copyright (C) 2004-2005 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net>
and Jonathan Watt <jwatt@jwatt.org>. and Jonathan Watt <jwatt@jwatt.org>.
All rights reserved. All rights reserved.
...@@ -314,7 +315,7 @@ $filesystems = get_mounted_filesystems(); ...@@ -314,7 +315,7 @@ $filesystems = get_mounted_filesystems();
jQuery('#uname').html("<?php echo php_uname("a"); ?>"); jQuery('#uname').html("<?php echo php_uname("a"); ?>");
} }
function checkupdate() { function checkupdate() {
jQuery('#updatestatus').html('<span class="text-info">Updating.... (takes upto 30 seconds) </span>'); jQuery('#updatestatus').html('<span class="text-info">Updating.... (may take up to 30 seconds) </span>');
jQuery.ajax({ jQuery.ajax({
type: "POST", type: "POST",
url: '/widgets/widgets/system_information.widget.php', url: '/widgets/widgets/system_information.widget.php',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment