diff options
| author | Rod Whitby <rod@whitby.id.au> | 2004-12-26 00:47:19 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2004-12-26 00:47:19 +0000 |
| commit | 60501ecd3fe71fd3821489dd749238678e2bdd98 (patch) | |
| tree | faeb48696042f353e6a13eafdae4046cdaa15f69 /packages/nslu2-binary-only | |
| parent | 01c0bc2e7cb8e6ddf63f513181210762335208d0 (diff) | |
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/slug/openembedded
2004/12/26 11:16:53+10:30 (none)!rwhitby
Unslung 3.15-alpha, with an improved switchbox, and confirmation dialogs for maintenance mode
BKrev: 41ce0a17xiLVTaQgH7jrrEudgkOddw
Diffstat (limited to 'packages/nslu2-binary-only')
5 files changed, 307 insertions, 7 deletions
diff --git a/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb b/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb index 2c333c71d5..fb6b1c066d 100644 --- a/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb +++ b/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb @@ -2,9 +2,9 @@ SECTION = "base" DEPENDS = "" PACKAGES = "" INHIBIT_DEFAULT_DEPS = "1" -PR = "r7" +PR = "r9" -SRC_URI = "http://nslu.sf.net/downloads/switchbox-3.6.tar.gz" +SRC_URI = "http://nslu.sf.net/downloads/switchbox-3.8.tar.gz" S = "${WORKDIR}" python () { diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/maintmode.cgi b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/maintmode.cgi index ca1c037160..157f6c1b82 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/maintmode.cgi +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/maintmode.cgi @@ -5,9 +5,8 @@ echo "Content-type: text/html <HTML> <HEAD> <TITLE>TOGGLING MAINTENANCE MODE</TITLE> </HEAD> <BODY> <H1>" if [ -f /$FLAG ] ; then echo "REBOOTING IN NORMAL MODE" - mkdir /mnt/maint - mount -t jffs2 /dev/mtdblock4 /mnt/maint - rm /mnt/maint/$FLAG + mount -t jffs2 /dev/mtdblock4 /mnt/repair + rm /mnt/repair/$FLAG else echo "REBOOTING IN MAINTENANCE MODE" touch /$FLAG diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/upgrade-maint.htm b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/upgrade-maint.htm index e69de29bb2..887f1c68e7 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/upgrade-maint.htm +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/upgrade-maint.htm @@ -0,0 +1,174 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html><head><title>Upgrade Firmware</title> +<LINK REL="stylesheet" TYPE="text/css" HREF="../ig_n.css"> +<meta HTTP-EQUIV="Expires" CONTENT="Mon, 06 Jan 1990 00:00:01 GMT"> +<script language="JavaScript" type="text/javascript" src="../stdlib.js"></script> +<script language="JavaScript" type="text/javascript" src="../message.js"></script> +<script language="JavaScript" type="text/javascript"> +<!-- Start Script + +function checkValue() +{ + var cf=document.upgrade; + + if(cf.upfilename.value.length == 0) + { + alert("Please select one file to be upgraded!"); + return; + } + if(!confirm("The upgrade progress will take 5 minutes.\nClick OK to continue, Cancel to abort.")) + return; + cf.todo.value = "upload"; + cf.finish.value = "no"; + cf.submit(); + return; +} + +// end script --> +</script> + +<script language="JavaScript" type="text/javascript"> +<!-- Start Script + +function checkMaint() +{ + var mt=document.maintmode; + + if(!confirm("Reboot to Normal Mode will take 5 minutes.\nClick OK to continue, Cancel to abort.")) + return; + mt.submit(); + return; +} +// end script --> +</script> +</head> + +<body bgcolor="white" onLoad="showMsg()" marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<FORM name="maintmode" method="post" action="maintmode.cgi" ENCTYPE="multipart/form-data"></FORM> +<FORM name="upgrade" method="post" action="upgrade.cgi" ENCTYPE="multipart/form-data"> +<DIV align="center"> +<table border="0" cellpadding="0" cellspacing="0" width="750" align="center"> +<tr> + <td width="165"><img border="0" src="../linksys.gif" width="165" height="57"></td> + <td width="585" colspan="2" bgcolor="#6666CC" valign="bottom" align="right"><span class="fwversion">Firmware + Version: @ds_sw_version#</span> </td> +</tr> + +<tr> + <td colspan="3" height="11" bgcolor="black"><img src="../tborder.gif" width="750" height="11" alt="" border="0"></td> +</tr> + +<TR> + <TD width="165" bgcolor="black" align="center"><h3>Upgrade</h3></td> + <td width="585" colspan="2" bgcolor="#6666cc" valign="top"> + <table border="0" cellspacing="0" cellpadding="0" width="100%"> + <tr> + <td align="right" class="pname" height="25" colspan="5">Network Storage Link for USB 2.0 Disks </td> + <td align="center" width="100" class="mname">NSLU2</td> + </tr> + <tr bgcolor="black"> + <td colspan="6" height="3"><img src="TRANSPAR.GIF" width="1" height="3" alt="" border="0"></td> + </tr> + <tr> + <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="8" alt="" border="0"></td> + <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> + <td align="center" height="1"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> + <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> + <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> + <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> + </tr> + + <tr> + <td align="center" height="25" bgcolor="black" width="100"><a href="/index.cgi" class="mainmenu">Home</a></td> + <td align="center" height="25" bgcolor="black" width="100"><a href="/user_pass.cgi" class="mainmenu">User<br> password</a></td> + <td align="center" height="25" width="100"><span class="mainmenu">Administration</span></td> + <td align="center" height="25" bgcolor="black" width="100"><a href="/userman_fs.htm" class="mainmenu">User Guide</a></td> + <td align="center" height="25" bgcolor="black" width="120"><a href="http://www.linksys.com" class="mainmenu" target="new_win">Linksys Web</a></td> + <td align="center" height="25" bgcolor="black"> </td> + </tr> + <tr> + <td height="25" width="130"> </td> + <td height="25" colspan="5"> + <a href="/Management/file_sharing.cgi?next_file=groups.htm" class="submenu">Groups</a> <span class="divider"> | </span> + <a href="/Management/file_sharing.cgi?next_file=shares.htm" class="submenu">Shares</a> <span class="divider"> | </span> + <a href="/Management/sh_backup.cgi?next_file=backup.htm" class="submenu">Backup</a> <span class="divider"> | </span> + <a href="/Management/disk_fs.htm" class="submenu">Disk</a> <span class="divider"> | </span> + <span class="tabtitle">Upgrade</span> <span class="divider"> | </span> + <a href="/Management/setup.cgi?next_file=lan.htm" class="submenu">Setup</a></td> + </tr> + </table> + + </td> +</tr> + +<tr> + <td colspan="3" bgcolor="#e7e7e7" height="6"><img src="TRANSPAR.GIF" width="1" height="6" alt="" border="0"></td> +</tr> + + +<tr> + <th width="165" height="24">Current Firmware </th> + <td width="409"><img src="TRANSPAR.GIF" width="409" height="6" alt="" border="0"></td> + <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="24" width="15"></td> +</tr> +<tr> + <td bgcolor="#e7e7e7" align="right"><img border="0" src="../UI_04.gif" width="8" hspace="0" vspace="0" height="80"></td> + <td width="409"><div class="std"><table border=0 cellspacing=0 cellpadding=4> + <tr> + <td nowrap>Current Firmware Version:</td> + <td nowrap>@ds_sw_version# </td></tr> + <tr><td> + <div align="left"><a href="http://www.linksys.com" target="new_win"><img src="button_checkupdate.jpg" width="107" height="20" alt="" border="0"></a></div> + </td> + </tr> + </table></div> </td> + <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="80" width="15"></td> +</tr> + +<tr> + <th width="165" height="24">Upgrade </th> + <td width="409"><img src="TRANSPAR.GIF" width="409" height="6" alt="" border="0"></td> + <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="24" width="15"></td> +</tr> +<tr> + <td bgcolor="#e7e7e7" align="right"><img border="0" src="../UI_04.gif" width="8" hspace="0" vspace="0" height="120"></td> + <td width="409"><div class="std"><table border=0 cellspacing=0 cellpadding=4> + <tr> + <td nowrap valign="top">Upgrade File: </td> + <td nowrap><input type="file" name="upfilename" value="@upfilename#" size="30" maxlength="255"></td> + </tr> + <tr> + <td colspan="2" align="left" class="smsg">Do not power-off the Network Storage + Link while it is<br> + being upgraded!</td> + </tr> + </table></div> </td> + <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="120" width="15"></td> +</tr> + +<tr> + <td bgcolor="#e7e7e7" height="30" align="right"><img border="0" src="../UI_04.gif" width="8" hspace="0" vspace="0" height="30"></td> + <td height="30"> </td> + <td rowspan="2" valign="bottom" bgcolor="#6666cc" height="64"><img src="../cisco.gif" hspace="0" vspace="0"></td> +</tr> + +<tr> + <td bgcolor="black" height="34"> </td> + <td bgcolor="#6666cc" align="right" height="33" valign="middle"> + <a class="textbutton" href="javascript:checkMaint();"style="{padding:3px}"> Exit Maintenance Mode </a> + <a class="textbutton" href="javascript:checkValue();"style="{padding:3px}"> Start Upgrade </a> + <a class="textbutton" href="javascript:openHelpWin('help/util_upg.htm')" style="{padding:3px}"> Help </a> </td> +</tr> + + +</table> +</div> +<input type="Hidden" name="message" value="@message#"> +<input type="Hidden" name="this_file" value="upgrade.htm"> +<input type="Hidden" name="todo" value="@todo#"> +<input type="Hidden" name="finish" value="@finish#"> +</form> + +</body> + +</html> diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/upgrade-nomaint.htm b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/upgrade-nomaint.htm index e69de29bb2..aecf323a52 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/upgrade-nomaint.htm +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/upgrade-nomaint.htm @@ -0,0 +1,127 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html><head><title>Upgrade Firmware</title> +<LINK REL="stylesheet" TYPE="text/css" HREF="../ig_n.css"> +<meta HTTP-EQUIV="Expires" CONTENT="Mon, 06 Jan 1990 00:00:01 GMT"> +<script language="JavaScript" type="text/javascript" src="../stdlib.js"></script> +<script language="JavaScript" type="text/javascript" src="../message.js"></script> +<script language="JavaScript" type="text/javascript"> +<!-- Start Script + +function checkMaint() +{ + var cf=document.maintmode; + + if(!confirm("Reboot to Maintenance Mode will take 5 minutes.\nClick OK to continue, Cancel to abort.")) + return; + cf.submit(); + return; +} + +// end script --> +</script> +</head> + +<body bgcolor="white" onLoad="showMsg()" marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<FORM name="maintmode" method="post" action="maintmode.cgi" ENCTYPE="multipart/form-data"> +<DIV align="center"> +<table border="0" cellpadding="0" cellspacing="0" width="750" align="center"> +<tr> + <td width="165"><img border="0" src="../linksys.gif" width="165" height="57"></td> + <td width="585" colspan="2" bgcolor="#6666CC" valign="bottom" align="right"><span class="fwversion">Firmware + Version: @ds_sw_version#</span> </td> +</tr> + +<tr> + <td colspan="3" height="11" bgcolor="black"><img src="../tborder.gif" width="750" height="11" alt="" border="0"></td> +</tr> + +<TR> + <TD width="165" bgcolor="black" align="center"><h3>Upgrade</h3></td> + <td width="585" colspan="2" bgcolor="#6666cc" valign="top"> + <table border="0" cellspacing="0" cellpadding="0" width="100%"> + <tr> + <td align="right" class="pname" height="25" colspan="5">Network Storage Link for USB 2.0 Disks </td> + <td align="center" width="100" class="mname">NSLU2</td> + </tr> + <tr bgcolor="black"> + <td colspan="6" height="3"><img src="TRANSPAR.GIF" width="1" height="3" alt="" border="0"></td> + </tr> + <tr> + <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="8" alt="" border="0"></td> + <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> + <td align="center" height="1"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> + <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> + <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> + <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> + </tr> + + <tr> + <td align="center" height="25" bgcolor="black" width="100"><a href="/index.cgi" class="mainmenu">Home</a></td> + <td align="center" height="25" bgcolor="black" width="100"><a href="/user_pass.cgi" class="mainmenu">User<br> password</a></td> + <td align="center" height="25" width="100"><span class="mainmenu">Administration</span></td> + <td align="center" height="25" bgcolor="black" width="100"><a href="/userman_fs.htm" class="mainmenu">User Guide</a></td> + <td align="center" height="25" bgcolor="black" width="120"><a href="http://www.linksys.com" class="mainmenu" target="new_win">Linksys Web</a></td> + <td align="center" height="25" bgcolor="black"> </td> + </tr> + <tr> + <td height="25" width="130"> </td> + <td height="25" colspan="5"> + <a href="/Management/file_sharing.cgi?next_file=groups.htm" class="submenu">Groups</a> <span class="divider"> | </span> + <a href="/Management/file_sharing.cgi?next_file=shares.htm" class="submenu">Shares</a> <span class="divider"> | </span> + <a href="/Management/sh_backup.cgi?next_file=backup.htm" class="submenu">Backup</a> <span class="divider"> | </span> + <a href="/Management/disk_fs.htm" class="submenu">Disk</a> <span class="divider"> | </span> + <a href="/Management/setup.cgi?next_file=lan.htm" class="submenu">Setup</a> + </td> + </tr> + </table> + + </td> +</tr> + +<tr> + <td colspan="3" bgcolor="#e7e7e7" height="6"><img src="TRANSPAR.GIF" width="1" height="6" alt="" border="0"></td> +</tr> + + +<tr> + <th width="165" height="24">Current Firmware </th> + <td width="409"><img src="TRANSPAR.GIF" width="409" height="6" alt="" border="0"></td> + <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="24" width="15"></td> +</tr> +<tr> + <td bgcolor="#e7e7e7" align="right"><img border="0" src="../UI_04.gif" width="8" hspace="0" vspace="0" height="80"></td> + <td width="409"><div class="std"><table border=0 cellspacing=0 cellpadding=4> + <tr> + <td nowrap>Current Firmware Version:</td> + <td nowrap>@ds_sw_version# </td></tr> + </table></div> </td> + <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="80" width="15"></td> +</tr> + + +<tr> + <td bgcolor="#e7e7e7" height="30" align="right"><img border="0" src="../UI_04.gif" width="8" hspace="0" vspace="0" height="30"></td> + <td height="30"> </td> + <td rowspan="2" valign="bottom" bgcolor="#6666cc" height="64"><img src="../cisco.gif" hspace="0" vspace="0"></td> +</tr> + +<tr> + <td bgcolor="black" height="34"> </td> + <td bgcolor="#6666cc" align="right" height="33" valign="middle"> +<a class="textbutton" href="javascript:checkMaint();" style="{padding:3px}"> Enter Maintenance Mode </a> + +<a class="textbutton" href="javascript:openHelpWin('help/util_upg.htm')" style="{padding:3px}"> Help </a> </td> +</tr> + + +</table> +</div> +<input type="Hidden" name="message" value="@message#"> +<input type="Hidden" name="this_file" value="upgrade.htm"> +<input type="Hidden" name="todo" value="@todo#"> +<input type="Hidden" name="finish" value="@finish#"> +</form> + +</body> + +</html> diff --git a/packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb b/packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb index 8934501602..1c2f0802f1 100644 --- a/packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb +++ b/packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb @@ -1,8 +1,8 @@ SECTION = "base" -PR = "r35" +PR = "r36" -UNSLUNG_VERSION = "3.14-alpha" +UNSLUNG_VERSION = "3.15-alpha" UNSLUNG_VARIANT ?= "standard" DEPENDS = "nslu2-linksys-libs" |