Revision: 3083
http://ipcop.svn.sourceforge.net/ipcop/?rev=3083&view=rev
Author: riddles
Date: 2009-06-17 20:30:51 +0000 (Wed, 17 Jun 2009)
Log Message:
-----------
Merged /ipcop/trunk:r3076-3082
Modified Paths:
--------------
ipcop/branches/template-branch/config/arch/i486/syslinux-fdinitrd.cfg
ipcop/branches/template-branch/config/arch/i486/syslinux-serial.cfg
ipcop/branches/template-branch/config/arch/i486/syslinux.cfg
ipcop/branches/template-branch/config/rootfiles/common/iptables
ipcop/branches/template-branch/lfs/iptables
ipcop/branches/template-branch/src/installer/partition.c
Property Changed:
----------------
ipcop/branches/template-branch/
ipcop/branches/template-branch/config/ssl/openvpn.cnf
ipcop/branches/template-branch/html/cgi-bin/openvpn.cgi
ipcop/branches/template-branch/html/html/images/openvpnzip.gif
ipcop/branches/template-branch/src/libs/multilines.pl
Property changes on: ipcop/branches/template-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /ipcop/trunk:2760-3075
+ /ipcop/trunk:2760-3082
Modified: ipcop/branches/template-branch/config/arch/i486/syslinux-fdinitrd.cfg
===================================================================
--- ipcop/branches/template-branch/config/arch/i486/syslinux-fdinitrd.cfg
2009-06-17 20:28:35 UTC (rev 3082)
+++ ipcop/branches/template-branch/config/arch/i486/syslinux-fdinitrd.cfg
2009-06-17 20:30:51 UTC (rev 3083)
@@ -2,6 +2,7 @@
DISPLAY message
PROMPT 1
DEFAULT install
+NOHALT 1
LABEL install
KERNEL vmlinuz
Modified: ipcop/branches/template-branch/config/arch/i486/syslinux-serial.cfg
===================================================================
--- ipcop/branches/template-branch/config/arch/i486/syslinux-serial.cfg
2009-06-17 20:28:35 UTC (rev 3082)
+++ ipcop/branches/template-branch/config/arch/i486/syslinux-serial.cfg
2009-06-17 20:30:51 UTC (rev 3083)
@@ -3,6 +3,7 @@
DISPLAY message
PROMPT 1
DEFAULT install
+NOHALT 1
F1 f1.txt
F2 f2.txt
Modified: ipcop/branches/template-branch/config/arch/i486/syslinux.cfg
===================================================================
--- ipcop/branches/template-branch/config/arch/i486/syslinux.cfg
2009-06-17 20:28:35 UTC (rev 3082)
+++ ipcop/branches/template-branch/config/arch/i486/syslinux.cfg
2009-06-17 20:30:51 UTC (rev 3083)
@@ -2,6 +2,7 @@
DISPLAY message
PROMPT 1
DEFAULT install
+NOHALT 1
F1 f1.txt
F2 f2.txt
Modified: ipcop/branches/template-branch/config/rootfiles/common/iptables
===================================================================
--- ipcop/branches/template-branch/config/rootfiles/common/iptables
2009-06-17 20:28:35 UTC (rev 3082)
+++ ipcop/branches/template-branch/config/rootfiles/common/iptables
2009-06-17 20:30:51 UTC (rev 3083)
@@ -1,3 +1,5 @@
+## iptables-1.4.4
+##
#lib/iptables
lib/iptables/libipt_CLUSTERIP.so
lib/iptables/libipt_DNAT.so
@@ -17,7 +19,6 @@
lib/iptables/libipt_ah.so
lib/iptables/libipt_ecn.so
lib/iptables/libipt_icmp.so
-lib/iptables/libipt_policy.so
lib/iptables/libipt_realm.so
#lib/iptables/libipt_set.so
lib/iptables/libipt_ttl.so
@@ -37,6 +38,7 @@
lib/iptables/libxt_TOS.so
#lib/iptables/libxt_TPROXY.so
lib/iptables/libxt_TRACE.so
+#lib/iptables/libxt_cluster.so
lib/iptables/libxt_comment.so
lib/iptables/libxt_connbytes.so
lib/iptables/libxt_connlimit.so
@@ -56,6 +58,7 @@
lib/iptables/libxt_owner.so
lib/iptables/libxt_physdev.so
lib/iptables/libxt_pkttype.so
+lib/iptables/libxt_policy.so
lib/iptables/libxt_quota.so
#lib/iptables/libxt_rateest.so
#lib/iptables/libxt_recent.so
Property changes on: ipcop/branches/template-branch/config/ssl/openvpn.cnf
___________________________________________________________________
Modified: svn:mergeinfo
- /ipcop/trunk/config/ssl/openvpn.cnf:3056-3075
+ /ipcop/trunk/config/ssl/openvpn.cnf:3056-3082
Property changes on: ipcop/branches/template-branch/html/cgi-bin/openvpn.cgi
___________________________________________________________________
Modified: svn:mergeinfo
- /ipcop/trunk/html/cgi-bin/openvpn.cgi:3056-3075
+ /ipcop/trunk/html/cgi-bin/openvpn.cgi:3056-3082
Property changes on:
ipcop/branches/template-branch/html/html/images/openvpnzip.gif
___________________________________________________________________
Modified: svn:mergeinfo
- /ipcop/trunk/html/html/images/openvpnzip.gif:3056-3075
+ /ipcop/trunk/html/html/images/openvpnzip.gif:3056-3082
Modified: ipcop/branches/template-branch/lfs/iptables
===================================================================
--- ipcop/branches/template-branch/lfs/iptables 2009-06-17 20:28:35 UTC (rev
3082)
+++ ipcop/branches/template-branch/lfs/iptables 2009-06-17 20:30:51 UTC (rev
3083)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = iptables
-VER = 1.4.3.2
+VER = 1.4.4
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 545698693b636cfc844aafc6729fd48a
+$(DL_FILE)_MD5 = 08cd9196881657ea0615d926334cb7e9
install : $(TARGET)
Modified: ipcop/branches/template-branch/src/installer/partition.c
===================================================================
--- ipcop/branches/template-branch/src/installer/partition.c 2009-06-17
20:28:35 UTC (rev 3082)
+++ ipcop/branches/template-branch/src/installer/partition.c 2009-06-17
20:30:51 UTC (rev 3083)
@@ -638,6 +638,7 @@
static int make_bootable(char *dev, char *dev2)
{
char command[STRING_SIZE];
+ char bigstring[STRING_SIZE_LARGE];
char device[STRING_SIZE];
char device2[STRING_SIZE];
@@ -647,47 +648,53 @@
snprintf(device2, STRING_SIZE, "/dev/%s", dev2);
#if defined (__i386__)
+ strcpy(bigstring, "/bin/sed ");
+
if (raid) {
/* replace the ROOT_DEV with md0 */
- mysystem("/bin/sed -i -e 's+ROOT_DEV+/dev/md0+g'
/harddisk/boot/extlinux.conf");
+ strcat(bigstring, "-i -e 's+ROOT_DEV+/dev/md0+g' ");
}
else if (partition_uuidenc[PART_INDEX_ROOT][0]) {
/* replace the ROOT_DEV with UUID partition */
- snprintf(command, STRING_SIZE, "/bin/sed -i -e
's+ROOT_DEV+/dev/disk/by-uuid/%s+g' /harddisk/boot/extlinux.conf",
+ snprintf(command, STRING_SIZE, "-i -e
's+ROOT_DEV+/dev/disk/by-uuid/%s+g' ",
partition_uuidenc[PART_INDEX_ROOT]);
- mysystem(command);
+ strcat(bigstring, command);
}
else if (partition_label[PART_INDEX_ROOT][0]) {
/* replace the ROOT_DEV with LABEL partition */
- snprintf(command, STRING_SIZE, "/bin/sed -i -e
's+ROOT_DEV+/dev/disk/by-label/%s+g' /harddisk/boot/extlinux.conf", "root");
- mysystem(command);
+ snprintf(command, STRING_SIZE, "-i -e
's+ROOT_DEV+/dev/disk/by-label/%s+g' ", "root");
+ strcat(bigstring, command);
}
else {
/* fallback: replace the ROOT_DEV with the real device, partition 1 */
- snprintf(command, STRING_SIZE, "/bin/sed -i -e 's+ROOT_DEV+%s1+g'
/harddisk/boot/extlinux.conf", device);
- mysystem(command);
+ snprintf(command, STRING_SIZE, "-i -e 's+ROOT_DEV+%s1+g' ", device);
+ strcat(bigstring, command);
}
if (medium_console == serial) {
- snprintf(command, STRING_SIZE, "/bin/sed -i -e
's+SERIAL_CONSOLE+SERIAL %u %u+' /harddisk/boot/extlinux.conf",
+ snprintf(command, STRING_SIZE, "-i -e 's+SERIAL_CONSOLE+SERIAL %u %u+'
",
serial_console, serial_bitrate);
- mysystem(command);
- snprintf(command, STRING_SIZE, "/bin/sed -i -e
's+serial_settings+console=%s+' /harddisk/boot/extlinux.conf",
+ strcat(bigstring, command);
+ snprintf(command, STRING_SIZE, "-i -e 's+serial_settings+console=%s+'
",
serial_commandline);
- mysystem(command);
+ strcat(bigstring, command);
}
else {
- mysystem("/bin/sed -i -e 's+SERIAL_CONSOLE++'
/harddisk/boot/extlinux.conf");
- mysystem("/bin/sed -i -e 's+serial_settings++'
/harddisk/boot/extlinux.conf");
+ strcat(bigstring, "-i -e 's+SERIAL_CONSOLE++' ");
+ strcat(bigstring, "-i -e 's+serial_settings++' ");
}
if (medium_target == flash) {
/* Add nodma, maybe others. */
- mysystem("/bin/sed -i -e 's+flashdisk_settings+nodma+'
/harddisk/boot/extlinux.conf");
+ strcat(bigstring, "-i -e 's+flashdisk_settings+nodma+' ");
}
else {
- mysystem("/bin/sed -i -e 's+flashdisk_settings++'
/harddisk/boot/extlinux.conf");
+ strcat(bigstring, "-i -e 's+flashdisk_settings++' ");
}
+ strcat(bigstring, "/harddisk/boot/extlinux.conf");
+ mysystem(bigstring);
+ sleep(1);
+
/* Install extlinux and MBR */
if (mysystem("/bin/chroot /harddisk /sbin/extlinux --install /boot")) {
return FAILURE;
Property changes on: ipcop/branches/template-branch/src/libs/multilines.pl
___________________________________________________________________
Modified: svn:mergeinfo
- /ipcop/trunk/src/libs/multilines.pl:3001-3075
+ /ipcop/trunk/src/libs/multilines.pl:3001-3082
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
