Changeset c7c0d88 in freewrt

Timestamp:

Jul 3, 2007, 7:19:19 PM (18 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

4c47aa6

Parents:

d2b81cc

Message:

implement reload and reboot (or so I hope)

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@3115 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/fwwif

Files:

• Makefile (modified) (1 diff)
• extra/fwwif.ecpp (modified) (1 diff)
• extra/mgmt.ecpp (modified) (5 diffs)

package/fwwif/Makefile

@@ -9 +9 @@
 PKG_NAME=               fwwif
 PKG_VERSION=            20070703
-PKG_RELEASE=            4
+PKG_RELEASE=            5
 NO_DISTFILES=           1
 

package/fwwif/extra/fwwif.ecpp

@@ -82 +82 @@
 % reply.out() << global_index;
  <li style="list-style:none;">&nbsp;</li>
- <li><a href="mgmt?op=commit">commit changes to flash</a> (FWCF)</li>
+ <li><a href="mgmt?op=commit">Commit changes to flash</a> (FWCF)</li>
+ <li><a href="mgmt?op=reload">Reload webinterface</a> (FWWIF)</li>
+ <li><a href="mgmt?op=reboot">Reboot embedded system</a> (FreeWRT)</li>
  <li><a href="version">version information</a> (FWWIF)</li>
 </ul>

package/fwwif/extra/mgmt.ecpp

@@ -53 +53 @@
                 utilname = "fwcf commit";
                 okay = true;
+        } else if (op == "reload") {
+                pageheader = "reload webinterface";
+                pagetitle_run = "Reloading webinterface";
+                pagetitle_wrong = "Reload failed";
+                text_wrong = "Reloading webinterface failed.";
+                pagetitle_ok = "Reloaded successfully";
+                text_ok = "The webinterface was reloaded.";
+                utilname = "/etc/init.d/fwwif restart";
+                okay = true;
+        } else if (op == "reboot") {
+                pageheader = "reboot";
+                pagetitle_run = "Rebooting";
+                pagetitle_wrong = "Reboot failed";
+                text_wrong = "Reboot failed.";
+                pagetitle_ok = "Rebooted successfully";
+                text_ok = "The embedded system was rebooted.";
+                utilname = "/bin/busybox reboot";
+                okay = true;
         }
         runComp2(header, title, pageheader);
@@ -61 +79 @@
 <h1>Management functions</h1>
 <p>Please choose one of the following management functions.</p><ul>
- <li><a href="mgmt?op=commit">Commit changes to flash (FWCF)</a></li>
- <li><a href="version">FWWIF Version Information</a></li>
+ <li><a href="mgmt?op=commit">Commit changes to flash</a> (FWCF)</li>
+ <li><a href="mgmt?op=reload">Reload webinterface</a> (FWWIF)</li>
+ <li><a href="mgmt?op=reboot">Reboot embedded system</a> (FreeWRT)</li>
+ <li><a href="version">version information</a> (FWWIF)</li>
 </ul>
 %       } else if (really == "yes" && ick && ick == checkpoint) {
@@ -69 +89 @@
 <%cpp>
                 int i = 0;
-                const char *s;
                 char *text;
-
-                if (op == "commit") {
-                        s = "fwcf commit";
-                }
 
                 reply.setDirectMode(); // flush output
 
                 checkpoint = arc4random();      /* prevent re-use */
-                text = c_exec(s, &i);
+                text = c_exec(utilname.c_str(), &i);
                 if (i) {
                         reply.out() << "<h1>";
@@ -101 +116 @@
                 } while (!checkpoint);
 
-                if (op == "commit") {
+                if (op == "commit" || op == "reboot") {
                         int i;
                         char *changes;
 
                         changes = c_exec("/sbin/fwcf status", &i);
-                        if (changes) {
 </%cpp>
+%                       if (op == "commit") {
+<h1>Commit to flash</h1>
+%                       } else if (op == "reboot") {
+<h1>Reboot embedded system</h1>
+%                       }
+%                       if (changes) {
 <p class="blkbeg">The following files have been modified:</p>
 <pre class="blkmid"><$ *changes ? changes : "No files modified." $></pre>
+%                               if (op == "commit") {
 <p class="blkend">Do you really want to commit all these changes
+ into flash to retain them over system reboots?</p>
+%                               } else if (op == "reboot") {
+<p class="blkend">Do you really want to reboot without saving these changes?</p>
+%                               }
 %                               free(changes);
 %                       } else {
-<h1>Commit to flash</h1>
 <p>Do you really want to commit all changes to <tt>/etc</tt>
+ into flash to retain them over system reboots?</p>
 %                       }
- into flash to retain them over system reboots?</p>
+%               } else if (op == "reload") {
+<h1>Reload the webinterface</h1>
+<p>Do you really want to stop and restart the webinterface?</p>
+%               }
 <table width="100%">
  <tr>
   <td>&nbsp;</td>
   <td style="background-color:#00FF00;width:60px;height:32px;font-size:big;text-align:center;"><a
-   href="commit?op=commit&amp;really=yes&amp;ck=<$checkpoint$>">Yes</a></td>
+   href="commit?op=<$op$>&amp;really=yes&amp;ck=<$checkpoint$>">Yes</a></td>
   <td style="background-color:#FF0000;width:60px;height:32px;font-size:big;text-align:center;"><a
    href="/">No</a></td>
@@ -127 +155 @@
  </tr>
 </table>
-%               }
 %       }
 <& footer>