Revision: 7554
http://sourceforge.net/p/ipcop/svn/7554
Author: owes
Date: 2014-05-20 18:12:35 +0000 (Tue, 20 May 2014)
Log Message:
-----------
Change to larger 'error-margin'. Whilst looking for partitioning trouble I
found that reducing the disksize helps. Not sure though why install
disksize=<size> does not seem to help...
Modified Paths:
--------------
ipcop/trunk/src/installer/arch_defs.h
ipcop/trunk/src/installer/installer.c
ipcop/trunk/src/installer/partition.c
Modified: ipcop/trunk/src/installer/arch_defs.h
===================================================================
--- ipcop/trunk/src/installer/arch_defs.h 2014-05-18 14:10:19 UTC (rev
7553)
+++ ipcop/trunk/src/installer/arch_defs.h 2014-05-20 18:12:35 UTC (rev
7554)
@@ -109,7 +109,7 @@
extern struct hardware_s *hardwares;
extern char network_source[STRING_SIZE]; /* something like
http://ip/path */
-extern unsigned int memtotal; /* Total memory in MB */
+extern unsigned int memtotal; /* Total memory in MB */
extern unsigned int serial_console; /* 0 = ttyS0, 1 = ttyS1, etc.
*/
extern unsigned int serial_bitrate; /* 9600, 38400, etc. */
@@ -121,10 +121,12 @@
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_MANUAL 0x01
-#define PART_OPTIONS_NO_MBR 0x02
-#define PART_OPTIONS_NO_DMA 0x04
+#define PART_OPTIONS_MANUAL 0x0001
+#define PART_OPTIONS_NO_MBR 0x0002
+#define PART_OPTIONS_NO_DMA 0x0004
+#define PART_OPTIONS_USER_SIZE 0x8000
+
/*
Some global variables used when installing
*/
Modified: ipcop/trunk/src/installer/installer.c
===================================================================
--- ipcop/trunk/src/installer/installer.c 2014-05-18 14:10:19 UTC (rev
7553)
+++ ipcop/trunk/src/installer/installer.c 2014-05-20 18:12:35 UTC (rev
7554)
@@ -1008,6 +1008,7 @@
if (userdisksize < disk_size) {
disk_size = userdisksize;
fprintf(flog, "Use user selected max. disksize: %ld MiB\n", disk_size);
+ part_options |= PART_OPTIONS_USER_SIZE;
}
/* Partition, format, mount, initramfs and make bootable
Modified: ipcop/trunk/src/installer/partition.c
===================================================================
--- ipcop/trunk/src/installer/partition.c 2014-05-18 14:10:19 UTC (rev
7553)
+++ ipcop/trunk/src/installer/partition.c 2014-05-20 18:12:35 UTC (rev
7554)
@@ -103,9 +103,13 @@
snprintf(device2, STRING_SIZE, "/dev/%s", dev2);
/*
- Reduce disk size by 1MiB to reduce risk of partition errors caused by
wrong disk size informations from /sys/block/DEVICE/size
+ Reduce disk size by 5MiB to reduce risk of partition errors caused by
+ wrong disk size informations from /sys/block/DEVICE/size.
+ Also alignment 'modifications' might lead to difficulty.
*/
- disk_size -= 1;
+ if (part_options & PART_OPTIONS_USER_SIZE) {
+ disk_size -= 5;
+ }
/*
someday offer semi-manual partition here
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
