Author: mzugec Date: Mon Sep 3 14:41:27 2007 New Revision: 40709 URL: http://svn.opensuse.org/viewcvs/yast?rev=40709&view=rev Log: - install smartlink-softmodem package for devices with *ttySL* device files (#284287) - correctly match configuration with hardware for modem devices using UDI instead of udi Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modem/complex.ycp trunk/network/src/modem/dialogs.ycp trunk/network/src/modules/Modem.ycp trunk/network/src/routines/complex.ycp trunk/network/src/routines/routines.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=40709&r1=40708&r2=40709&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Sep 3 14:41:27 2007 @@ -1 +1 @@ -2.15.71 +2.15.72 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=40709&r1=40708&r2=40709&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Sep 3 14:41:27 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Sep 3 14:43:39 CEST 2007 - mzugec@suse.cz + +- install smartlink-softmodem package for devices with *ttySL* + device files (#284287) +- correctly match configuration with hardware for modem devices +using UDI instead of udi +- 2.15.72 + +------------------------------------------------------------------- Mon Sep 3 09:37:00 CEST 2007 - mzugec@suse.cz - fixed Proxy testsuite Modified: trunk/network/src/modem/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modem/complex.ycp?rev=40709&r1=40708&r2=40709&view=diff ============================================================================== --- trunk/network/src/modem/complex.ycp (original) +++ trunk/network/src/modem/complex.ycp Mon Sep 3 14:41:27 2007 @@ -314,10 +314,12 @@ Choose a modem for which to change or remove the configuration. Then press the appropriate button: <B>Edit</B> or <B>Delete</B>.</P>"); +/* list overview = Modem::Overview(); list overviewp = Provider::Overview("modem"); y2debug("overview=%1",overview); y2debug("overviewp=%1",overviewp); +*/ // use CWMTab for connections and providers map > widget_descr = $[ Modified: trunk/network/src/modem/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modem/dialogs.ycp?rev=40709&r1=40708&r2=40709&view=diff ============================================================================== --- trunk/network/src/modem/dialogs.ycp (original) +++ trunk/network/src/modem/dialogs.ycp Mon Sep 3 14:41:27 2007 @@ -26,6 +26,10 @@ * @return dialog result */ define symbol ModemDialog(boolean detected) { + // for ttySL install smartlink-softmodem package (#284287) + if(issubstring(Modem::Device, "ttySL")){ + if (!contains(Modem::Requires, "smartlink-softmodem")) Modem::Requires=add(Modem::Requires, "smartlink-softmodem"); + } ScreenName("modem-dialog"); Modified: trunk/network/src/modules/Modem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Modem.ycp?rev=40709&r1=40708&r2=40709&view=diff ============================================================================== --- trunk/network/src/modules/Modem.ycp (original) +++ trunk/network/src/modules/Modem.ycp Mon Sep 3 14:41:27 2007 @@ -239,7 +239,7 @@ /* Setup SL modem */ if(contains(Requires, "smartlink-softmodem")) { - + PackageSystem::CheckAndInstallPackages(Requires); y2milestone("Setting up smartlink-softmodem ..."); Service::Stop("slmodemd"); Modified: trunk/network/src/routines/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/complex.ycp?rev=40709&r1=40708&r2=40709&view=diff ============================================================================== --- trunk/network/src/routines/complex.ycp (original) +++ trunk/network/src/routines/complex.ycp Mon Sep 3 14:41:27 2007 @@ -76,7 +76,7 @@ /* main device summary */ string descr = BuildDescription (devtype, devnum, devmap, Hardware); - string unq = devmap["udi"]:""; + string unq = devmap["UDI"]:""; string status = DeviceStatus(devtype, devnum, devmap); if (link) { Modified: trunk/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.ycp?rev=40709&r1=40708&r2=40709&view=diff ============================================================================== --- trunk/network/src/routines/routines.ycp (original) +++ trunk/network/src/routines/routines.ycp Mon Sep 3 14:41:27 2007 @@ -593,6 +593,8 @@ /* read the corresponding hardware */ if(haskey(hwtypes, hwtype)) allcards = (list) SCR::Read(hwtypes[hwtype]:nil); +// allcards = [$["bus":"PCI", "bus_hwcfg":"pci", "class_id":258, "dev_name":"/dev/ttySL0", "dev_names":["/dev/ttySL0"], "dev_num":$["major":212, "minor":0, "range":1, "type":"c"], "device":"82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller", "device_id":74950, "driver":"Intel ICH Modem", "driver_module":"snd_intel8x0m", "drivers":[$["active":true, "modprobe":true, "modules":[["snd_intel8x0m", ""]]]], "func_id":6, "modalias":"pci:v00008086d000024C6sv0000103Csd000008BCbc07sc03i00", "model":"Hewlett-Packard Company 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller", "old_unique_key":"i5Ju.KmxxluQyLyF", "resource":$["io":[$["active":true, "length":256, "mode":"rw", "start":9216], $["active":true, "length":128, "mode":"rw", "start":10240]], "irq":[$["count":595, "enabled":true, "irq":17]]], "rev":"1", "slot_id":31, "sub_class_id":4, "sub_device_id":67772, "sub_vendor":"Hewlett-Packard Company", "sub_vendor_id":69692, "sysfs_bus_id":"0000:00:1f.6", "sysfs_id":"/devices/pci0000:00/0000:00:1f.6", "udi":"/org/freedesktop/Hal/devices/pci_8086_24c6", "unique_key":"ORVU.KmxxluQyLyF", "vendor":"Intel Corporation", "vendor_id":98438]]; + else if(hwtype == "all" || hwtype == "" || hwtype == nil) maplist(path v, (list<path>) Map::Values(hwtypes), { allcards = merge(allcards, (list) SCR::Read(v)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org