Revision: 7593
http://sourceforge.net/p/ipcop/svn/7593
Author: owes
Date: 2014-06-09 07:49:51 +0000 (Mon, 09 Jun 2014)
Log Message:
-----------
Drop noscsi. Never used.
Modified Paths:
--------------
ipcop/trunk/src/installer/arch_defs.h
ipcop/trunk/src/installer/hardware.c
ipcop/trunk/src/installer/installer.c
ipcop/trunk/src/installer/networking.c
Modified: ipcop/trunk/src/installer/arch_defs.h
===================================================================
--- ipcop/trunk/src/installer/arch_defs.h 2014-06-09 07:35:28 UTC (rev
7592)
+++ ipcop/trunk/src/installer/arch_defs.h 2014-06-09 07:49:51 UTC (rev
7593)
@@ -118,7 +118,7 @@
/*
Functions implemented in hardware.c and partition.c
*/
-void scan_hardware(int installer_setup, int nopcmcia, int nousb, int noscsi,
int manualmodule);
+void scan_hardware(int installer_setup, int nopcmcia, int nousb, int
manualmodule);
int make_ipcop_disk(char *device, char *device2, long int disk_size, long int
swapfilesize, int part_options);
#define PART_OPTIONS_MANUAL 0x0001
Modified: ipcop/trunk/src/installer/hardware.c
===================================================================
--- ipcop/trunk/src/installer/hardware.c 2014-06-09 07:35:28 UTC (rev
7592)
+++ ipcop/trunk/src/installer/hardware.c 2014-06-09 07:49:51 UTC (rev
7593)
@@ -365,7 +365,7 @@
/* fill in tables with data */
-void scan_hardware(int flag_i_s, int nopcmcia, int nousb, int noscsi, int
manualmodule)
+void scan_hardware(int flag_i_s, int nopcmcia, int nousb, int manualmodule)
{
char command[STRING_SIZE];
newtComponent form;
Modified: ipcop/trunk/src/installer/installer.c
===================================================================
--- ipcop/trunk/src/installer/installer.c 2014-06-09 07:35:28 UTC (rev
7592)
+++ ipcop/trunk/src/installer/installer.c 2014-06-09 07:49:51 UTC (rev
7593)
@@ -22,10 +22,9 @@
*
* 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 - Run parted instead of sfdisk
* partition - Manual partitioning, use with care!
- * nodma - Disable DMA for IDE
+ * nodma - Disable DMA for IDE (for syslinux.cfg / init)
* nombr - Do not write MBR to disk
* swap - Force swap filesize in MB, use 0 to disable swap
* disk - Use only x MB instead of full disk
@@ -898,7 +897,6 @@
*/
int nopcmcia = 0;
int nousb = 0;
- int noscsi = 0;
int part_options = 0;
long int swapfilesize = -1;
int32_t userdisksize = INT32_MAX;
@@ -911,10 +909,6 @@
nousb = 1;
fprintf(flog, "Skip USB detection\n");
}
- if (find_kv(kv, "noscsi") != NULL) {
- noscsi = 1;
- fprintf(flog, "Skip SCSI detection\n");
- }
if (find_kv(kv, "parted") != NULL) {
part_options |= PART_OPTIONS_PARTED;
fprintf(flog, "Use parted\n");
@@ -985,7 +979,7 @@
handledatetime();
// find nics cdrom harddisk & floppies
- scan_hardware(1, nopcmcia, nousb, noscsi, manualmodule);
+ scan_hardware(1, nopcmcia, nousb, manualmodule);
/* any possible target drives found */
if (numharddisk == 0) {
Modified: ipcop/trunk/src/installer/networking.c
===================================================================
--- ipcop/trunk/src/installer/networking.c 2014-06-09 07:35:28 UTC (rev
7592)
+++ ipcop/trunk/src/installer/networking.c 2014-06-09 07:49:51 UTC (rev
7593)
@@ -279,7 +279,7 @@
hardware_scanned = 1;
/* scan for NICs, disable SCSI, no need to add modules manually */
- scan_hardware(0, 0, 0, 1, 0);
+ scan_hardware(0, 0, 0, 0);
numnetwork = 0;
/* setup our own table */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://www.hpccsystems.com
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
