ppcrcd/pldconf.patch

[sparky]

Author: sparky
Date: Sun Dec 11 15:41:18 2005
New Revision: 6640

Modified:
   ppcrcd/pldconf.patch
Log:
- updated for new pldconf


Modified: ppcrcd/pldconf.patch
==============================================================================
--- ppcrcd/pldconf.patch	(original)
+++ ppcrcd/pldconf.patch	Sun Dec 11 15:41:18 2005
@@ -50,20 +50,20 @@
 diff -ur pldconf-0.3.15/NET/dhcpd.sh pldconf-0.3.15.norpmdb/NET/dhcpd.sh
 --- pldconf-0.3.15/NET/dhcpd.sh	2004-11-08 17:09:55.000000000 +0100
 +++ pldconf-0.3.15.norpmdb/NET/dhcpd.sh	2005-04-21 21:00:38.000000000 +0200
-@@ -10,7 +10,6 @@
- #
+@@ -40,7 +40,6 @@
+ }
  
  detect_mac_address () {
 -	install_if_missing nmap
- 	show_message "$(nls "Scanning network, please wait")"
- 	nmap -sP -v "`echo $net_address | sed -e 's#\.0#\.\*#g'`" 2>/dev/null
- 	arp -na | grep -v incomplete | while read line; do
-@@ -45,7 +44,6 @@
+ 	for m in `arp -na | cut -f2 -d' ' | sed -e 's/)//g; s/(//g'`; do
+ 		arp -d "$m" # clear arp cache
+ 	done 
+@@ -88,7 +87,6 @@
  }
  
  run_main () {
 -	install_if_missing dhcp
- 	cat ${CONF_FILE} | egrep "subnet.*$net_address.*netmask.*$netmask" && { show_message "Takie parametry sieci zostały już zdefiniowane";} || {
+ 	cat ${CONF_FILE} | egrep "subnet.*$net_address.*netmask.*$netmask" && { show_message "$(nls "already defined - clear /etc/dhcpcd.conf first")"; exit; } || {
  	line_replace "ddns-update-style" "ddns-update-style      none;" ${CONF_FILE}
  	cat << EOF >> ${CONF_FILE}
 diff -ur pldconf-0.3.15/NET/dsl.sh pldconf-0.3.15.norpmdb/NET/dsl.sh
@@ -147,7 +147,7 @@
 @@ -4,7 +4,6 @@
  run_main () {
  	backup_file /etc/poldek.conf
- 	[ "X$cdrom" = "Xyes" ] && {
+ 	[ "X$conf" = "Xyes" ] && {
 -		install_if_missing eject
  		cat > /etc/poldek.conf << EOF 
  source1 = cd1,pri=-10 cdrom://2.0-cd1/cd1/