Author: aschnell Date: Tue Nov 15 16:25:31 2011 New Revision: 66802 URL: http://svn.opensuse.org/viewcvs/yast?rev=66802&view=rev Log: - adapted dbus command to disable automounting of desktop environments (bnc#727538) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp trunk/storage/yast2-storage.spec.in Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=66802&r1=66801&r2=66802&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Nov 15 16:25:31 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 15 16:20:05 CET 2011 - aschnell@suse.de + +- adapted dbus command to disable automounting of desktop + environments (bnc#727538) + +------------------------------------------------------------------- Tue Nov 15 13:51:57 CET 2011 - fehr@suse.de - remove /var/run from default subvolume list (bnc#729463) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=66802&r1=66801&r2=66802&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Nov 15 16:25:31 2011 @@ -5977,28 +5977,31 @@ } +string dbus_cookie = nil; + global void SwitchUiAutomounter(boolean on) { y2milestone("SwitchUiAutomounter on:%1", on); if (!on) { - SCR::Execute(.dbus.system.method, - $[ `destination : "org.freedesktop.Hal", - `path : "/org/freedesktop/Hal/Manager", - `interface : "org.freedesktop.Hal.Manager", - `method : "AcquireGlobalInterfaceLock" ], - [ "org.freedesktop.Hal.Device.Storage", - true ]); + any tmp = SCR::Execute(.dbus.system.method, + $[ `destination : "org.freedesktop.UDisks", + `path : "/org/freedesktop/UDisks", + `interface : "org.freedesktop.UDisks", + `method : "Inhibit" ], + [ ]); + dbus_cookie = ((list) tmp)[0]:""; } else { - SCR::Execute(.dbus.system.method, - $[ `destination : "org.freedesktop.Hal", - `path : "/org/freedesktop/Hal/Manager", - `interface : "org.freedesktop.Hal.Manager", - `method : "ReleaseGlobalInterfaceLock" ], - [ "org.freedesktop.Hal.Device.Storage" ]); + any tmp = SCR::Execute(.dbus.system.method, + $[ `destination : "org.freedesktop.UDisks", + `path : "/org/freedesktop/UDisks", + `interface : "org.freedesktop.UDisks", + `method : "Uninhibit" ], + [ dbus_cookie ]); + dbus_cookie = nil; } y2milestone("SwitchUiAutomounter exit"); Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?rev=66802&r1=66801&r2=66802&view=diff ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Tue Nov 15 16:25:31 2011 @@ -9,7 +9,7 @@ BuildRequires: yast2-testsuite >= 2.19.0 yast2-perl-bindings Requires: yast2-perl-bindings perl = %{perl_version} Requires: yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7 -Requires: yast2-dbus-client +Requires: yast2-dbus-client >= 2.22.0 %ifarch s390 s390x Requires: yast2-s390 %endif -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org