Revision: 6895
http://ipcop.svn.sourceforge.net/ipcop/?rev=6895&view=rev
Author: owes
Date: 2013-01-04 12:52:02 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
Simplify some of our installation options.
Modified Paths:
--------------
ipcop/trunk/config/arch/i486/f1.txt
ipcop/trunk/config/arch/i486/f2.txt
ipcop/trunk/config/arch/i486/f3.txt
ipcop/trunk/src/installer/arch_defs.h
ipcop/trunk/src/installer/hardware.c
ipcop/trunk/src/installer/installer.c
ipcop/trunk/src/installer/partition.c
Modified: ipcop/trunk/config/arch/i486/f1.txt
===================================================================
--- ipcop/trunk/config/arch/i486/f1.txt 2013-01-04 12:22:51 UTC (rev 6894)
+++ ipcop/trunk/config/arch/i486/f1.txt 2013-01-04 12:52:02 UTC (rev 6895)
@@ -17,7 +17,7 @@
Press RETURN to boot IPCop default installation.
Or, if you are having trouble you can try these target options ...
- Type: nodma to install with DMA disabled for IDE
- verbose to install with kernel messages enabled
- rescue to boot in rescue mode
- memtest to test memory
+ Type: nodma to install with DMA disabled for IDE
+ verbose to install with kernel messages enabled
+ rescue to boot in rescue mode
+ memtest to test memory
Modified: ipcop/trunk/config/arch/i486/f2.txt
===================================================================
--- ipcop/trunk/config/arch/i486/f2.txt 2013-01-04 12:22:51 UTC (rev 6894)
+++ ipcop/trunk/config/arch/i486/f2.txt 2013-01-04 12:52:02 UTC (rev 6895)
@@ -19,3 +19,4 @@
install nopcmcia to install and disable PCMCIA detection
install nousb to install and disable USB detection
install nousb nopcmcia to install and disable both
+ install modules to install and add kernelmodules
Modified: ipcop/trunk/config/arch/i486/f3.txt
===================================================================
--- ipcop/trunk/config/arch/i486/f3.txt 2013-01-04 12:22:51 UTC (rev 6894)
+++ ipcop/trunk/config/arch/i486/f3.txt 2013-01-04 12:52:02 UTC (rev 6895)
@@ -16,6 +16,6 @@
<09F407> memtest.
Following options can be combined with install to tweak partitioning:
- install swapfilesize=<megabyte> to install and set SWAP filesize
- install disksize=<megabyte> to install and set used diskspace
- install manualmodule to install and add kernelmodules
+ install nombr to install and skip writing MBR
+ install disk=<megabyte> to install and set used diskspace
+ install swap=<megabyte> to install and set SWAP filesize
Modified: ipcop/trunk/src/installer/arch_defs.h
===================================================================
--- ipcop/trunk/src/installer/arch_defs.h 2013-01-04 12:22:51 UTC (rev
6894)
+++ ipcop/trunk/src/installer/arch_defs.h 2013-01-04 12:52:02 UTC (rev
6895)
@@ -121,8 +121,9 @@
void scan_hardware(int installer_setup, int nopcmcia, int nousb, int noscsi,
int manualmodule);
int make_ipcop_disk(char *device, char *device2, long int disk_size, long int
swapfilesize, int part_options);
-#define PART_OPTIONS_PARTED 0x01
+#define PART_OPTIONS_MANUAL 0x01
#define PART_OPTIONS_NO_MBR 0x02
+#define PART_OPTIONS_NO_DMA 0x04
/*
Some global variables used when installing
Modified: ipcop/trunk/src/installer/hardware.c
===================================================================
--- ipcop/trunk/src/installer/hardware.c 2013-01-04 12:22:51 UTC (rev
6894)
+++ ipcop/trunk/src/installer/hardware.c 2013-01-04 12:52:02 UTC (rev
6895)
@@ -451,17 +451,17 @@
snprintf(description, STRING_SIZE, "%s %s", vendor, line);
switch((pcidev->device_class >> 8) & 0xFF) {
- case PCI_BASE_CLASS_STORAGE:
+ case PCI_BASE_CLASS_STORAGE: // 0x01
if (install_setup) {
type = specialmodule;
}
break;
- case PCI_BASE_CLASS_NETWORK:
+ case PCI_BASE_CLASS_NETWORK: // 0x02
type = network;
break;
- case PCI_BASE_CLASS_BRIDGE:
+ case PCI_BASE_CLASS_BRIDGE: // 0x06
/* A forcedeth onboard NIC that identifies as 0680 instead of 0200.
* At least device ID 0x00df and 0x03ef, maybe more.
* Filter out true bridge devices below, after searching for the
module.
@@ -476,7 +476,7 @@
}
break;
- case PCI_BASE_CLASS_SERIAL:
+ case PCI_BASE_CLASS_SERIAL: // 0x0c
if (install_setup && !nousb && (pcidev->device_class ==
PCI_CLASS_SERIAL_USB)) {
type = specialmodule;
}
Modified: ipcop/trunk/src/installer/installer.c
===================================================================
--- ipcop/trunk/src/installer/installer.c 2013-01-04 12:22:51 UTC (rev
6894)
+++ ipcop/trunk/src/installer/installer.c 2013-01-04 12:52:02 UTC (rev
6895)
@@ -6,7 +6,7 @@
*
* Written by Alan Hourihane <al...@fairlite.demon.co.uk>
*
- * (c) 2007-2010, the IPCop team
+ * (c) 2007-2012, the IPCop team
*
* This is the first stage installer.
* - select language.
@@ -23,11 +23,12 @@
* nopcmcia - Skip PCMCIA hardware detection (do we still need this ?)
* nousb - Skip USB hardware detection (do we still need this ?)
* noscsi - Skip SCSI hardware detection (not implemented at the
moment !)
- * parted - Manual partitioning, use with care!
+ * partition - Manual partitioning, use with care!
+ * nodma - Disable DMA for IDE
* nombr - Do not write MBR to disk
- * swapfilesize - Force swap filesize in MB, use 0 to disable swap
- * disksize - Use only x MB instead of full disk
- * manualmodule - Manually add kernel modules after hardware detection
+ * swap - Force swap filesize in MB, use 0 to disable swap
+ * disk - Use only x MB instead of full disk
+ * modules - Manually add kernel modules after hardware detection
*
* $Id$
*
@@ -912,8 +913,8 @@
noscsi = 1;
fprintf(flog, "Skip SCSI detection\n");
}
- if (find_kv(kv, "parted") != NULL) {
- part_options |= PART_OPTIONS_PARTED;
+ if (find_kv(kv, "partition") != NULL) {
+ part_options |= PART_OPTIONS_MANUAL;
fprintf(flog, "Manual partitioning\n");
}
if (find_kv(kv, "nombr") != NULL) {
@@ -921,7 +922,7 @@
fprintf(flog, "Skip MBR\n");
}
strcpy(line, "-1");
- if (find_kv_default(kv, "swapfilesize", line) == SUCCESS) {
+ if (find_kv_default(kv, "swap", line) == SUCCESS) {
swapfilesize = atoi(line);
if ((swapfilesize == 0) || ((swapfilesize >= SWAP_MINIMUM) &&
(swapfilesize <= SWAP_MAXIMUM))) {
fprintf(flog, "swapfilesize %ld MiB\n", swapfilesize);
@@ -932,7 +933,7 @@
}
}
sprintf(line, "%d", userdisksize);
- if (find_kv_default(kv, "disksize", line) == SUCCESS) {
+ if (find_kv_default(kv, "disk", line) == SUCCESS) {
userdisksize = atoi(line);
if (userdisksize < DISK_MINIMUM) {
fprintf(flog, "Ignoring disksize %d MiB\n", userdisksize);
@@ -942,7 +943,7 @@
fprintf(flog, "User max. disksize %d MiB\n", userdisksize);
}
}
- if (find_kv(kv, "manualmodule") != NULL) {
+ if (find_kv(kv, "modules") != NULL) {
manualmodule = 1;
fprintf(flog, "Manually add kernel module(s)\n");
}
Modified: ipcop/trunk/src/installer/partition.c
===================================================================
--- ipcop/trunk/src/installer/partition.c 2013-01-04 12:22:51 UTC (rev
6894)
+++ ipcop/trunk/src/installer/partition.c 2013-01-04 12:52:02 UTC (rev
6895)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with IPCop. If not, see <http://www.gnu.org/licenses/>.
*
- * (c) 2007-2011, the IPCop team
+ * (c) 2007-2012, the IPCop team
*
*
*
@@ -231,7 +231,7 @@
}
- if (part_options & PART_OPTIONS_PARTED) {
+ if (part_options & PART_OPTIONS_MANUAL) {
/* OK, user thinks he's smart enough to do by himself */
newtWinMessage(ipcop_gettext("TR_TITLE_DISK"), ipcop_gettext("TR_OK"),
"Do your thing with parted now!");
@@ -706,8 +706,9 @@
strcat(bigstring, "-i -e 's+SERIAL_CONSOLE++' ");
strcat(bigstring, "-i -e 's+serial_settings++' ");
}
- if (medium_target == flash) {
- /* Add nodma, maybe others. */
+ if (part_options & PART_OPTIONS_NO_DMA) {
+ /* Add nodma */
+ fprintf(flog, "Adding nodma\n");
strcat(bigstring, "-i -e 's+flashdisk_settings+nodma+' ");
}
else {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and
much more. Get web development skills now with LearnDevNow -
350+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122812
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
