[Netadm-devel] gwc/scripts gwc,1.6,1.7 install.sh,1.17,1.18

[linuxpark <lin...@us...>]

Update of /cvsroot/netadm/gwc/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7869/scripts

Modified Files:
	gwc install.sh 
Log Message:
MOD: install.sh, gwc

	gwc: add reflesh_syslog whenever starting gwc system using gwc script
	install.sh: remove introduction of pf compiling process because this compiling
		    routine is moved to user compiling time.

		    modify initial install state for {local or remove}, snmp {off|on}
		           state.  default is all off.
		    


Index: gwc
===================================================================
RCS file: /cvsroot/netadm/gwc/scripts/gwc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gwc	30 Apr 2006 18:47:25 -0000	1.6
--- gwc	30 Apr 2006 19:34:18 -0000	1.7
***************
*** 140,143 ****
--- 140,158 ----
  }
  
+ reflesh_syslogd(){
+         if [ -f /etc/redhat-release ]; then
+                 /etc/init.d/syslog restart
+         fi
+ 
+         if [ -f /etc/fedora-release ]; then
+                 /etc/init.d/syslog restart
+         fi
+ 
+         if [ -f /etc/debian_version ]; then
+                 /etc/init.d/sysklogd restart
+                 /etc/init.d/klogd restart
+         fi
+ }
+ 
  start(){
  	check_usr
***************
*** 178,181 ****
--- 193,198 ----
  case "$1" in
  'start')
+ 
+ 	reflesh_syslogd
  	init_ipc
  	start gwcadmd

Index: install.sh
===================================================================
RCS file: /cvsroot/netadm/gwc/scripts/install.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** install.sh	30 Apr 2006 18:47:25 -0000	1.17
--- install.sh	30 Apr 2006 19:34:19 -0000	1.18
***************
*** 228,235 ****
  
  	if [ -f /etc/debian_version ]; then
! 		/etc/init.d/sysklogd stop
! 		/etc/init.d/sysklogd start
! 		/etc/init.d/klogd stop
! 		/etc/init.d/klogd start
  	fi
  }
--- 228,233 ----
  
  	if [ -f /etc/debian_version ]; then
! 		/etc/init.d/sysklogd restart
! 		/etc/init.d/klogd restart
  	fi
  }
***************
*** 406,410 ****
  
  get_snmp_info () {
!   dialog --title "netadm_gwc Configuration" --radiolist "Select whether target system support SNMP query using SNMPv1.0" 10 75 2 0 "no" "off" 1 "yes" "on"  2>support_snmp.txt
  
    if [ $? != 0 ]; then
--- 404,408 ----
  
  get_snmp_info () {
!   dialog --title "netadm_gwc Configuration" --radiolist "Select whether target system support SNMP query using SNMPv1.0" 10 75 2 0 "no" "on" 1 "yes" "off"  2>support_snmp.txt
  
    if [ $? != 0 ]; then
***************
*** 457,461 ****
  
  get_target_remote () {
!   dialog --title "netadm_gwc Configuration" --radiolist "Select where your target system is" 10 75 2 0 "This local system" "off" 1 "Remote" "on"  2>remote.txt
  
    if [ $? != 0 ]; then
--- 455,459 ----
  
  get_target_remote () {
!   dialog --title "netadm_gwc Configuration" --radiolist "Select where your target system is" 10 75 2 0 "This local system" "on" 1 "Remote" "off"  2>remote.txt
  
    if [ $? != 0 ]; then
***************
*** 575,585 ****
  	file_check
  	
! 	$DIALOG --infobox "Get kernel release info  ..."  5 75
  	sleep 2
  	get_kernel_info
  		
- 	$DIALOG --infobox "Compiling pf module ..."  5 75
- 	sleep 2
- 	
  	module_check ip_tables.ko
  	module_check iptable_nat.ko
--- 573,580 ----
  	file_check
  	
! 	$DIALOG --infobox "Checking kernel version  ..."  5 75
  	sleep 2
  	get_kernel_info
  		
  	module_check ip_tables.ko
  	module_check iptable_nat.ko