July 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64963 - in /trunk/vm: package/yast2-vm.changes src/relocation-server.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 17:01:06 2011 New Revision: 64963 URL: http://svn.opensuse.org/viewcvs/yast?rev=64963&view=rev Log: Using xdg-su in the Exec entry of control file Modified: trunk/vm/package/yast2-vm.changes trunk/vm/src/relocation-server.desktop Modified: trunk/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/package/yast2-vm.changes?rev=… ============================================================================== --- trunk/vm/package/yast2-vm.changes (original) +++ trunk/vm/package/yast2-vm.changes Fri Jul 22 17:01:06 2011 @@ -2,7 +2,7 @@ Fri Jul 22 15:21:54 CEST 2011 - locilka(a)suse.cz - Removed obsoleted X-KDE-SubstituteUID from desktop file - (bnc#540627) + (bnc#540627) and replaced with xdg-su call in the Exec entry. ------------------------------------------------------------------- Wed Jun 29 13:55:52 CST 2011 - lidongyang(a)novell.com Modified: trunk/vm/src/relocation-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/relocation-server.desktop… ============================================================================== --- trunk/vm/src/relocation-server.desktop (original) +++ trunk/vm/src/relocation-server.desktop Fri Jul 22 17:01:06 2011 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-vm-install -Exec=/sbin/yast2 relocation-server +Exec=/usr/bin/xdg-su -c '/sbin/yast2 relocation-server' Name=Relocation Server Configuration GenericName=relocation-server -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64962 - in /trunk/ipsec: package/yast2-ipsec.changes src/ipsec.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 16:58:31 2011 New Revision: 64962 URL: http://svn.opensuse.org/viewcvs/yast?rev=64962&view=rev Log: Using xdg-su in the Exec entry of control file Modified: trunk/ipsec/package/yast2-ipsec.changes trunk/ipsec/src/ipsec.desktop Modified: trunk/ipsec/package/yast2-ipsec.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ipsec/package/yast2-ipsec.change… ============================================================================== --- trunk/ipsec/package/yast2-ipsec.changes (original) +++ trunk/ipsec/package/yast2-ipsec.changes Fri Jul 22 16:58:31 2011 @@ -2,7 +2,7 @@ Fri Jul 22 15:11:57 CEST 2011 - locilka(a)suse.cz - Removed obsoleted X-KDE-SubstituteUID from desktop file - (bnc#540627) + (bnc#540627) and replaced with xdg-su call in Exec entry. ------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz Modified: trunk/ipsec/src/ipsec.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/ipsec/src/ipsec.desktop?rev=6496… ============================================================================== --- trunk/ipsec/src/ipsec.desktop (original) +++ trunk/ipsec/src/ipsec.desktop Fri Jul 22 16:58:31 2011 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstResource=ipsec Icon=yast-ipsec -Exec=/sbin/yast2 ipsec +Exec=/usr/bin/xdg-su -c '/sbin/yast2 ipsec' Name=VPN GenericName=Configure IPsec virtual private networks (VPNs) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64961 - /tags/stable-2_21_6/yast2/
by mvidner＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: mvidner Date: Fri Jul 22 16:52:15 2011 New Revision: 64961 URL: http://svn.opensuse.org/viewcvs/yast?rev=64961&view=rev Log: Created tag stable-2_21_6 for yast2 Added: tags/stable-2_21_6/yast2/ (props changed) - copied from r64960, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64960 - in /trunk/yast2: ./ library/network/src/ library/network/testsuite/tests/ package/
by mvidner＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: mvidner Date: Fri Jul 22 16:51:53 2011 New Revision: 64960 URL: http://svn.opensuse.org/viewcvs/yast?rev=64960&view=rev Log: Merged fixes from SLE11-SP2: - FCoE detection in NetworkStorage::isDiskOnNetwork (bnc#677251, FATE#306855). - Added NetworkInterfaces::GetTypeFromIfcfg which knows ETHERDEVICE=>vlan (FATE#311380). They are these SVN changes: -c-63066 -c63841 (a reverting one) -c64230 -r64451:64456 Added: trunk/yast2/library/network/testsuite/tests/NetworkStorage.err - copied unchanged from r64456, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkStorage.err trunk/yast2/library/network/testsuite/tests/NetworkStorage.out - copied unchanged from r64456, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkStorage.out trunk/yast2/library/network/testsuite/tests/NetworkStorage.ycp - copied unchanged from r64456, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkStorage.ycp Modified: trunk/yast2/ (props changed) trunk/yast2/VERSION trunk/yast2/library/network/src/NetworkInterfaces.ycp trunk/yast2/library/network/src/NetworkStorage.ycp trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=64960&r1=64959… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Jul 22 16:51:53 2011 @@ -1 +1 @@ -2.21.5 +2.21.6 Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Networ… ============================================================================== --- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Fri Jul 22 16:51:53 2011 @@ -180,18 +180,46 @@ return ifcfg_part (dev, "1"); } +list<string> TypeByKeyValue = [ + "INTERFACETYPE", + "TUNNEL", + ]; +list<list<string> > TypeByKeyExistence = [ + ["ETHERDEVICE", "vlan"], + ]; + +/** + * + */ +global string GetTypeFromIfcfg(ifcfg_t ifcfg) { + string type = nil; // unknown + foreach(list<string> key_type, TypeByKeyExistence, { + string rule_key = key_type[0]:""; + string rule_type = key_type[1]:""; + if (ifcfg[rule_key]:"" != "") { + type = rule_type; + } + }); + foreach(string rule_key, TypeByKeyValue, { + string rule_type = ifcfg[rule_key]:""; + if (rule_type != "") { + type = rule_type; + } + }); +//y2internal("from ifcfg: %1", type); + return type; +} + global string GetType(string dev) { - string type = ifcfg_part (dev, "1"); - // test if this is VLAN (ethX.vlanid) - if (type=="eth" && regexpmatch(dev, "^eth[[:digit:]]+\\.[[:digit:]]+$")) return "vlan"; - foreach(string dev_type,map confs, Devices, { - if (haskey(confs, dev)){ - string int_type = confs[dev, "INTERFACETYPE"]:""; - if (size(confs[dev, "TUNNEL"]:"")>0) int_type = confs[dev, "TUNNEL"]:""; - if(size(int_type)>0) type = int_type; - } - }); - return type; + string type = device_type (dev); + foreach(string dev_type,map<string, ifcfg_t> confs, Devices, { + ifcfg_t ifcfg = confs[dev]:$[]; + string ifcfg_type = GetTypeFromIfcfg(ifcfg); + if (ifcfg_type != nil) + type = ifcfg_type; + }); +//y2internal("original %1: %2", dev, type); + return type; } /** @@ -507,14 +535,6 @@ /* Read devices */ maplist(string d, devices, { - string devtype = GetType(d); - -// string devnum = ""; - // if(regexpmatch(d, "[a-z][a-z-]*[0-9]+")) -// devnum = sformat("%1", device_num(d)); -// y2debug("devnum=%1", devnum); - - map<string, ifcfg_t> dev = Devices[devtype]:$[]; string pth = ".network.value.\"" + d + "\""; y2debug("pth=%1", pth); list<string> values = SCR::Dir(topath(pth)); @@ -561,17 +581,12 @@ config = CanonicalizeIP (config); config = CanonicalizeStartmode (config); - if (size(config["INTERFACETYPE"]:"")>0) { - y2milestone("option INTERFACETYPE changes devtype from %1 to %2", devtype, config["INTERFACETYPE"]:""); - devtype=config["INTERFACETYPE"]:""; - dev = Devices[devtype]:$[]; - } -/* - if(haskey(dev, devnum)) { - y2error("device already present: %1", devnum); - return; + string devtype = GetTypeFromIfcfg(config); + if (devtype == nil) { + devtype = GetType(d); } -*/ + + map<string, ifcfg_t> dev = Devices[devtype]:$[]; dev[d] = config; Devices[devtype] = dev; }); Modified: trunk/yast2/library/network/src/NetworkStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Networ… ============================================================================== --- trunk/yast2/library/network/src/NetworkStorage.ycp (original) +++ trunk/yast2/library/network/src/NetworkStorage.ycp Fri Jul 22 16:51:53 2011 @@ -15,122 +15,141 @@ import "FileUtils"; -global string getDevice(string mount_point){ - map out = (map)SCR::Execute(.target.bash_output, sformat("grep ' %1 ' /proc/mounts|grep -v rootfs|tr -d '\n'", mount_point)); - y2milestone("mountpoint found %1", out); - list<string> rows = splitstring(out["stdout"]:"", " "); - string device=""; - if (rows[2]:""=="nfs") device="nfs"; - else device=rows[0]:""; - y2milestone("%1 is on device: %2", mount_point, device); - return device; +/** + * Ask /proc/mounts what device a mount point is using. + * @return e.g. /dev/sda2 (or just "nfs") + */ +global string getDevice(string mount_point) { + string cmd = sformat("grep ' %1 ' /proc/mounts|grep -v rootfs|tr -d '\n'", mount_point); + map out = (map)SCR::Execute(.target.bash_output, cmd); + y2milestone("mountpoint found %1", out); + list<string> fields = splitstring(out["stdout"]:"", " "); + string vfstype = fields[2]:""; + string device = (vfstype == "nfs" || vfstype == "nfs4")? "nfs": fields[0]:""; + y2milestone("%1 is on device: %2", mount_point, device); + return device; } /** * If the disk is on a networked device (NFS, ISCSI), * the main NIC needs STARTMODE nfsroot instead of auto. - * @return root dev over network + * @return root dev over network: 1 iSCSI, 2 NFS */ -global integer isDiskOnNetwork(string device){ - y2milestone("begin isDiskOnNetwork(%1) function", device); - if (device=="nfs") return 2; - if (size(device)==0) { - y2error("Empty parameter for isDiskOnNetwork() function"); - return -1; - } - integer network_based=0; - - // test for multipath - if (network_based==0 && issubstring(device, "/dev/dm-")) { - y2warning("multipath detected!"); - string dev_name = splitstring(device, "/")[2]:""; - y2milestone("Multipath device name %1", dev_name); - map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, sformat("ls /sys/block/%1/slaves/", dev_name)); - y2milestone("Show slaves command:%1", cmd); - if (cmd["exit"]:-1==0){ - // FIXME: what about more slaves? - list<string> slaves = splitstring(cmd["stdout"]:"", "\n"); - integer nb = isDiskOnNetwork(sformat("/dev/%1", slaves[0]:"")); - if (nb>0) network_based=nb; - } else y2error("Error while executed show slaves commad:%1", cmd["stderr"]:""); - } - - // test for LVM - if (network_based==0 && issubstring(device, "/dev/mapper/")) { - y2warning("LVM detected!"); - string group_name = splitstring(splitstring(device, "/")[3]:"", "-")[0]:""; - y2milestone("LVM group name %1", group_name); - map<string, any> command = (map<string, any>)SCR::Execute(.target.bash_output, sformat("pvs 2>/dev/null|grep %1", group_name)); - foreach(string row, filter(string s, splitstring(command["stdout"]:"", "\n"), { return (size(s)>0);}), { - string lvm_device = filter(string s, splitstring(row, " "), { return (size(s)>0);})[0]:""; - y2milestone("LVM physical device: %1", lvm_device); - integer nb = isDiskOnNetwork(lvm_device); - if (nb>0) network_based=nb; - }); - } - - // test for RAID - if (network_based==0 && issubstring(device, "/dev/md")){ - y2warning("RAID detected!"); - string raid = splitstring(device, "/")[2]:""; - y2milestone("RAID %1 detected", raid); - map<string, any> command = (map<string, any>)SCR::Execute(.target.bash_output, sformat("cat /proc/mdstat |grep %1|tr -d '\\n'", raid)); - list<string> raid_devices = sublist(splitstring(command["stdout"]:"", " "), 4); - foreach(string dev, raid_devices, { - if (!issubstring(dev, "/dev/")) dev = sformat("/dev/%1", dev); - string raid_device = substring(dev, 0, findfirstof(dev, "[")); - integer nb = isDiskOnNetwork(raid_device); - if (nb>0) network_based=nb; - } - ); - } - - //test for iSCSI - if (network_based==0){ - if (issubstring(device, "/dev/")){ - device = splitstring(device, "/")[2]:""; - } - string sys=sformat("/sys/class/block/%1", device); - if (FileUtils::Exists(sys)){ - if ((integer)SCR::Execute(.target.bash, sformat("ls -la %1 | grep -q session", sys))==0){ - y2warning("iSCSI detected!"); - network_based=1; - } - } - } - - // test for nfs (bnc#384420) - if (network_based==0) { - string space="[[:space:]]"; - if (SCR::Execute(.target.bash, sformat("grep '%1%2%3*nfs%4' /proc/mounts ", space, device, space, space))==0){ - y2milestone("device %1 is network based : %2", device, network_based); - network_based=2; - } - } - - //test for FCoE - if (network_based==0){ - if (issubstring(device, "/dev/")){ - device = splitstring(device, "/")[2]:""; - } - string sys=sformat("/sys/class/block/%1", device); - if (FileUtils::Exists(sys)){ - if ((integer)SCR::Execute(.target.bash, sformat("ls -la %1 | grep -q target", sys))==0){ - y2warning("FCoE detected!"); - network_based=3; - } - } - } - - return network_based; +global integer isDiskOnNetwork(string device) { + y2milestone("begin isDiskOnNetwork(%1) function", device); + if (device=="nfs") { + return 2; + } + if (size(device)==0) { + y2error("Empty parameter for isDiskOnNetwork() function"); + return -1; + } + integer network_based=0; + + // test for multipath + if (network_based==0 && issubstring(device, "/dev/dm-")) { + y2warning("multipath detected!"); + string dev_name = splitstring(device, "/")[2]:""; + y2milestone("Multipath device name %1", dev_name); + map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, sformat("ls /sys/block/%1/slaves/", dev_name)); + y2milestone("Show slaves command:%1", cmd); + if (cmd["exit"]:-1==0){ + // FIXME: what about more slaves? + list<string> slaves = splitstring(cmd["stdout"]:"", "\n"); + integer nb = isDiskOnNetwork(sformat("/dev/%1", slaves[0]:"")); + if (nb > 0) { + network_based = nb; + } + } + else { + y2error("Error while executed show slaves commad:%1", cmd["stderr"]:""); + } + } + + // test for LVM + if (network_based==0 && issubstring(device, "/dev/mapper/")) { + y2warning("LVM detected!"); + string group_name = splitstring(splitstring(device, "/")[3]:"", "-")[0]:""; + y2milestone("LVM group name %1", group_name); + map<string, any> command = (map<string, any>)SCR::Execute(.target.bash_output, sformat("pvs 2>/dev/null|grep %1", group_name)); + foreach(string row, filter(string s, splitstring(command["stdout"]:"", "\n"), { return (size(s) > 0);}), { + string lvm_device = filter(string s, splitstring(row, " "), { return (size(s)>0);})[0]:""; + y2milestone("LVM physical device: %1", lvm_device); + integer nb = isDiskOnNetwork(lvm_device); + if (nb > 0) { + network_based = nb; + } + }); + } + + // test for RAID + if (network_based==0 && issubstring(device, "/dev/md")){ + y2warning("RAID detected!"); + string raid = splitstring(device, "/")[2]:""; + y2milestone("RAID %1 detected", raid); + map<string, any> command = (map<string, any>)SCR::Execute(.target.bash_output, sformat("cat /proc/mdstat |grep %1|tr -d '\\n'", raid)); + list<string> raid_devices = sublist(splitstring(command["stdout"]:"", " "), 4); + foreach(string dev, raid_devices, { + if (!issubstring(dev, "/dev/")) { + dev = sformat("/dev/%1", dev); + } + string raid_device = substring(dev, 0, findfirstof(dev, "[")); + integer nb = isDiskOnNetwork(raid_device); + if (nb > 0) { + network_based = nb; + } + }); + } + + //test for iSCSI + if (network_based==0){ + if (issubstring(device, "/dev/")){ + device = splitstring(device, "/")[2]:""; + } + string sys=sformat("/sys/class/block/%1", device); + if (FileUtils::Exists(sys)){ + if ((integer)SCR::Execute(.target.bash, sformat("ls -la %1 | grep -q session", sys))==0){ + y2warning("iSCSI detected!"); + network_based = 1; + } + } + } + + //test for FCoE + if (network_based==0){ + if (issubstring(device, "/dev/")){ + device = splitstring(device, "/")[2]:""; + } + + string sys=sformat("/sys/class/block/%1/device", device); + if (FileUtils::Exists(sys) && FileUtils::IsDirectory(sys)){ + if ((integer)SCR::Execute(.target.bash, sformat("cd %1; pwd -P | grep -q target", sys))==0){ + y2warning("FCoE detected!"); + network_based = 3; + } + } + } + + // test for nfs (bnc#384420) + if (network_based==0) { + string space="[[:space:]]"; + if (SCR::Execute(.target.bash, sformat("grep '%1%2%3*nfs%4' /proc/mounts ", space, device, space, space))==0){ + y2milestone("device %1 is network based : %2", device, network_based); + network_based = 2; + } + } + return network_based; } -global list<string> getiBFTDevices(){ - if (SCR::Execute(.target.bash, "ls /sys/firmware/ibft")==0){ - map<string, any> output = (map<string, any>)SCR::Execute(.target.bash_output, "ls /sys/firmware/ibft/ethernet*/device/net/"); - list<string> ifaces = filter(string row, splitstring(output["stdout"]:"", "\n"), { return (size(row)>0);}); - return ifaces; - } else return []; +global list<string> getiBFTDevices() { + if (SCR::Execute(.target.bash, "ls /sys/firmware/ibft")==0){ + map<string, any> output = (map<string, any>)SCR::Execute(.target.bash_output, "ls /sys/firmware/ibft/ethernet*/device/net/"); + list<string> ifaces = filter(string row, splitstring(output["stdout"]:"", "\n"), { return (size(row)>0);}); + return ifaces; + } + else { + return []; + } } /* EOF */ Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/… ============================================================================== --- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out (original) +++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out Fri Jul 22 16:51:53 2011 @@ -9,8 +9,6 @@ Dump ifcfg-lo, type: lo Dump ifcfg-eth0#1, type: eth Dump ifcfg-eth1#20, type: eth -Dump ifcfg-eth0.1, type: vlan -Dump ifcfg-eth1.20, type: vlan Dump ifcfg-eth-pcmcia-0#3, type: eth Dump ifcfg-eth-usb-1#0, type: eth Dump ifcfg-tr-pcmcia-2#432, type: tr Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/… ============================================================================== --- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp (original) +++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp Fri Jul 22 16:51:53 2011 @@ -20,8 +20,6 @@ "lo", "eth0#1", "eth1#20", - "eth0.1", - "eth1.20", "eth-pcmcia-0#3", "eth-usb-1#0", "tr-pcmcia-2#432", Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/… ============================================================================== --- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out (original) +++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out Fri Jul 22 16:51:53 2011 @@ -1,5 +1,5 @@ Dump NetworkInterfaces::Read -Dir .network.section: ["arc5", "atm5", "ci5", "ctc5", "dummy5", "escon5", "eth5", "eth6", "eth7", "eth8", "eth9", "fddi5", "hippi5", "hsi5", "ippp5", "iucv5", "lo", "mynet0", "myri5", "ppp5", "tr5", "tr~"] +Dir .network.section: ["arc5", "atm5", "ci5", "ctc5", "dummy5", "escon5", "eth0.3", "eth5", "eth6", "eth7", "eth8", "eth9", "fddi5", "hippi5", "hsi5", "ippp5", "iucv5", "lo", "mynet0", "myri5", "myvlantoo", "ppp5", "tr5", "tr~", "virtlan4", "vlan3"] Dir .network.value."arc5": ["BOOTPROTO", "STARTMODE"] Read .network.value."arc5".BOOTPROTO "dhcp" Read .network.value."arc5".STARTMODE "manual" @@ -20,6 +20,10 @@ Dir .network.value."escon5": ["BOOTPROTO", "STARTMODE"] Read .network.value."escon5".BOOTPROTO "dhcp" Read .network.value."escon5".STARTMODE "manual" +Dir .network.value."eth0.3": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE"] +Read .network.value."eth0.3".BOOTPROTO "dhcp" +Read .network.value."eth0.3".ETHERDEVICE "eth0" +Read .network.value."eth0.3".STARTMODE "manual" Dir .network.value."eth5": ["BOOTPROTO", "STARTMODE"] Read .network.value."eth5".BOOTPROTO "dhcp" Read .network.value."eth5".STARTMODE "manual" @@ -64,14 +68,27 @@ Dir .network.value."myri5": ["BOOTPROTO", "STARTMODE"] Read .network.value."myri5".BOOTPROTO "dhcp" Read .network.value."myri5".STARTMODE "manual" +Dir .network.value."myvlantoo": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE", "VLAN_ID"] +Read .network.value."myvlantoo".BOOTPROTO "dhcp" +Read .network.value."myvlantoo".ETHERDEVICE "eth0" +Read .network.value."myvlantoo".STARTMODE "manual" +Read .network.value."myvlantoo".VLAN_ID "2" Dir .network.value."ppp5": ["BOOTPROTO", "STARTMODE"] Read .network.value."ppp5".BOOTPROTO "dhcp" Read .network.value."ppp5".STARTMODE "manual" Dir .network.value."tr5": ["BOOTPROTO", "STARTMODE"] Read .network.value."tr5".BOOTPROTO "dhcp" Read .network.value."tr5".STARTMODE "manual" +Dir .network.value."virtlan4": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE"] +Read .network.value."virtlan4".BOOTPROTO "dhcp" +Read .network.value."virtlan4".ETHERDEVICE "eth0" +Read .network.value."virtlan4".STARTMODE "manual" +Dir .network.value."vlan3": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE"] +Read .network.value."vlan3".BOOTPROTO "dhcp" +Read .network.value."vlan3".ETHERDEVICE "eth0" +Read .network.value."vlan3".STARTMODE "manual" Return true -Dump all=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hippi": $["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]]] +Dump all=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hippi": $["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "vlan":$["eth0.3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "myvlantoo":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual", "VLAN_ID":"2"], "virtlan4":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "vlan3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"]]] Dump NetworkInterfaces::Write Write .network.value."arc5".BOOTPROTO "dhcp" true Write .network.value."arc5".STARTMODE "manual" true @@ -124,6 +141,19 @@ Write .network.value."ppp5".STARTMODE "manual" true Write .network.value."tr5".BOOTPROTO "dhcp" true Write .network.value."tr5".STARTMODE "manual" true +Write .network.value."eth0.3".BOOTPROTO "dhcp" true +Write .network.value."eth0.3".ETHERDEVICE "eth0" true +Write .network.value."eth0.3".STARTMODE "manual" true +Write .network.value."myvlantoo".BOOTPROTO "dhcp" true +Write .network.value."myvlantoo".ETHERDEVICE "eth0" true +Write .network.value."myvlantoo".STARTMODE "manual" true +Write .network.value."myvlantoo".VLAN_ID "2" true +Write .network.value."virtlan4".BOOTPROTO "dhcp" true +Write .network.value."virtlan4".ETHERDEVICE "eth0" true +Write .network.value."virtlan4".STARTMODE "manual" true +Write .network.value."vlan3".BOOTPROTO "dhcp" true +Write .network.value."vlan3".ETHERDEVICE "eth0" true +Write .network.value."vlan3".STARTMODE "manual" true Write .network nil true Return true Write .network.value."eth5".BOOTPROTO "dhcp" true @@ -161,9 +191,9 @@ Write .network nil true Return true Dump NetworkInterfaces::Export -Dump exported=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hi ppi":$["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]]] +Dump exported=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hi ppi":$["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "vlan":$["eth0.3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "myvlantoo":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual", "VLAN_ID":"2"], "virtlan4":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "vlan3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"]]] Dump NetworkInterfaces::Import -Dump all =$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hippi":$[ "hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]]] +Dump all =$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hippi":$[ "hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "vlan":$["eth0.3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "myvlantoo":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual", "VLAN_ID":"2"], "virtlan4":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "vlan3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"]]] Dump NetworkInterfaces::GetFreeDevices Return ["1", "2"] Return ["0", "2"] Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/… ============================================================================== --- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp (original) +++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp Fri Jul 22 16:51:53 2011 @@ -29,6 +29,10 @@ "ppp5" : nil, "tr5" : nil, "tr~" : nil, + "vlan3" : nil, + "eth0.3" : nil, + "virtlan4" : nil, + "myvlantoo" : nil, ], "value" : $[ "arc5" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual"], @@ -55,6 +59,10 @@ "myri5" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "ppp5" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "tr5" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual"], + "vlan3" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual", "ETHERDEVICE": "eth0"], + "eth0.3" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual", "ETHERDEVICE": "eth0"], + "virtlan4" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual", "ETHERDEVICE": "eth0"], + "myvlantoo" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual", "ETHERDEVICE": "eth0", "VLAN_ID": "2"], ] ], "probe" : $[ Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Jul 22 16:51:53 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jul 22 16:18:30 CEST 2011 - mvidner(a)suse.cz + +- FCoE detection in NetworkStorage::isDiskOnNetwork (bnc#677251, FATE#306855). +- Added NetworkInterfaces::GetTypeFromIfcfg which knows + ETHERDEVICE=>vlan (FATE#311380). +- 2.21.6 + +------------------------------------------------------------------- Fri Jul 22 16:10:07 CEST 2011 - locilka(a)suse.cz - Removed obsoleted X-KDE-SubstituteUID from desktop files -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64959 - in /trunk/ldap-client: package/yast2-ldap-client.changes src/ldap_browser.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 16:46:07 2011 New Revision: 64959 URL: http://svn.opensuse.org/viewcvs/yast?rev=64959&view=rev Log: xdg-su used in the Exec entry in desktop file (root-only module) Modified: trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/ldap_browser.desktop Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Fri Jul 22 16:46:07 2011 @@ -2,7 +2,7 @@ Fri Jul 22 15:07:22 CEST 2011 - locilka(a)suse.cz - Removed obsoleted X-KDE-SubstituteUID from desktop file - (bnc#540627) + (bnc#540627) and replaced with xdg-su in the Exec entry. ------------------------------------------------------------------- Fri Jul 15 11:56:55 CEST 2011 - jsuchome(a)suse.cz Modified: trunk/ldap-client/src/ldap_browser.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap_browser.des… ============================================================================== --- trunk/ldap-client/src/ldap_browser.desktop (original) +++ trunk/ldap-client/src/ldap_browser.desktop Fri Jul 22 16:46:07 2011 @@ -17,7 +17,7 @@ X-SuSE-YaST-Keywords=ldap,browse Icon=yast-ldap-browser -Exec=/sbin/yast2 ldap_browser +Exec=/usr/bin/xdg-su -c '/sbin/yast2 ldap_browser' Name=LDAP Browser GenericName=Browse the LDAP repository -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64958 - in /trunk/apparmor: package/yast2-apparmor.changes src/desktop/yast2-apparmor.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 16:41:21 2011 New Revision: 64958 URL: http://svn.opensuse.org/viewcvs/yast?rev=64958&view=rev Log: - Exec entry in desktop file called using xdg-su (bnc#540627) Modified: trunk/apparmor/package/yast2-apparmor.changes trunk/apparmor/src/desktop/yast2-apparmor.desktop Modified: trunk/apparmor/package/yast2-apparmor.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/package/yast2-apparmor.… ============================================================================== --- trunk/apparmor/package/yast2-apparmor.changes (original) +++ trunk/apparmor/package/yast2-apparmor.changes Fri Jul 22 16:41:21 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jul 22 16:39:45 CEST 2011 - locilka(a)suse.cz + +- Exec entry in desktop file called using xdg-su (bnc#540627) + +------------------------------------------------------------------- Thu Jun 30 12:48:43 UTC 2011 - jreidinger(a)novell.com - fix typos (bnc#702639) Modified: trunk/apparmor/src/desktop/yast2-apparmor.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/desktop/yast2-appar… ============================================================================== --- trunk/apparmor/src/desktop/yast2-apparmor.desktop (original) +++ trunk/apparmor/src/desktop/yast2-apparmor.desktop Fri Jul 22 16:41:21 2011 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstClonable=false Icon=apparmor_view_profile -Exec=/sbin/yast2 apparmor +Exec=/usr/bin/xdg-su -c '/sbin/yast2 apparmor' Name=AppArmor Configuration GenericName=AppArmor Configuration -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64957 - /tags/stable-2_21_3/add-on/
by lslezak＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: lslezak Date: Fri Jul 22 16:34:00 2011 New Revision: 64957 URL: http://svn.opensuse.org/viewcvs/yast?rev=64957&view=rev Log: Created tag stable-2_21_3 for add-on Added: tags/stable-2_21_3/add-on/ - copied from r64956, trunk/add-on/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64956 - in /trunk/add-on: VERSION package/yast2-add-on.changes src/add-on-workflow.ycp
by lslezak＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: lslezak Date: Fri Jul 22 16:33:53 2011 New Revision: 64956 URL: http://svn.opensuse.org/viewcvs/yast?rev=64956&view=rev Log: - properly remove an add-on from installation workflow when it is not compliant (bnc#701497) - 2.21.3 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=64956&r1=6495… ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Fri Jul 22 16:33:53 2011 @@ -1 +1 @@ -2.21.2 +2.21.3 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Fri Jul 22 16:33:53 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jul 22 13:28:42 UTC 2011 - lslezak(a)suse.cz + +- properly remove an add-on from installation workflow when it + is not compliant (bnc#701497) +- 2.21.3 + +------------------------------------------------------------------- Wed Jun 29 18:07:46 CEST 2011 - ug(a)suse.de - fixed relurl://.... for add-on config in autoyast XML Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?r… ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Fri Jul 22 16:33:53 2011 @@ -1017,6 +1017,22 @@ AddOnProduct::PrepareForRegistration (AddOnProduct::src_id); some_addon_changed = true; } + else if (ret == `abort || ret == `cancel) + { + y2milestone("Add-on sequence aborted"); + + if (AddOnProduct::src_id != nil) + { + y2milestone("Removing add-on repository: %1", AddOnProduct::src_id); + + // remove the repository + Pkg::SourceDelete(AddOnProduct::src_id); + + AddOnProduct::add_on_products = filter(map<string,any> add_on_product, AddOnProduct::add_on_products, + {return add_on_product["media"]:-1 != AddOnProduct::src_id;} + ); + } + } Redraw (enable_back, enable_next, enable_abort, back_button, next_button, abort_button); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64955 - in /trunk/autoinstallation: package/ src/config/
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 16:33:30 2011 New Revision: 64955 URL: http://svn.opensuse.org/viewcvs/yast?rev=64955&view=rev Log: - Removed obsoleted X-KDE-SubstituteUID from desktop all files and replaced with xdg-su for autoyast desktop file (bnc#540627) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/config/autoyast.desktop trunk/autoinstallation/src/config/files.desktop trunk/autoinstallation/src/config/general.desktop trunk/autoinstallation/src/config/partitioning.desktop trunk/autoinstallation/src/config/report.desktop trunk/autoinstallation/src/config/scripts.desktop trunk/autoinstallation/src/config/software.desktop Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri Jul 22 16:33:30 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 16:30:45 CEST 2011 - locilka(a)suse.cz + +- Removed obsoleted X-KDE-SubstituteUID from desktop all files and + replaced with xdg-su for autoyast desktop file (bnc#540627) + +------------------------------------------------------------------- Fri Jul 22 09:58:54 CEST 2011 - ug(a)suse.de - passing a type=boolean to an ask-script via $VAL did not work Modified: trunk/autoinstallation/src/config/autoyast.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/config/auto… ============================================================================== --- trunk/autoinstallation/src/config/autoyast.desktop (original) +++ trunk/autoinstallation/src/config/autoyast.desktop Fri Jul 22 16:33:30 2011 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-autoyast -Exec=/sbin/yast2 autoyast +Exec=/usr/bin/xdg-su -c '/sbin/yast2 autoyast' Name=Autoinstallation GenericName=Configuration system for autoinstallation -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/autoinstallation/src/config/files.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/config/file… ============================================================================== --- trunk/autoinstallation/src/config/files.desktop (original) +++ trunk/autoinstallation/src/config/files.desktop Fri Jul 22 16:33:30 2011 @@ -23,5 +23,4 @@ Name=Complete Configuration Files GenericName=Add Complete Configuration Files -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/autoinstallation/src/config/general.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/config/gene… ============================================================================== --- trunk/autoinstallation/src/config/general.desktop (original) +++ trunk/autoinstallation/src/config/general.desktop Fri Jul 22 16:33:30 2011 @@ -23,5 +23,4 @@ Name=General Options GenericName=Configure General Autoinstallation Options -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/autoinstallation/src/config/partitioning.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/config/part… ============================================================================== --- trunk/autoinstallation/src/config/partitioning.desktop (original) +++ trunk/autoinstallation/src/config/partitioning.desktop Fri Jul 22 16:33:30 2011 @@ -25,5 +25,4 @@ Name=Partitioning GenericName=Configure Partitioning and Storage Settings -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/autoinstallation/src/config/report.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/config/repo… ============================================================================== --- trunk/autoinstallation/src/config/report.desktop (original) +++ trunk/autoinstallation/src/config/report.desktop Fri Jul 22 16:33:30 2011 @@ -23,5 +23,4 @@ Name=Reporting & Logging GenericName=Configure Reporting and Logging Options -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/autoinstallation/src/config/scripts.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/config/scri… ============================================================================== --- trunk/autoinstallation/src/config/scripts.desktop (original) +++ trunk/autoinstallation/src/config/scripts.desktop Fri Jul 22 16:33:30 2011 @@ -22,5 +22,4 @@ Name=Custom Scripts GenericName=Add or Edit Custom Scripts -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/autoinstallation/src/config/software.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/config/soft… ============================================================================== --- trunk/autoinstallation/src/config/software.desktop (original) +++ trunk/autoinstallation/src/config/software.desktop Fri Jul 22 16:33:30 2011 @@ -23,5 +23,4 @@ Name=Package Selection GenericName=Configure Package Selection and Software Settings -X-KDE-SubstituteUID=true StartupNotify=true -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64954 - in /trunk/yast2: library/desktop/groups/ package/ remote/
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 16:13:06 2011 New Revision: 64954 URL: http://svn.opensuse.org/viewcvs/yast?rev=64954&view=rev Log: - Removed obsoleted X-KDE-SubstituteUID from desktop files (bnc#540627) Modified: trunk/yast2/library/desktop/groups/hardware.desktop trunk/yast2/library/desktop/groups/misc.desktop trunk/yast2/library/desktop/groups/network_devices.desktop trunk/yast2/library/desktop/groups/network_services.desktop trunk/yast2/library/desktop/groups/security.desktop trunk/yast2/library/desktop/groups/software.desktop trunk/yast2/library/desktop/groups/support.desktop trunk/yast2/library/desktop/groups/system.desktop trunk/yast2/package/yast2.changes trunk/yast2/remote/remotechooser.desktop trunk/yast2/remote/remoteinstall.desktop Modified: trunk/yast2/library/desktop/groups/hardware.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/groups/har… ============================================================================== --- trunk/yast2/library/desktop/groups/hardware.desktop (original) +++ trunk/yast2/library/desktop/groups/hardware.desktop Fri Jul 22 16:13:06 2011 @@ -14,6 +14,5 @@ Icon=yast-hardware Name=Hardware -X-KDE-SubstituteUID=true Exec=/sbin/yast2 Modified: trunk/yast2/library/desktop/groups/misc.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/groups/mis… ============================================================================== --- trunk/yast2/library/desktop/groups/misc.desktop (original) +++ trunk/yast2/library/desktop/groups/misc.desktop Fri Jul 22 16:13:06 2011 @@ -14,6 +14,5 @@ Icon=yast-misc Name=Miscellaneous -X-KDE-SubstituteUID=true Exec=/sbin/yast2 Modified: trunk/yast2/library/desktop/groups/network_devices.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/groups/net… ============================================================================== --- trunk/yast2/library/desktop/groups/network_devices.desktop (original) +++ trunk/yast2/library/desktop/groups/network_devices.desktop Fri Jul 22 16:13:06 2011 @@ -14,6 +14,5 @@ Icon=yast-network_devices Name=Network Devices -X-KDE-SubstituteUID=true Exec=/sbin/yast2 Modified: trunk/yast2/library/desktop/groups/network_services.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/groups/net… ============================================================================== --- trunk/yast2/library/desktop/groups/network_services.desktop (original) +++ trunk/yast2/library/desktop/groups/network_services.desktop Fri Jul 22 16:13:06 2011 @@ -14,6 +14,5 @@ Icon=yast-network_services Name=Network Services -X-KDE-SubstituteUID=true Exec=/sbin/yast2 Modified: trunk/yast2/library/desktop/groups/security.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/groups/sec… ============================================================================== --- trunk/yast2/library/desktop/groups/security.desktop (original) +++ trunk/yast2/library/desktop/groups/security.desktop Fri Jul 22 16:13:06 2011 @@ -15,6 +15,4 @@ Name=Security and Users -X-KDE-SubstituteUID=true - Exec=/sbin/yast2 Modified: trunk/yast2/library/desktop/groups/software.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/groups/sof… ============================================================================== --- trunk/yast2/library/desktop/groups/software.desktop (original) +++ trunk/yast2/library/desktop/groups/software.desktop Fri Jul 22 16:13:06 2011 @@ -14,6 +14,5 @@ Icon=yast-software Name=Software -X-KDE-SubstituteUID=true Exec=/sbin/yast2 Modified: trunk/yast2/library/desktop/groups/support.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/groups/sup… ============================================================================== --- trunk/yast2/library/desktop/groups/support.desktop (original) +++ trunk/yast2/library/desktop/groups/support.desktop Fri Jul 22 16:13:06 2011 @@ -14,6 +14,5 @@ Icon=yast-support Name=Support -X-KDE-SubstituteUID=true Exec=/sbin/yast2 Modified: trunk/yast2/library/desktop/groups/system.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/groups/sys… ============================================================================== --- trunk/yast2/library/desktop/groups/system.desktop (original) +++ trunk/yast2/library/desktop/groups/system.desktop Fri Jul 22 16:13:06 2011 @@ -14,6 +14,5 @@ Icon=yast-system Name=System -X-KDE-SubstituteUID=true Exec=/sbin/yast2 Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Jul 22 16:13:06 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 16:10:07 CEST 2011 - locilka(a)suse.cz + +- Removed obsoleted X-KDE-SubstituteUID from desktop files + (bnc#540627) + +------------------------------------------------------------------- Thu Jul 21 15:15:51 CEST 2011 - locilka(a)suse.cz - Fixed SuSEfirewall2 config library: By default any unassigned Modified: trunk/yast2/remote/remotechooser.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/remote/remotechooser.deskt… ============================================================================== --- trunk/yast2/remote/remotechooser.desktop (original) +++ trunk/yast2/remote/remotechooser.desktop Fri Jul 22 16:13:06 2011 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-remotechooser -Exec=/sbin/yast2 remotechooser +Exec=/usr/bin/xdg-su -c '/sbin/yast2 remotechooser' Name=Remote Administration GenericName=Administer Remote Host -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/yast2/remote/remoteinstall.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/remote/remoteinstall.deskt… ============================================================================== --- trunk/yast2/remote/remoteinstall.desktop (original) +++ trunk/yast2/remote/remoteinstall.desktop Fri Jul 22 16:13:06 2011 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-remoteinstall -Exec=/sbin/yast2 remoteinstall +Exec=/usr/bin/xdg-su -c '/sbin/yast2 remoteinstall' Name=Remote Installation GenericName=Run Installation on Remote Host -X-KDE-SubstituteUID=true StartupNotify=true -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0