March 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56428 - in /trunk/autoinstallation: doc/CreateProfileDetails.xml package/autoyast2.changes
by ug＠svn.opensuse.org 26 Mar '09

26 Mar '09

Author: ug Date: Thu Mar 26 15:28:21 2009 New Revision: 56428 URL: http://svn.opensuse.org/viewcvs/yast?rev=56428&view=rev Log: bootloader docu updated Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml trunk/autoinstallation/package/autoyast2.changes Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfi… ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Thu Mar 26 15:28:21 2009 @@ -317,7 +317,34 @@ <para>yaboot</para> </listitem> </itemizedlist> - + <para> +Here are some important options for handling the content of the MBR: +<itemizedlist> + <listitem> + <para><boot_mbr> means write GRUB stage1 to MBR (if it is true)</para> + </listitem> + <listitem> + <para><generic_mbr> means write generic boot code to MBR (if it is true)</para> + </listitem> + <listitem> + <para><activate> set boot flag to boot or root partition (if it is true) it depends on partitioning of disk and moinpoints</para> + </listitem> + </itemizedlist> +If you want to disable the overwriting of the MBR set <boot_mbr> and <generic_mbr> to false: +<screen> +<bootloader> + .... + <global> + <activate>true</activate> + <generic_mbr>false</generic_mbr> + <boot_mbr>false</boot_mbr> + </global> + .... +</bootloader> +</screen> +If <activate> is true the boot flag is changed to the boot or root partition. +If the boot partition is missing and root partition is on a logical partition, the boot flag will be set to extended partition. + </para> </section> <section id="CreateProfile.Partitioning"> 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 Thu Mar 26 15:28:21 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 26 15:28:13 CET 2009 - ug(a)suse.de + +- bootloader docu updated + +------------------------------------------------------------------- Wed Mar 18 12:05:42 CET 2009 - ug(a)suse.de - autoyast fails to add add-on product with iso image (bnc#484735) -- 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] r56427 - /trunk/ncurses/src/NCIntField.cc
by gs＠svn.opensuse.org 26 Mar '09

26 Mar '09

Author: gs Date: Thu Mar 26 14:58:36 2009 New Revision: 56427 URL: http://svn.opensuse.org/viewcvs/yast?rev=56427&view=rev Log: set vstart correctly (start of value drawing) (bug #488757) Modified: trunk/ncurses/src/NCIntField.cc Modified: trunk/ncurses/src/NCIntField.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCIntField.cc?rev=56… ============================================================================== --- trunk/ncurses/src/NCIntField.cc (original) +++ trunk/ncurses/src/NCIntField.cc Thu Mar 26 14:58:36 2009 @@ -124,7 +124,15 @@ trect.Pos.L, trect.Pos.C, 'r' ); - vstart = ( vlen + 2 < ( unsigned )trect.Sze.W ) ? label.width() - vlen - 2 : 0; + //vstart = ( vlen + 2 < ( unsigned )trect.Sze.W ) ? label.width() - vlen - 2 : 0; + vstart = 0; + // vstart is calculated from label width only if value length (+ tags) is smaller + // than window width AND smaller than label width, otherwise start with 0 + // (bug #488757) + if ( vlen + 2 < ( unsigned )trect.Sze.W && vlen + 2 < label.width() ) + { + vstart = label.width() - vlen - 2; + } } -- 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] r56426 - in /trunk/storage/libstorage/src: AppUtil.cc AppUtil.h ProcMounts.cc Storage.cc
by aschnell＠svn.opensuse.org 26 Mar '09

26 Mar '09

Author: aschnell Date: Thu Mar 26 14:27:01 2009 New Revision: 56426 URL: http://svn.opensuse.org/viewcvs/yast?rev=56426&view=rev Log: - some refactoring Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/ProcMounts.cc trunk/storage/libstorage/src/Storage.cc Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.c… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Thu Mar 26 14:27:01 2009 @@ -395,29 +395,31 @@ } -void -getUdevMap(const char* path, map<string, list<string>>& m) +map<string, list<string>> +getUdevMap(const char* path) { - y2mil( "path: " << path ); + y2mil("path: " << path); - map<string, string> links = getUdevLinks(path); + const map<string, string> links = getUdevLinks(path); - m.clear(); - for (map<string, string>::const_iterator it = links.begin(); it != links.end(); it++) - m[it->second].push_back(it->first); + map<string, list<string>> ret; + for (map<string, string>::const_iterator it = links.begin(); it != links.end(); ++it) + ret[it->second].push_back(it->first); - y2mil("map: " << m); + y2mil("map: " << ret); + return ret; } -void -getRevUdevMap(const char* path, map<string, string>& m) +map<string, string> +getRevUdevMap(const char* path) { y2mil("path: " << path); - m = getUdevLinks(path); + map<string, string> ret = getUdevLinks(path); - y2mil("map: " << m); + y2mil("map: " << ret); + return ret; } Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Thu Mar 26 14:27:01 2009 @@ -12,6 +12,8 @@ namespace storage { using std::string; + using std::list; + using std::map; void createPath(const string& Path_Cv); @@ -26,8 +28,8 @@ const string& delim = "=", const string& removeSur = " \t\n" ); -void getUdevMap(const char* path, std::map<string, std::list<string>>& m); -void getRevUdevMap(const char* path, std::map<string, string>& m); + map<string, list<string>> getUdevMap(const char* path); + map<string, string> getRevUdevMap(const char* path); string normalizeDevice( const string& dev ); void normalizeDevice( string& dev ); Modified: trunk/storage/libstorage/src/ProcMounts.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcMount… ============================================================================== --- trunk/storage/libstorage/src/ProcMounts.cc (original) +++ trunk/storage/libstorage/src/ProcMounts.cc Thu Mar 26 14:27:01 2009 @@ -20,10 +20,8 @@ ProcMounts::ProcMounts( Storage * const sto ) { - map<string,string> by_label; - map<string,string> by_uuid; - getRevUdevMap("/dev/disk/by-label", by_label); - getRevUdevMap("/dev/disk/by-uuid", by_uuid); + const map<string, string> by_label = getRevUdevMap("/dev/disk/by-label"); + const map<string, string> by_uuid = getRevUdevMap("/dev/disk/by-uuid"); ifstream mounts( "/proc/mounts" ); classic(mounts); string line; @@ -32,24 +30,26 @@ while( mounts.good() ) { string dev = extractNthWord( 0, line ); - if( dev.find( "/by-label/" ) != string::npos ) + if (boost::contains(dev, "/by-label/")) { dev = dev.substr( dev.rfind( "/" )+1 ); y2mil( "dev:" << dev ); - if( !by_label[dev].empty() ) - { - dev = by_label[dev]; + map<string, string>::const_iterator it = by_label.find(dev); + if (it != by_label.end()) + { + dev = it->second; normalizeDevice( dev ); y2mil( "dev:" << dev ); } } - else if( dev.find( "/by-uuid/" ) != string::npos ) + else if (boost::contains(dev, "/by-uuid/")) { dev = dev.substr( dev.rfind( "/" )+1 ); y2mil( "dev:" << dev ); - if( !by_uuid[dev].empty() ) + map<string, string>::const_iterator it = by_uuid.find(dev); + if (it != by_uuid.end()) { - dev = by_uuid[dev]; + dev = it->second; normalizeDevice( dev ); y2mil( "dev:" << dev ); } Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Thu Mar 26 14:27:01 2009 @@ -502,16 +502,15 @@ DmraidCo::getRaids(l); if (!l.empty()) { - map<string, list<string>> by_id; - getUdevMap("/dev/disk/by-id", by_id); + const map<string, list<string>> by_id = getUdevMap("/dev/disk/by-id"); for( list<string>::const_iterator i=l.begin(); i!=l.end(); ++i ) { DmraidCo * v = new DmraidCo( this, *i, ppart ); if( v->isValid() ) { - list<string> nm = by_id["dm-"+decString(v->minorNr())]; - if( !nm.empty() ) - v->setUdevData( nm ); + map<string, list<string>>::const_iterator it = by_id.find("dm-" + decString(v->minorNr())); + if (it != by_id.end()) + v->setUdevData(it->second); addToList( v ); } else @@ -545,16 +544,15 @@ DmmultipathCo::getMultipaths(l); if (!l.empty()) { - map<string, list<string>> by_id; - getUdevMap("/dev/disk/by-id", by_id); + const map<string, list<string>> by_id = getUdevMap("/dev/disk/by-id"); for( list<string>::const_iterator i=l.begin(); i!=l.end(); ++i ) { DmmultipathCo * v = new DmmultipathCo( this, *i, ppart ); if( v->isValid() ) { - list<string> nm = by_id["dm-"+decString(v->minorNr())]; - if (!nm.empty()) - v->setUdevData( nm ); + map<string, list<string>>::const_iterator it = by_id.find("dm-" + decString(v->minorNr())); + if (it != by_id.end()) + v->setUdevData(it->second); addToList( v ); } else @@ -675,10 +673,8 @@ struct dirent *Entry; if( (Dir=opendir(SYSFSDIR))!=NULL ) { - map<string,list<string>> by_path; - map<string,list<string>> by_id; - getUdevMap("/dev/disk/by-path", by_path); - getUdevMap("/dev/disk/by-id", by_id); + const map<string, list<string>> by_path = getUdevMap("/dev/disk/by-path"); + const map<string, list<string>> by_id = getUdevMap("/dev/disk/by-id"); list<DiskData> dl; while( (Entry=readdir( Dir ))!=NULL ) { @@ -739,10 +735,17 @@ { if( i->d ) { - string tmp; - if (!by_path[i->dev].empty()) - tmp = by_path[i->dev].front(); - i->d->setUdevData(tmp, by_id[i->dev]); + string tmp1; + map<string, list<string>>::const_iterator it1 = by_path.find(i->dev); + if (it1 != by_path.end()) + tmp1 = it1->second.front(); + + list<string> tmp2; + map<string, list<string>>::const_iterator it2 = by_id.find(i->dev); + if (it2 != by_id.end()) + tmp2 = it2->second; + + i->d->setUdevData(tmp1, tmp2); addToList( i->d ); } } -- 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] r56425 - in /trunk/sound: package/yast2-sound.changes sound/agents/modprobe_sound.scr sound/src/Sound.ycp sound/src/read_routines.ycp sound/src/sound_write.ycp sound/src/write_routines.ycp
by lslezak＠svn.opensuse.org 26 Mar '09

26 Mar '09

Author: lslezak Date: Thu Mar 26 12:55:40 2009 New Revision: 56425 URL: http://svn.opensuse.org/viewcvs/yast?rev=56425&view=rev Log: - Use /etc/modprobe.d/50-sound.conf config file instead of /etc/modprobe.d/sound (bnc#485942) Modified: trunk/sound/package/yast2-sound.changes trunk/sound/sound/agents/modprobe_sound.scr trunk/sound/sound/src/Sound.ycp trunk/sound/sound/src/read_routines.ycp trunk/sound/sound/src/sound_write.ycp trunk/sound/sound/src/write_routines.ycp Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Thu Mar 26 12:55:40 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 26 12:54:41 CET 2009 - lslezak(a)suse.cz + +- Use /etc/modprobe.d/50-sound.conf config file instead of + /etc/modprobe.d/sound (bnc#485942) + +------------------------------------------------------------------- Thu Feb 26 12:49:21 CET 2009 - lslezak(a)suse.cz - set 100% volume for snd-hda-intel driver (bnc#477853), Modified: trunk/sound/sound/agents/modprobe_sound.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/agents/modprobe_soun… ============================================================================== --- trunk/sound/sound/agents/modprobe_sound.scr (original) +++ trunk/sound/sound/agents/modprobe_sound.scr Thu Mar 26 12:55:40 2009 @@ -26,5 +26,5 @@ .modprobe_sound `ag_modules( - `ModulesConf("/etc/modprobe.d/sound") + `ModulesConf("/etc/modprobe.d/50-sound.conf") ) Modified: trunk/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/Sound.ycp?rev=56… ============================================================================== --- trunk/sound/sound/src/Sound.ycp (original) +++ trunk/sound/sound/src/Sound.ycp Thu Mar 26 12:55:40 2009 @@ -148,7 +148,7 @@ /** * This is true, if sound data were read from /etc/modprobe.conf - * On write, they shoud be removed and written only to /etc/modprobe.d/sound + * On write, they shoud be removed and written only to /etc/modprobe.d/50-sound.conf */ global boolean used_modprobe_conf = false; Modified: trunk/sound/sound/src/read_routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/read_routines.yc… ============================================================================== --- trunk/sound/sound/src/read_routines.ycp (original) +++ trunk/sound/sound/src/read_routines.ycp Thu Mar 26 12:55:40 2009 @@ -151,8 +151,8 @@ /* path mod_path = .modprobe_sound; - // read from /etc/modprobe/conf if /etc/modprobe.d/sound is not present - if (SCR::Read(.target.size, "/etc/modprobe.d/sound") == -1) + // read from /etc/modprobe/conf if /etc/modprobe.d/50-sound.conf is not present + if (SCR::Read(.target.size, "/etc/modprobe.d/50-sound.conf") == -1) { mod_path = .modules; Sound::used_modprobe_conf = true; @@ -284,14 +284,14 @@ define list<map> read_save_info () ``{ list<map> saved = []; - // First, read from /etc/modprobe.d/sound - if (SCR::Read(.target.size, "/etc/modprobe.d/sound") >= 0) + // First, read from /etc/modprobe.d/50-sound.conf + if (SCR::Read(.target.size, "/etc/modprobe.d/50-sound.conf") >= 0) { saved = read_modprobe (.modprobe_sound); } else { - y2milestone("/etc/modprobe.d/sound doesn't exist"); + y2milestone("/etc/modprobe.d/50-sound.conf doesn't exist"); // try /etc/modprobe.conf... if (SCR::Read(.target.size, "/etc/modprobe.conf") >= 0) Modified: trunk/sound/sound/src/sound_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/sound_write.ycp?… ============================================================================== --- trunk/sound/sound/src/sound_write.ycp (original) +++ trunk/sound/sound/src/sound_write.ycp Thu Mar 26 12:55:40 2009 @@ -236,7 +236,7 @@ } } - // save config to /etc/modprobe.d/sound + // save config to /etc/modprobe.d/50-sound.conf SaveModulesEntry(save_info, []); sleep(10); Modified: trunk/sound/sound/src/write_routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/write_routines.y… ============================================================================== --- trunk/sound/sound/src/write_routines.ycp (original) +++ trunk/sound/sound/src/write_routines.ycp Thu Mar 26 12:55:40 2009 @@ -238,14 +238,14 @@ // remove the options for unused modules list<string> configured_options = []; - if (SCR::Read(.target.size, "/etc/modprobe.d/sound") >=0 ) + if (SCR::Read(.target.size, "/etc/modprobe.d/50-sound.conf") >=0 ) { configured_options = SCR::Dir(.modprobe_sound.options); } else { // the file doesn't exist, create an empty file - SCR::Execute(.target.bash, "/usr/bin/touch /etc/modprobe.d/sound"); + SCR::Execute(.target.bash, "/usr/bin/touch /etc/modprobe.d/50-sound.conf"); } // must be called before SaveOneModulesEntry() @@ -311,7 +311,7 @@ * @param als list with old aliases */ define void removeOldEntries(list als) ``{ - if (SCR::Read(.target.size, "/etc/modprobe.d/sound") >=0 ) + if (SCR::Read(.target.size, "/etc/modprobe.d/50-sound.conf") >=0 ) { maplist(string e, (list<string>) als, ``{ if (is_snd_alias(e) || @@ -329,7 +329,7 @@ */ define void RemoveOldConfiguration () ``{ - y2milestone ("removing old sound configuration from /etc/modprobe.conf (it was already saved to /etc/modprobe.d/sound)"); + y2milestone ("removing old sound configuration from /etc/modprobe.conf (it was already saved to /etc/modprobe.d/50-sound.conf)"); path mod = .modules; path mod_alias = .modules.alias; @@ -395,7 +395,7 @@ } /** - * Saves all '/etc/modprobe.d/sound' entries + * Saves all '/etc/modprobe.d/50-sound.conf' entries * @param save_info cards save info * @param system sytem dependent part * @return map return struct: $["return": boolean, "err_msg": string] @@ -411,7 +411,7 @@ list als=[]; string err_msg = ""; - if (SCR::Read(.target.size, "/etc/modprobe.d/sound") >=0 && contains(SCR::Dir(mod), "alias")) + if (SCR::Read(.target.size, "/etc/modprobe.d/50-sound.conf") >=0 && contains(SCR::Dir(mod), "alias")) { als = (list)SCR::Read(mod_alias); } -- 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] r56424 - /tags/stable-2_17_87/network/
by mzugec＠svn.opensuse.org 26 Mar '09

26 Mar '09

Author: mzugec Date: Thu Mar 26 12:38:34 2009 New Revision: 56424 URL: http://svn.opensuse.org/viewcvs/yast?rev=56424&view=rev Log: Created tag stable-2_17_87 for SLE-11-SP1-Stash/network Added: tags/stable-2_17_87/network/ - copied from r56423, branches/tmp/SLE-11-SP1-Stash/network/ -- 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] r56423 - /tags/stable-2_17_87/SLE-11-SP1-Stash/
by mzugec＠svn.opensuse.org 26 Mar '09

26 Mar '09

Author: mzugec Date: Thu Mar 26 12:38:32 2009 New Revision: 56423 URL: http://svn.opensuse.org/viewcvs/yast?rev=56423&view=rev Log: Created tag stable-2_17_87 for SLE-11-SP1-Stash/ Added: tags/stable-2_17_87/SLE-11-SP1-Stash/ -- 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] r56422 - /tags/stable-2_17_87/
by mzugec＠svn.opensuse.org 26 Mar '09

26 Mar '09

Author: mzugec Date: Thu Mar 26 12:38:31 2009 New Revision: 56422 URL: http://svn.opensuse.org/viewcvs/yast?rev=56422&view=rev Log: Created tag stable-2_17_87 Added: tags/stable-2_17_87/ -- 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] r56421 - in /branches/tmp/SLE-11-SP1-Stash/network: VERSION package/yast2-network.changes src/lan/address.ycp
by mzugec＠svn.opensuse.org 26 Mar '09

26 Mar '09

Author: mzugec Date: Thu Mar 26 12:38:22 2009 New Revision: 56421 URL: http://svn.opensuse.org/viewcvs/yast?rev=56421&view=rev Log: tun/tap device - don't remove default gw (bnc#483233) Modified: branches/tmp/SLE-11-SP1-Stash/network/VERSION branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes branches/tmp/SLE-11-SP1-Stash/network/src/lan/address.ycp Modified: branches/tmp/SLE-11-SP1-Stash/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/VERSION (original) +++ branches/tmp/SLE-11-SP1-Stash/network/VERSION Thu Mar 26 12:38:22 2009 @@ -1 +1 @@ -2.17.86 +2.17.87 Modified: branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes Thu Mar 26 12:38:22 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 26 12:37:55 CET 2009 - mzugec(a)suse.cz + +- tun/tap device - don't remove default gw (bnc#483233) +- 2.17.87 + +------------------------------------------------------------------- Thu Mar 26 10:53:19 CET 2009 - mzugec(a)suse.cz - don't allow to use networkmanager with bridged proposal (bnc#487419) Modified: branches/tmp/SLE-11-SP1-Stash/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/src/lan/address.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/network/src/lan/address.ycp Thu Mar 26 12:38:22 2009 @@ -757,6 +757,13 @@ "IFCFGTYPE": LanItems::type, "IFCFGID": LanItems::device, ]; + + string drvtype = DriverType (settings["IFCFGTYPE"]:""); + + boolean is_ptp = drvtype == "ctc" || drvtype == "iucv"; + // TODO: dynamic for dummy. or add dummy from outside? + boolean no_dhcp = is_ptp || settings["IFCFGTYPE"]:"" == "dummy" || LanItems::alias != ""; + if (contains(["tun", "tap"], LanItems::type)) { settings = $[ @@ -767,16 +774,10 @@ "TUNNEL_SET_OWNER" : LanItems::tunnel_set_owner, "TUNNEL_SET_GROUP" : LanItems::tunnel_set_group ]; + } else { + if(settings["BOOTPROTO"]:"" == "static" && settings["IPADDR"]:"" == "" && !no_dhcp) settings["BOOTPROTO"] = "dhcp"; } - string drvtype = DriverType (settings["IFCFGTYPE"]:""); - - boolean is_ptp = drvtype == "ctc" || drvtype == "iucv"; - // TODO: dynamic for dummy. or add dummy from outside? - boolean no_dhcp = is_ptp || settings["IFCFGTYPE"]:"" == "dummy" || LanItems::alias != ""; - - if(settings["BOOTPROTO"]:"" == "static" && settings["IPADDR"]:"" == "" && !no_dhcp) settings["BOOTPROTO"] = "dhcp"; - // #65524 if (LanItems::operation == `add && force_static_ip) { -- 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] r56420 - in /trunk/core: agent-modules/conf/modprobe_blacklist.scr package/yast2-core.changes
by lslezak＠svn.opensuse.org 26 Mar '09

26 Mar '09

Author: lslezak Date: Thu Mar 26 12:37:30 2009 New Revision: 56420 URL: http://svn.opensuse.org/viewcvs/yast?rev=56420&view=rev Log: - .modprobe_blacklist agent: use /etc/modprobe.d/50-blacklist.conf file instead of deprecated /etc/modprobe.d/blacklist Modified: trunk/core/agent-modules/conf/modprobe_blacklist.scr trunk/core/package/yast2-core.changes Modified: trunk/core/agent-modules/conf/modprobe_blacklist.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-modules/conf/modprobe… ============================================================================== --- trunk/core/agent-modules/conf/modprobe_blacklist.scr (original) +++ trunk/core/agent-modules/conf/modprobe_blacklist.scr Thu Mar 26 12:37:30 2009 @@ -29,5 +29,5 @@ .modprobe_blacklist `ag_modules( - `ModulesConf("/etc/modprobe.d/blacklist") + `ModulesConf("/etc/modprobe.d/50-blacklist.conf") ) Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Thu Mar 26 12:37:30 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 26 08:26:56 CET 2009 - lslezak(a)suse.cz + +- .modprobe_blacklist agent: use /etc/modprobe.d/50-blacklist.conf + file instead of deprecated /etc/modprobe.d/blacklist + +------------------------------------------------------------------- Fri Mar 6 13:53:48 CET 2009 - mvidner(a)suse.cz - ag_background: re-disabled the testsuite, silly me. -- 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] r56419 - /tags/branch-SLE-10-SP3-2_13_69/online-update/
by jsuchome＠svn.opensuse.org 26 Mar '09

26 Mar '09

Author: jsuchome Date: Thu Mar 26 12:06:52 2009 New Revision: 56419 URL: http://svn.opensuse.org/viewcvs/yast?rev=56419&view=rev Log: Created tag branch-SLE-10-SP3-2_13_69 for online-update Added: tags/branch-SLE-10-SP3-2_13_69/online-update/ - copied from r56418, branches/SuSE-SLE-10-SP3-Branch/online-update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0