[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[5760] ipcop/trunk
From:       owes () users ! sourceforge ! net
Date:       2011-07-31 15:11:54
Message-ID: E1QnXgI-0002mp-3Q () sfp-svn-2 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 5760
          http://ipcop.svn.sourceforge.net/ipcop/?rev=5760&view=rev
Author:   owes
Date:     2011-07-31 15:11:53 +0000 (Sun, 31 Jul 2011)

Log Message:
-----------
We don't have biosdecode, remove that option.

Modified Paths:
--------------
    ipcop/trunk/src/misc-progs/sysinfo.c
    ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20

Modified: ipcop/trunk/src/misc-progs/sysinfo.c
===================================================================
--- ipcop/trunk/src/misc-progs/sysinfo.c	2011-07-31 13:27:44 UTC (rev 5759)
+++ ipcop/trunk/src/misc-progs/sysinfo.c	2011-07-31 15:11:53 UTC (rev 5760)
@@ -1,5 +1,7 @@
-/* This file is part of the SysInfo GUI Addon
+/* IPCop helper program - sysinfo
  *
+ * This file is part of the IPCop Firewall.
+ *
  * IPCop is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -11,10 +13,10 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with IPCop; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ * along with IPCop.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Copyright (C) 2006-05-27 weizen_42 at ipcop-forum dot de
+ * (c) 2007-2011, the IPCop team
  *
  * $Id$
  *
@@ -53,7 +55,6 @@
 
 int main(int argc, char *argv[])
 {
-    int flag_bios = 0;
     int flag_disk = 0;
     int flag_link = 0;
     int flag_mii = 0;
@@ -68,7 +69,6 @@
 
     static struct option long_options[] =
     {
-        { "bios", no_argument, 0, 'b' },
         { "disk", required_argument, 0, 'd' },
         { "link", required_argument, 0, 'l' },
         { "mii", required_argument, 0, 'm' },
@@ -85,11 +85,8 @@
     if (!(initsetuid()))
         exit(1);
 
-    while ((c = getopt_long(argc, argv, "bd:l:m:p:r:v", long_options, \
&option_index)) != -1) { +    while ((c = getopt_long(argc, argv, "d:l:m:p:r:uv", \
long_options, &option_index)) != -1) {  switch (c) {
-        case 'b':              /* biosdecode */
-            flag_bios = 1;
-            break;
         case 'd':              /* hdparm drive */
             flag_disk = 1;
             opt_drive = strdup(optarg);
@@ -124,14 +121,11 @@
         }
     }
 
-    if (!flag_bios && !flag_disk && !flag_link && !flag_mii && !flag_pci && \
!flag_raid && !flag_usb) { +    if (!flag_disk && !flag_link && !flag_mii && \
!flag_pci && !flag_raid && !flag_usb) {  fprintf(stderr, "option missing\n");
         usage(argv[0], 2);
     }
 
-    if (flag_bios) {
-        safe_system("/usr/bin/biosdecode");
-    }
     if (flag_disk) {
         snprintf(command, STRING_SIZE - 1, "/usr/sbin/hdparm -I /dev/%s", \
opt_drive);  safe_system(command);

Modified: ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20
===================================================================
--- ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20	2011-07-31 13:27:44 UTC (rev \
                5759)
+++ ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20	2011-07-31 15:11:53 UTC (rev \
5760) @@ -18,6 +18,7 @@
 /usr/local/bin/restartsquid
 /usr/local/bin/scheduler.pl
 /usr/local/bin/setaliases
+/usr/local/bin/sysinfo
 /usr/local/sbin/setup
 /usr/share/locale/af_ZA/LC_MESSAGES/ipcop.mo
 /usr/share/locale/bg_BG/LC_MESSAGES/ipcop.mo


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------
Got Input?   Slashdot Needs You.
Take our quick survey online.  Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]