Author: lslezak Date: Wed May 23 10:54:42 2007 New Revision: 38097 URL: http://svn.opensuse.org/viewcvs/yast?rev=38097&view=rev Log: - fix for bluez >= 3.10 (SDP daemon is now included in HCID daemon) (#276650) - 2.15.2 Modified: trunk/bluetooth/VERSION trunk/bluetooth/package/yast2-bluetooth.changes trunk/bluetooth/src/Bluetooth.ycp Modified: trunk/bluetooth/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/VERSION?rev=38097&r1=38096&r2=38097&view=diff ============================================================================== --- trunk/bluetooth/VERSION (original) +++ trunk/bluetooth/VERSION Wed May 23 10:54:42 2007 @@ -1 +1 @@ -2.15.1 +2.15.2 Modified: trunk/bluetooth/package/yast2-bluetooth.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/package/yast2-bluetooth.changes?rev=38097&r1=38096&r2=38097&view=diff ============================================================================== --- trunk/bluetooth/package/yast2-bluetooth.changes (original) +++ trunk/bluetooth/package/yast2-bluetooth.changes Wed May 23 10:54:42 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 23 10:26:31 CEST 2007 - lslezak@suse.cz + +- fix for bluez >= 3.10 (SDP daemon is now included in HCID daemon) + (#276650) +- 2.15.2 + +------------------------------------------------------------------- Thu Mar 1 15:08:05 CET 2007 - lslezak@suse.cz - fixed a rich text tag in the help text (#249490) Modified: trunk/bluetooth/src/Bluetooth.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/src/Bluetooth.ycp?rev=38097&r1=38096&r2=38097&view=diff ============================================================================== --- trunk/bluetooth/src/Bluetooth.ycp (original) +++ trunk/bluetooth/src/Bluetooth.ycp Wed May 23 10:54:42 2007 @@ -106,6 +106,11 @@ if (all != nil && size(all) > 0) { foreach(string var, all, ``{ + // the SDP_START variable might be lying around from < bluez-3.10 + // ignore it. + if (var == "SDP_START") { + continue; + } if (regexpmatch(var, ".*_START$")) { string daemon_name = regexpsub(var, "(.*)_START$", "\\1"); @@ -114,6 +119,8 @@ } ); } + // SDP is always there, but built into hcid since bluez-3.10 + ret = add(ret, "SDP"); return ret; } @@ -154,6 +161,10 @@ // reset daemon list daemons = []; foreach(string service, detected_services, ``{ + if ((service == "SDP" )) + { + continue; + } // read start status boolean service_enabled = (SCR::Read(.sysconfig.bluetooth + (service + "_START")) == "yes"); @@ -163,6 +174,17 @@ // read daemon arguments string args = (string)SCR::Read(.sysconfig.bluetooth + (service + "_DAEMON_ARGS")); + if ((service == "HCI")) + { + boolean sdp_enabled = false; + if (regexpmatch(args, "([ \t]|^)-s([ \t]|$)")) + { + sdp_enabled = true; + } + daemons = add(daemons, $[ "service" : "SDP", "enabled": sdp_enabled, + "daemon" : "", "args" : "" ]); + } + daemons = add(daemons, $[ "service" : service, "enabled" : service_enabled, "daemon" : binary, "args" : args ]); } @@ -259,7 +281,31 @@ SCR::Write(.sysconfig.bluetooth.START_SERVICES, (enabled) ? "yes" : "no"); // write daemon settings + boolean sdp_enabled = false; foreach(map d, daemons, ``{ + if ((d["service"]:"") == "SDP") + { + sdp_enabled = (d["enabled"]:false); + } + } + ); + foreach(map d, daemons, ``{ + if ((d["service"]:"") == "SDP") + { + // SDPD is now handled by passing "-s" to hcid, since bluez-3.10 + continue; + } + else if ((d["service"]:"") == "HCI") + { + if (regexpmatch(d["args"]:"", "([ \t]|^)-s([ \t]|$)")) + { + d["args"] = regexpsub(d["args"]:"", "(.*)([ \t]|^)-s([ \t]|$)(.*)", "\\1 \\4"); + } + if (sdp_enabled) + { + d["args"] = "-s " + (d["args"]:""); + } + } SCR::Write(.sysconfig.bluetooth + ((d["service"]:"") + "_START"), d["enabled"]:false ? "yes" : "no"); SCR::Write(.sysconfig.bluetooth + ((d["service"]:"") + "_DAEMON_ARGS"), d["args"]:""); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org