[leaf-commits] src/bering-uclibc4/source/iptables ip6tables.default, NONE, 1.1 ip6tables.init, NONE, 1.1 iptables.default, NONE, 1.1 iptables.init, NONE, 1.1 buildtool.cfg, 1.6, 1.7 buildtool.mk, 1.4, 1.5
Andrew <[email protected]> Mon, 08 Nov 2010 11:29:00 +0000
| Newsgroups | gmane.linux.leaf.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/leaf/src/bering-uclibc4/source/iptables
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3737
Modified Files:
buildtool.cfg buildtool.mk
Added Files:
ip6tables.default ip6tables.init iptables.default
iptables.init
Log Message:
Added daemon files to load/save rules on boot/reboot
--- NEW FILE: ip6tables.default ---
#File which contains iptables rules
RULES_FILE=/etc/iptables/rules.v6
#Save counters for each rule
#SAVE_COUNTERS=yes
#Load rules on daemon start
LOAD_ON_START=yes
#Save rules on daemon stop
#SAVE_ON_STOP=yes
--- NEW FILE: ip6tables.init ---
#!/bin/sh
#
RCDLINKS="2,S30 3,S30 6,K60"
. /etc/default/ip6tables
OPTS=""
[ "$SAVE_COUNTERS" = "yes" ] && OPTS="-c"
case "$1" in
load)
[ -f "$RULES_FILE" ] && /sbin/ip6tables-restore $OPTS $RULES_FILE
;;
save)
/sbin/ip6tables-save $OPTS > $RULES_FILE
;;
start)
[ "$LOAD_ON_START" = "yes" ] && $0 load
;;
stop)
[ "$SAVE_ON_STOP" = "yes" ] && $0 save
;;
restart)
$0 stop
$0 start
;;
*)
echo "Usage: $0 {start|stop|restart|load|save}"
exit 1
;;
esac
exit 0
--- NEW FILE: iptables.default ---
#File which contains iptables rules
RULES_FILE=/etc/iptables/rules
#Save counters for each rule
#SAVE_COUNTERS=yes
#Load rules on daemon start
LOAD_ON_START=yes
#Save rules on daemon stop
#SAVE_ON_STOP=yes
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/iptables/buildtool.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** buildtool.mk 1 Nov 2010 11:02:09 -0000 1.4
--- buildtool.mk 8 Nov 2010 11:28:51 -0000 1.5
***************
*** 43,46 ****
--- 43,49 ----
$(IPTABLES_DIR)/.build: $(IPTABLES_DIR)/Makefile
mkdir -p $(IPTABLES_TARGET_DIR)
+ mkdir -p $(IPTABLES_TARGET_DIR)/etc/default
+ mkdir -p $(IPTABLES_TARGET_DIR)/etc/init.d
+ mkdir -p $(IPTABLES_TARGET_DIR)/etc/iptables
mkdir -p $(IPTABLES_TARGET_DIR)/include/iptables
mkdir -p $(IPTABLES_TARGET_DIR)/include/net/netfilter
***************
*** 57,64 ****
-$(BT_STRIP) $(BT_STRIP_LIBOPTS) $(IPTABLES_TARGET_DIR)/lib/xtables/*
rm -rf $(IPTABLES_TARGET_DIR)/lib/pkgconfig $(IPTABLES_TARGET_DIR)/share
cp -a $(IPTABLES_TARGET_DIR)/* $(BT_STAGING_DIR)
# touch $(IPTABLES_DIR)/.build
# $(BT_DEPMOD) -ae -b $(BT_STAGING_DIR) -r -F $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/build/System.map $(BT_KERNEL_RELEASE)
! # touch $(IPP2P_DIR)/.build
source: $(IPTABLES_DIR)/Makefile
--- 60,73 ----
-$(BT_STRIP) $(BT_STRIP_LIBOPTS) $(IPTABLES_TARGET_DIR)/lib/xtables/*
rm -rf $(IPTABLES_TARGET_DIR)/lib/pkgconfig $(IPTABLES_TARGET_DIR)/share
+ cp -a iptables.init $(IPTABLES_TARGET_DIR)/etc/init.d/iptables
+ cp -a ip6tables.init $(IPTABLES_TARGET_DIR)/etc/init.d/ip6tables
+ cp -a iptables.default $(IPTABLES_TARGET_DIR)/etc/default/iptables
+ cp -a ip6tables.default $(IPTABLES_TARGET_DIR)/etc/default/ip6tables
+ touch $(IPTABLES_TARGET_DIR)/etc/iptables/rules
+ touch $(IPTABLES_TARGET_DIR)/etc/iptables/rules.v6
cp -a $(IPTABLES_TARGET_DIR)/* $(BT_STAGING_DIR)
# touch $(IPTABLES_DIR)/.build
# $(BT_DEPMOD) -ae -b $(BT_STAGING_DIR) -r -F $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/build/System.map $(BT_KERNEL_RELEASE)
! touch $(IPTABLES_DIR)/.build
source: $(IPTABLES_DIR)/Makefile
--- NEW FILE: iptables.init ---
#!/bin/sh
#
RCDLINKS="2,S30 3,S30 6,K60"
. /etc/default/iptables
OPTS=""
[ "$SAVE_COUNTERS" = "yes" ] && OPTS="-c"
case "$1" in
load)
[ -f "$RULES_FILE" ] && /sbin/iptables-restore $OPTS $RULES_FILE
;;
save)
/sbin/iptables-save $OPTS > $RULES_FILE
;;
start)
[ "$LOAD_ON_START" = "yes" ] && $0 load
;;
stop)
[ "$SAVE_ON_STOP" = "yes" ] && $0 save
;;
restart)
$0 stop
$0 start
;;
*)
echo "Usage: $0 {start|stop|restart|load|save}"
exit 1
;;
esac
exit 0
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/iptables/buildtool.cfg,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** buildtool.cfg 30 Oct 2010 11:37:17 -0000 1.6
--- buildtool.cfg 8 Nov 2010 11:28:51 -0000 1.7
***************
*** 24,27 ****
--- 24,51 ----
</File>
+ <File iptables.init>
+ Server = cvs4-sourceforge
+ Revision = HEAD
+ Directory = iptables
+ </File>
+
+ <File iptables.default>
+ Server = cvs4-sourceforge
+ Revision = HEAD
+ Directory = iptables
+ </File>
+
+ <File ip6tables.init>
+ Server = cvs4-sourceforge
+ Revision = HEAD
+ Directory = iptables
+ </File>
+
+ <File ip6tables.default>
+ Server = cvs4-sourceforge
+ Revision = HEAD
+ Directory = iptables
+ </File>
+
#<File iptables-1.3.0-imq1.diff>
# Server = linuximq.net
***************
*** 48,52 ****
<iptables>
Version = 1.4.9.1
! Revision = 1
--- 72,76 ----
<iptables>
Version = 1.4.9.1
! Revision = 2
***************
*** 154,157 ****
--- 178,205 ----
Type = link
</File>
+ <File>
+ Filename = etc/init.d/iptables
+ Source = etc/init.d/iptables
+ Type = binary
+ Type = conf
+ Type = local
+ Permissions = 755
+ </File>
+ <File>
+ Filename = etc/default/iptables
+ Source = etc/default/iptables
+ Type = binary
+ Type = conf
+ Type = local
+ Permissions = 640
+ </File>
+ <File>
+ Filename = etc/iptables/rules
+ Source = etc/iptables/rules
+ Type = binary
+ Type = conf
+ Type = local
+ Permissions = 640
+ </File>
</Contents>
</iptables>
***************
*** 159,163 ****
<ip6tables>
Version = 1.4.9.1
! Revision = 1
--- 207,211 ----
<ip6tables>
Version = 1.4.9.1
! Revision = 2
***************
*** 262,265 ****
--- 310,337 ----
Type = link
</File>
+ <File>
+ Filename = etc/init.d/ip6tables
+ Source = etc/init.d/ip6tables
+ Type = binary
+ Type = conf
+ Type = local
+ Permissions = 755
+ </File>
+ <File>
+ Filename = etc/default/ip6tables
+ Source = etc/default/ip6tables
+ Type = binary
+ Type = conf
+ Type = local
+ Permissions = 640
+ </File>
+ <File>
+ Filename = etc/iptables/rules.v6
+ Source = etc/iptables/rules.v6
+ Type = binary
+ Type = conf
+ Type = local
+ Permissions = 640
+ </File>
</Contents>
</iptables>
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev