Author: felix
Date: Wed Feb 25 06:58:15 2009
New Revision: 4465

URL: http://svn.slimdevices.com/jive?rev=4465&view=rev
Log:
Bug: 11152 
Description: 
- Replace no longer maintained zeroconf patch with official zcip applet in 
busybox
- Disable CONFIG_FEATURE_UDHCP_ZEROCONF in busybox defconfig results in busybox 
not compiling (but I guess that won't be an issue with newer busybox anyway)
- Static IP is broken due to missing changes in Networking.lua 
 

Modified:
    
7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua
URL: 
http://svn.slimdevices.com/jive/7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua?rev=4465&r1=4464&r2=4465&view=diff
==============================================================================
--- 
7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua 
(original)
+++ 
7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua 
Wed Feb 25 06:58:15 2009
@@ -722,10 +722,12 @@
 function t_setStaticIP(self, ssid, ipAddress, ipSubnet, ipGateway, ipDNS)
        assert(type(self.interface) == 'string')
        -- Reset the network
-       local killCommand   = "kill -TERM `cat /var/run/udhcpc." .. 
self.interface .. "pid`"
+       local killCommand   = "kill -TERM `cat /var/run/udhcpc." .. 
self.interface .. ".pid`"
+       local killCommand2  = "killall zcip > /dev/null"
        local configCommand = "/sbin/ifconfig " .. self.interface .. " 0.0.0.0"
 
        os.execute(killCommand)
+       os.execute(killCommand2)
        os.execute(configCommand)
 
        -- Set static ip configuration for network
@@ -738,7 +740,7 @@
                            )
 
        -- Bring up the network
-       local ifUp = "/sbin/ifup " .. interface
+       local ifUp = "/sbin/ifup " .. self.interface
        local status = os.execute(ifUp)
        log:info("ifup status=", status)
 end

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins

Reply via email to