Author: michael
Date: Wed Jan 27 02:30:58 2010
New Revision: 8410
URL: http://svn.slimdevices.com/jive?rev=8410&view=rev
Log:
Fixed Bug: 15245
Description: try harder to shut down SBS before the update, use
squeezeos.kill() if os.execute() fails to stop it. This might help with bug
15522 too.
Modified:
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterMeta.lua
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
Modified:
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua?rev=8410&r1=8409&r2=8410&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
Wed Jan 27 02:30:58 2010
@@ -21,6 +21,7 @@
local Task = require("jive.ui.Task")
local Timer = require("jive.ui.Timer")
local Window = require("jive.ui.Window")
+local squeezeos = require("squeezeos_bsp")
local appletManager = appletManager
local jiveMain = jiveMain
@@ -268,6 +269,28 @@
end
+function stopSqueezeCenter(self)
+ -- first try the regular way
+ self:_stopServer(true)
+
+ -- try harder if this didn't work
+ if self:serverRunning() then
+ -- stop scanner
+ local pid = _pidfor('scanner.pl')
+ if pid then
+ squeezeos.kill(pid, 3)
+ end
+
+ -- stop server
+ pid = _pidfor('slimserver.pl')
+ if pid then
+ squeezeos.kill(pid, 3)
+ end
+
+ os.remove("/var/run/squeezecenter.pid")
+ end
+end
+
function _getStatusText(self)
Modified:
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterMeta.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterMeta.lua?rev=8410&r1=8409&r2=8410&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterMeta.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterMeta.lua
Wed Jan 27 02:30:58 2010
@@ -28,6 +28,7 @@
meta:registerService("udevEventHandler")
meta:registerService("squeezecenterStartupCheck")
meta:registerService("isBuiltInSCRunning")
+ meta:registerService("stopSqueezeCenter")
end
function configureApplet(meta)
Modified:
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua?rev=8410&r1=8409&r2=8410&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
Wed Jan 27 02:30:58 2010
@@ -541,6 +541,11 @@
-- interrupted during the firmware upgrade.
appletManager:callService("disconnectPlayer")
+ -- stop memory hungry services before upgrading
+ if (System:getMachine() == "fab4") then
+ appletManager:callService("stopSqueezeCenter")
+ end
+
-- start the upgrade
Task("upgrade", self, _t_upgrade, _upgradeFailed):addTask()
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
