From: <ow...@us...> - 2008-09-10 18:51:41
|
Revision: 1810 http://ipcop.svn.sourceforge.net/ipcop/?rev=1810&view=rev Author: owes Date: 2008-09-10 18:51:52 +0000 (Wed, 10 Sep 2008) Log Message: ----------- Try to fix sparc partitioning Modified Paths: -------------- ipcop/trunk/src/installer/arch_defs.h ipcop/trunk/src/installer/partition.c Modified: ipcop/trunk/src/installer/arch_defs.h =================================================================== --- ipcop/trunk/src/installer/arch_defs.h 2008-09-10 14:16:29 UTC (rev 1809) +++ ipcop/trunk/src/installer/arch_defs.h 2008-09-10 18:51:52 UTC (rev 1810) @@ -50,7 +50,7 @@ #elif defined (__powerpc__) || defined (__powerpc64__) #define NR_PARTITIONS 5 #elif defined (__sparc__) || defined (__sparc64__) -#define NR_PARTITIONS 4 +#define NR_PARTITIONS 3 #endif /* Modified: ipcop/trunk/src/installer/partition.c =================================================================== --- ipcop/trunk/src/installer/partition.c 2008-09-10 14:16:29 UTC (rev 1809) +++ ipcop/trunk/src/installer/partition.c 2008-09-10 18:51:52 UTC (rev 1810) @@ -251,10 +251,9 @@ #if defined(__sparc__) || defined(__sparc64__) strcpy(partition_label[0], "boot"); strcpy(partition_label[1], "root"); - strcpy(partition_label[2], "skip"); strcpy(partition_mount[0], "/boot"); strcpy(partition_mount[1], "/"); - part_varlog = 3; + part_varlog = 2; #endif #if defined(__alpha__) strcpy(partition_label[0], "boot"); @@ -456,6 +455,9 @@ if (retcode) { fprintf(flog, "Make partitions failed ...\n"); } + else { + fprintf(flog, "Make partitions done ...\n"); + } sleep(1); mysystem("/bin/sync"); @@ -513,13 +515,14 @@ strcpy(special_filter_helper, dev); // call back needs global var. numpartitions = scandir(string, &names, &filter, alphasort); - fprintf(flog, "Number of Partitions: %d\n", numpartitions); + fprintf(flog, "Number of partitions: %d\n", numpartitions); if (numpartitions < NR_PARTITIONS) { /* We need at least NR_PARTITIONS partitions, note that the number is different depending on architecture. */ /* Allow more partitions, in case partitioning was done manually. */ + fprintf(flog, "Failure, we expect %d partitions.\n", NR_PARTITIONS); newtWinMessage(get_title(), ipcop_gettext("TR_OK"), ipcop_gettext("TR_UNABLE_TO_PARTITION")); - return 1; // cancel + return FAILURE; } /* Only care about our own partitions, anything extra is left alone */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |