March 2010 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-product-creator for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package yast2-product-creator for openSUSE:Factory checked in at Mon Mar 1 01:51:49 CET 2010. -------- --- yast2-product-creator/yast2-product-creator.changes 2010-02-22 16:02:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes 2010-02-26 16:34:18.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 26 16:33:06 CET 2010 - jsuchome(a)suse.cz + +- do not escape path to local sources (bnc#561612 +- 2.19.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-product-creator-2.19.4.tar.bz2 New: ---- yast2-product-creator-2.19.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.JhRQ9j/_old 2010-03-01 01:51:43.000000000 +0100 +++ /var/tmp/diff_new_pack.JhRQ9j/_new 2010-03-01 01:51:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-product-creator (Version 2.19.4) +# spec file for package yast2-product-creator (Version 2.19.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-product-creator -Version: 2.19.4 +Version: 2.19.5 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-product-creator-2.19.4.tar.bz2 +Source0: yast2-product-creator-2.19.5.tar.bz2 Prefix: /usr @@ -62,7 +62,7 @@ XEN images etc.), based on existing installation sources. %prep -%setup -n yast2-product-creator-2.19.4 +%setup -n yast2-product-creator-2.19.5 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-product-creator-2.19.4.tar.bz2 -> yast2-product-creator-2.19.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.4/VERSION new/yast2-product-creator-2.19.5/VERSION --- old/yast2-product-creator-2.19.4/VERSION 2010-02-22 15:46:26.000000000 +0100 +++ new/yast2-product-creator-2.19.5/VERSION 2010-02-26 16:33:29.000000000 +0100 @@ -1 +1 @@ -2.19.4 +2.19.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.4/src/Kiwi.ycp new/yast2-product-creator-2.19.5/src/Kiwi.ycp --- old/yast2-product-creator-2.19.4/src/Kiwi.ycp 2010-02-22 15:45:39.000000000 +0100 +++ new/yast2-product-creator-2.19.5/src/Kiwi.ycp 2010-02-22 16:02:24.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Data for kiwi configuration, input and output functions. * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: Kiwi.ycp 58530 2009-09-04 13:23:24Z jsuchome $ + * $Id: Kiwi.ycp 60944 2010-02-22 15:01:54Z jsuchome $ */ { module "Kiwi"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.4/src/kiwi_dialogs.ycp new/yast2-product-creator-2.19.5/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.19.4/src/kiwi_dialogs.ycp 2010-01-25 20:03:28.000000000 +0100 +++ new/yast2-product-creator-2.19.5/src/kiwi_dialogs.ycp 2010-02-26 16:32:58.000000000 +0100 @@ -2301,6 +2301,12 @@ if (haskey (repositories, url)) continue; + map parsed = URL::Parse(url); + if (parsed["scheme"]:"" == "dir") + { + url = parsed["path"]:url; + y2milestone ("un-escaping local directory path: %1", url); + } boolean plaindir = SourceDialogs::IsPlainDir(); repositories[url] = $[ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-bootloader for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at Mon Mar 1 01:51:46 CET 2010. -------- --- yast2-bootloader/yast2-bootloader.changes 2010-02-22 12:13:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2010-02-26 10:21:25.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 26 10:20:10 CET 2010 - juhliarik(a)suse.cz + +- added fix for creating sysconfig directory file (bnc#583088) +- 2.19.7 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-bootloader-2.19.1.tar.bz2 New: ---- yast2-bootloader-2.19.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.Q7vReJ/_old 2010-03-01 01:51:36.000000000 +0100 +++ /var/tmp/diff_new_pack.Q7vReJ/_new 2010-03-01 01:51:36.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.19.1) +# spec file for package yast2-bootloader (Version 2.19.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-bootloader -Version: 2.19.1 -Release: 2 +Version: 2.19.7 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.19.1.tar.bz2 +Source0: yast2-bootloader-2.19.7.tar.bz2 Prefix: /usr @@ -67,7 +67,7 @@ This package contains the YaST2 component for bootloader configuration. %prep -%setup -n yast2-bootloader-2.19.1 +%setup -n yast2-bootloader-2.19.7 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-bootloader-2.19.1.tar.bz2 -> yast2-bootloader-2.19.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/VERSION new/yast2-bootloader-2.19.7/VERSION --- old/yast2-bootloader-2.19.1/VERSION 2010-01-28 16:09:31.000000000 +0100 +++ new/yast2-bootloader-2.19.7/VERSION 2010-02-26 10:21:24.000000000 +0100 @@ -1 +1 @@ -2.19.1 +2.19.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/src/config/bootloader.desktop new/yast2-bootloader-2.19.7/src/config/bootloader.desktop --- old/yast2-bootloader-2.19.1/src/config/bootloader.desktop 2009-02-17 13:41:52.000000000 +0100 +++ new/yast2-bootloader-2.19.7/src/config/bootloader.desktop 2010-02-04 10:14:02.000000000 +0100 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstSchema=bootloader.rnc Icon=yast-bootloader -Exec=/sbin/yast2 bootloader +Exec=xdg-su -c "/sbin/yast2 bootloader" Name=Boot Loader GenericName=Configure the boot loader -X-KDE-SubstituteUID=true StartupNotify=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/src/grub/options.ycp new/yast2-bootloader-2.19.7/src/grub/options.ycp --- old/yast2-bootloader-2.19.1/src/grub/options.ycp 2009-08-04 13:21:58.000000000 +0200 +++ new/yast2-bootloader-2.19.7/src/grub/options.ycp 2010-02-09 16:01:21.000000000 +0100 @@ -505,7 +505,7 @@ UI::ChangeWidget (`id ("boot_extended"), `Enabled, false); } - if ((!haskey(BootCommon::globals,"boot_custom")) && + if ((!haskey(BootCommon::globals,"boot_custom")) || (BootCommon::globals["boot_custom"]:"" == "")) { UI::ChangeWidget (`id ("boot_custom_list"),`Enabled, false); @@ -555,6 +555,9 @@ } if ((boolean)UI::QueryWidget(`id("boot_custom"), `Value)) BootCommon::globals["boot_custom"]= (string)UI::QueryWidget(`id("boot_custom_list"), `Value); + //bnc#544809 Custom Boot Partition cannot be deleted + else + BootCommon::globals["boot_custom"]=""; } /** FIXME: merge help text to one for BootLoaderLocationWidget diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/src/modules/BootCommon.ycp new/yast2-bootloader-2.19.7/src/modules/BootCommon.ycp --- old/yast2-bootloader-2.19.1/src/modules/BootCommon.ycp 2009-10-13 15:49:10.000000000 +0200 +++ new/yast2-bootloader-2.19.7/src/modules/BootCommon.ycp 2010-02-11 13:37:33.000000000 +0100 @@ -15,7 +15,7 @@ * Joachim Plack <jplack(a)suse.de> * Olaf Dabrunz <od(a)suse.de> * - * $Id: BootCommon.ycp 59004 2009-10-13 13:49:09Z juhliarik $ + * $Id: BootCommon.ycp 60799 2010-02-11 12:36:14Z juhliarik $ * */ @@ -685,6 +685,9 @@ rdev = Storage::SLES9PersistentDevNames(rdev); y2milestone( "sections: dev name after SLES9 persistent dev name translation: %1", rdev); } + // bnc#533782 - after changing filesystem label system doesn't boot + if (s["append"]:"" != "") + s["append"] = remapResume(s["append"]:"",true); s["root"] = BootStorage::Dev2MountByDev(rdev); return s; }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/src/modules/BootStorage.ycp new/yast2-bootloader-2.19.7/src/modules/BootStorage.ycp --- old/yast2-bootloader-2.19.1/src/modules/BootStorage.ycp 2010-01-06 16:50:28.000000000 +0100 +++ new/yast2-bootloader-2.19.7/src/modules/BootStorage.ycp 2010-02-11 13:51:00.000000000 +0100 @@ -323,10 +323,11 @@ * @param dev string device name * @return string device name according to "mountby" */ -global define string Dev2MountByDev(string dev) +global define string Dev2MountByDev(string dev) { - y2milestone ("Dev2MountByDev: %1", dev); + string tmp_dev = MountByDev2Dev(dev); + y2milestone ("Dev2MountByDev: %1 as kernel device name: %2", dev, tmp_dev); // add all_partitions to partitions if (MapAllPartitions()) y2milestone("Init all_partitions was done"); @@ -342,9 +343,9 @@ if (!Arch::ppc()) { by_mount = Storage::GetDefaultMountBy(); - if (haskey(partitions, dev)) + if (haskey(partitions, tmp_dev)) { - symbol partition_mount_by = (symbol) partitions[dev, "mountby"]:nil; + symbol partition_mount_by = (symbol) partitions[tmp_dev, "mountby"]:nil; if ((partition_mount_by != nil)) by_mount = partition_mount_by; } @@ -354,23 +355,23 @@ } y2milestone("Mount-by: %1", by_mount); - string ret = dev; + string ret = tmp_dev; switch(by_mount) { // convert to udev_id case (`id): // partitions - if ((partitions[dev, "udev_id"]:nil != nil) && (partitions[dev, "udev_id", 0]:nil != "")) + if ((partitions[tmp_dev, "udev_id"]:nil != nil) && (partitions[tmp_dev, "udev_id", 0]:nil != "")) { - ret = sformat ("/dev/disk/by-id/%1", partitions[dev, "udev_id", 0]:""); - y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret); + ret = sformat ("/dev/disk/by-id/%1", partitions[tmp_dev, "udev_id", 0]:""); + y2milestone ("Device name: %1 is converted to udev id: %2", tmp_dev, ret); return ret; } // disks - if ((devices[dev, "udev_id"]:nil != nil) && (devices[dev, "udev_id", 0]:nil != "")) + if ((devices[tmp_dev, "udev_id"]:nil != nil) && (devices[tmp_dev, "udev_id", 0]:nil != "")) { - ret = sformat ("/dev/disk/by-id/%1", devices[dev, "udev_id", 0]:""); - y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret); + ret = sformat ("/dev/disk/by-id/%1", devices[tmp_dev, "udev_id", 0]:""); + y2milestone ("Device name: %1 is converted to udev id: %2", tmp_dev, ret); return ret; } break; @@ -378,17 +379,17 @@ // convert to uuid case (`uuid): // partitions - if ((partitions[dev, "uuid"]:nil != nil) && (partitions[dev, "uuid"]:nil != "")) + if ((partitions[tmp_dev, "uuid"]:nil != nil) && (partitions[tmp_dev, "uuid"]:nil != "")) { - ret = sformat ("/dev/disk/by-uuid/%1", partitions[dev, "uuid"]:""); - y2milestone ("Device name: %1 is converted to uuid: %2", dev, ret); + ret = sformat ("/dev/disk/by-uuid/%1", partitions[tmp_dev, "uuid"]:""); + y2milestone ("Device name: %1 is converted to uuid: %2", tmp_dev, ret); return ret; } // disks - if ((devices[dev, "uuid"]:nil != nil) && (devices[dev, "uuid"]:nil != "")) + if ((devices[tmp_dev, "uuid"]:nil != nil) && (devices[tmp_dev, "uuid"]:nil != "")) { - ret = sformat ("/dev/disk/by-uuid/%1", devices[dev, "uuid"]:""); - y2milestone ("Device name: %1 is converted to uuid: %2", dev, ret); + ret = sformat ("/dev/disk/by-uuid/%1", devices[tmp_dev, "uuid"]:""); + y2milestone ("Device name: %1 is converted to uuid: %2", tmp_dev, ret); return ret; } break; @@ -396,17 +397,17 @@ // convert to udev_path case (`path): // partitions - if ((partitions[dev, "udev_path"]:nil != nil) && (partitions[dev, "udev_path"]:nil != "")) + if ((partitions[tmp_dev, "udev_path"]:nil != nil) && (partitions[tmp_dev, "udev_path"]:nil != "")) { - ret = sformat ("/dev/disk/by-path/%1", partitions[dev, "udev_path"]:""); - y2milestone ("Device name: %1 is converted to udev path: %2", dev, ret); + ret = sformat ("/dev/disk/by-path/%1", partitions[tmp_dev, "udev_path"]:""); + y2milestone ("Device name: %1 is converted to udev path: %2", tmp_dev, ret); return ret; } // disks - if ((devices[dev, "udev_path"]:nil != nil) && (devices[dev, "udev_path"]:nil != "")) + if ((devices[tmp_dev, "udev_path"]:nil != nil) && (devices[tmp_dev, "udev_path"]:nil != "")) { - ret = sformat ("/dev/disk/by-path/%1", devices[dev, "udev_path"]:""); - y2milestone ("Device name: %1 is converted to udev path: %2", dev, ret); + ret = sformat ("/dev/disk/by-path/%1", devices[tmp_dev, "udev_path"]:""); + y2milestone ("Device name: %1 is converted to udev path: %2", tmp_dev, ret); return ret; } break; @@ -414,20 +415,20 @@ // convert to label case (`label): // partitions - if ((partitions[dev, "label"]:nil != nil) && (partitions[dev, "label"]:nil != "")) + if ((partitions[tmp_dev, "label"]:nil != nil) && (partitions[tmp_dev, "label"]:nil != "")) { - ret = sformat ("/dev/disk/by-label/%1", partitions[dev, "label"]:""); - y2milestone ("Device name: %1 is converted to label: %2", dev, ret); + ret = sformat ("/dev/disk/by-label/%1", partitions[tmp_dev, "label"]:""); + y2milestone ("Device name: %1 is converted to label: %2", tmp_dev, ret); return ret; } // disks - y2milestone ("Disk doesn't support labels - name: %1 is converted to label: %2", dev, ret); + y2milestone ("Disk doesn't support labels - name: %1 is converted to label: %2", tmp_dev, ret); return ret; break; // convert to device or uknown type default: - y2warning ("Convert %1 to `device or unknwn type, result: %2", dev, ret); + y2warning ("Convert %1 to `device or unknwn type, result: %2", tmp_dev, ret); return ret; break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/src/modules/BootSupportCheck.ycp new/yast2-bootloader-2.19.7/src/modules/BootSupportCheck.ycp --- old/yast2-bootloader-2.19.1/src/modules/BootSupportCheck.ycp 2009-06-26 11:18:15.000000000 +0200 +++ new/yast2-bootloader-2.19.7/src/modules/BootSupportCheck.ycp 2010-02-19 14:40:32.000000000 +0100 @@ -25,6 +25,7 @@ import "Storage"; import "BootCommon"; import "BootStorage"; +import "FileUtils"; /** * List of problems found during last check @@ -95,7 +96,8 @@ { string cmd = "modprobe efivars 2>/dev/null"; map ret = (map)SCR::Execute (.target.bash_output, cmd); - if (ret["exit"]:1 == 0) + // bnc#581213 - x86-64/UEFI: "Unsupported combination of hardware platform x86_64 and bootloader elilo" + if (FileUtils::Exists("/sys/firmware/efi/systab")) return true; else return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/src/modules/Bootloader.ycp new/yast2-bootloader-2.19.7/src/modules/Bootloader.ycp --- old/yast2-bootloader-2.19.1/src/modules/Bootloader.ycp 2009-12-04 16:16:45.000000000 +0100 +++ new/yast2-bootloader-2.19.7/src/modules/Bootloader.ycp 2010-02-11 16:18:09.000000000 +0100 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: Bootloader.ycp 59966 2009-12-04 15:16:44Z juhliarik $ + * $Id: Bootloader.ycp 60802 2010-02-11 15:16:50Z juhliarik $ * */ @@ -447,7 +447,7 @@ map<string,any> params_to_save = $[]; string new_vga = getKernelParam (getDefaultSection (), "vgamode"); - if (new_vga != old_vga && new_vga != "false" && new_vga != "") + if (new_vga != old_vga && new_vga != "false" && new_vga != "" && new_vga !="ask") { Initrd::setSplash (new_vga); if (Stage::initial ()) @@ -474,7 +474,7 @@ && ! (BootCommon::write_settings["forbid_save_initrd"]:false)) { string vga = getKernelParam (getDefaultSection (), "vgamode"); - if (vga != "false" && vga != "") + if (vga != "false" && vga != "" && vga !="ask") { Initrd::setSplash (vga); if (Stage::initial ()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/src/routines/misc.ycp new/yast2-bootloader-2.19.7/src/routines/misc.ycp --- old/yast2-bootloader-2.19.1/src/routines/misc.ycp 2010-02-03 18:40:24.000000000 +0100 +++ new/yast2-bootloader-2.19.7/src/routines/misc.ycp 2010-02-26 10:23:04.000000000 +0100 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: misc.ycp 59004 2009-10-13 13:49:09Z juhliarik $ + * $Id: misc.ycp 61035 2010-02-26 09:20:36Z juhliarik $ * * WARNING: * To be included to BootCommon.ycp only, requires function @@ -183,11 +183,13 @@ /** * Function remap "resume" from section (append) to device name (/dev/sda) * or to label (ufo_partition) + * * @param map<string,any> sections + * @param boolean true if convert resume to persistent device name * @return map<string,any> sections */ -define string remapResume(string append) +define string remapResume(string append, boolean to_persistent) { if ((search(append, "resume")!=nil) && (search(append, "noresume") == nil)) { @@ -206,7 +208,12 @@ y2debug("value of resume: %1",resume_arg[1]:""); if (dev != "") { - string resume = "resume="+BootStorage::MountByDev2Dev(dev); + string resume =""; + // bnc#533782 - after changing filesystem label system doesn't boot + if (to_persistent) + resume = "resume="+BootStorage::Dev2MountByDev(dev); + else + resume = "resume="+BootStorage::MountByDev2Dev(dev); y2debug("remap resume: %1",resume); new_append = add(new_append, resume); } else { @@ -262,7 +269,7 @@ s["root"] = BootStorage::MountByDev2Dev(rdev); if (s["append"]:"" != "") - s["append"] = remapResume(s["append"]:""); + s["append"] = remapResume(s["append"]:"", false); y2debug("remapping root: %1 from section to: %2 ",rdev ,s["root"]:""); } @@ -419,7 +426,8 @@ */ global boolean InstallingToFloppy () { boolean ret = false; - if (loader_device == nil) + // Bug 539774 - bootloader module wants to write to floppy disk although there is none + if ((loader_device == nil) || (loader_device == "")) return ret; // bug #333459 - boot loader editor: propose new configuration // -- BLE tries to write something on the floppy disk // bnc #180784 don't install to bootloader to floppy if ppc @@ -957,7 +965,12 @@ return p["mount"]:"" == "swap" && ! p["delete"]:false; }); foreach (map<string, any> s, partitions, ``{ - string dev = (string)(s["device"]:""); + // bnc#577127 - Encrypted swap is not properly set up as resume device + string dev = ""; + if ((s["crypt_device"]:"" != nil) && (s["crypt_device"]:"" != "")) + dev = (string)(s["crypt_device"]:""); + else + dev = (string)(s["device"]:""); ret[dev] = (integer)(s["region", 1]:0) * cyl_size; }); }); @@ -1386,7 +1399,7 @@ { if (inst) { - if (!FileUtils::CheckAndCreatePath(Installation::destdir +"/etc/sysconfig")) + if (!FileUtils::Exists(Installation::destdir +"/etc/sysconfig")) { WFM::Execute(.local.mkdir, Installation::destdir + "/etc/sysconfig"); WFM::Execute(.local.bash, sformat ("touch %1/etc/sysconfig/bootloader", Installation::destdir)); @@ -1396,6 +1409,33 @@ } return true; } +/** bnc #578545 - kdump misconfigures crashkernel parameter for Xen + * Check if default_append includes crashkernel arg + * + * @param string defaul_append + * @return string defaul_append without crashkernel + */ + +define string deleteCrashkernelFromAppend (string append) +{ + y2milestone("Original append: %1",append); + list<string> list_append = splitstring(append, " "); + + if (size(list_append)>0) + { + list_append = filter(string key, list_append, + { + if (search(key, "crashkernel") == nil) + return true; + else + return false; + }); + } + string ret = mergestring(list_append, " "); + y2milestone("Filtered append: %1",ret); + return ret; +} + /** FATE #302245 save kernel args etc to /etc/sysconfig/bootloader * Function write/update info in /etc/sysconfig/bootloader @@ -1488,7 +1528,7 @@ if (! xen_set) { - xen_kernel_append = default_append; + xen_kernel_append = deleteCrashkernelFromAppend(default_append); xen_append = ""; xen_vga = default_vga; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xvkbd for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package xvkbd for openSUSE:Factory checked in at Mon Mar 1 01:51:31 CET 2010. -------- --- xvkbd/xvkbd.changes 2009-12-04 15:05:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/xvkbd/xvkbd.changes 2010-02-15 16:41:57.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Feb 15 16:18:01 CET 2010 - dimstar(a)opensuse.org + +- Update to version 3.1: + + Changed the default setting for automatic click to OFF, which + was set ON in the previous release in error and caused + confusion. + + The keypad is now customizable, too (see XVkbd-strip.ad for the + example). + + Up to 25x25 keys can now be supported both for the main + keyboard and the keypad. + + Able to open the keypad panel when startup, by setting + `xvkbd.keypad: false' and `xvkbd.keypadOnly: true'. + + Fixed errors in some keyboard layout files (Korean, Slovene, + UK). + + A new sample layout file XVkbd-strip.ad. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xvkbd-3.0.tar.bz2 New: ---- xvkbd-3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xvkbd.spec ++++++ --- /var/tmp/diff_new_pack.Jw3RNL/_old 2010-03-01 01:51:19.000000000 +0100 +++ /var/tmp/diff_new_pack.Jw3RNL/_new 2010-03-01 01:51:19.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xvkbd (Version 3.0) +# spec file for package xvkbd (Version 3.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,8 +24,8 @@ BuildRequires: xaw3d-devel %endif Summary: Virtual Keyboard for the X Window System -Version: 3.0 -Release: 30 +Version: 3.1 +Release: 1 License: GPLv2+ Group: System/X11/Utilities BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ xvkbd-3.0.tar.bz2 -> xvkbd-3.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/Imakefile new/xvkbd-3.1/Imakefile --- old/xvkbd-3.0/Imakefile 2008-05-04 12:08:41.000000000 +0200 +++ new/xvkbd-3.1/Imakefile 2010-01-16 13:57:06.000000000 +0100 @@ -63,6 +63,7 @@ InstallAppDefaults(XVkbd-swissgerman) InstallAppDefaults(XVkbd-turkish) InstallAppDefaults(XVkbd-uk) +InstallAppDefaults(XVkbd-strip) XCOMM ============================ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/README new/xvkbd-3.1/README --- old/xvkbd-3.0/README 2008-05-05 15:12:13.000000000 +0200 +++ new/xvkbd-3.1/README 2010-01-17 04:26:00.000000000 +0100 @@ -465,12 +465,12 @@ Download Latest Official Release - http://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.0.tar.gz - - source of version 3.0 (2008-05-05) + http://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.1.tar.gz + - source of version 3.1 (2010-01-17) previous release - http://homepage3.nifty.com/tsato/xvkbd/xvkbd-2.9.tar.gz - - source of version 2.9 (2008-03-30) + http://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.0.tar.gz + - source of version 3.0 (2008-05-05) xvkbd is distributed under the terms of the GNU General Public License. @@ -625,8 +625,8 @@ (Shift, Control, Meta and Alt) respectively. If the first character of the assigned string is `!', the string will - be used as command to be executed when the key is clicked. String - starting with `!' can be assigned by putting `\' before `!'. + be used as command to be executed when the key is clicked. To assign + string starting with `!' or `\', put `\' before the string. The file is $HOME/.xvkbd in default, and it can be changed by setting the filename with xvkbd.keyFile resource. @@ -960,6 +960,24 @@ - Key-click sounds when key is pressed. + Version 3.1 (2010-01-17) + + - Changed the default setting for automatic click to OFF, which was + set ON in the previous release in error and caused confusion. + + - The keypad is now customizable, too (see XVkbd-strip.ad for the + example). + + - Up to 25x25 keys can now be supported both for the main keyboard + and the keypad. + + - Able to open the keypad panel when startup, by setting + `xvkbd.keypad: false' and `xvkbd.keypadOnly: true'. + + - Fixed errors in some keyboard layout files (Korean, Slovene, UK). + + - A new sample layout file XVkbd-strip.ad. + Author xvkbd was written by Tom Sato, and it is distributed under the terms of the GNU General Public License Version 2 or any later version. @@ -973,4 +991,4 @@ meat.net) and you can probably receive the announce via e-mail if you wish. - 2008-05-05 xvkbd(1) + 2010-01-17 xvkbd(1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-common.ad new/xvkbd-3.1/XVkbd-common.ad --- old/xvkbd-3.0/XVkbd-common.ad 2008-05-05 14:26:15.000000000 +0200 +++ new/xvkbd-3.1/XVkbd-common.ad 2010-01-17 01:49:46.000000000 +0100 @@ -280,9 +280,11 @@ !! keyboard layouts ! -XVkbd.customizations: default,belgian,danish,fitaly,french,french2,\ - german,greek,hebrew,icelandic,italian,jisx6002/ja,jisx6004/ja,korean/ko_KR.eucKR,\ - norwegian,portuguese,russian/ru_RU.KOI8-R,slovene,spanish,swedish,swissgerman,turkish,uk,latin1 +XVkbd.customizations: default,belgian,danish,fitaly,\ + french,french2,german,greek,hebrew,icelandic,italian,\ + jisx6002/ja_JP.eucJP,jisx6004/ja_JP.eucJP,korean/ko_KR.eucKR,\ + norwegian,portuguese,russian/ru_RU.KOI8-R,slovene,spanish,\ + swedish,swissgerman,turkish,uk,latin1,small,strip XVkbd*layout_panel*default.label: Default XVkbd*layout_panel*belgian.label: Belgian @@ -308,6 +310,8 @@ XVkbd*layout_panel*turkish.label: Turkish XVkbd*layout_panel*uk.label: United Kingdom XVkbd*layout_panel*latin1.label: Latin-1 +XVkbd*layout_panel*small.label: Small Keyboard +XVkbd*layout_panel*strip.label: Key Strip XVkbd*Iconify.width: 20 XVkbd*Iconify.shadowWidth: 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-common.h new/xvkbd-3.1/XVkbd-common.h --- old/xvkbd-3.0/XVkbd-common.h 2008-05-05 14:27:30.000000000 +0200 +++ new/xvkbd-3.1/XVkbd-common.h 2010-01-17 01:49:48.000000000 +0100 @@ -239,9 +239,11 @@ "XVkbd*deadkey_panel*dead_doubleacute.label: \\264\\264", "XVkbd*deadkey_panel*dead_tilde.label: ~", "XVkbd*deadkey_panel*dead_abovedot.label: \\267", -"XVkbd.customizations: default,belgian,danish,fitaly,french,french2,\ - german,greek,hebrew,icelandic,italian,jisx6002/ja,jisx6004/ja,korean/ko_KR.eucKR,\ - norwegian,portuguese,russian/ru_RU.KOI8-R,slovene,spanish,swedish,swissgerman,turkish,uk,latin1", +"XVkbd.customizations: default,belgian,danish,fitaly,\ + french,french2,german,greek,hebrew,icelandic,italian,\ + jisx6002/ja_JP.eucJP,jisx6004/ja_JP.eucJP,korean/ko_KR.eucKR,\ + norwegian,portuguese,russian/ru_RU.KOI8-R,slovene,spanish,\ + swedish,swissgerman,turkish,uk,latin1,small,strip", "XVkbd*layout_panel*default.label: Default", "XVkbd*layout_panel*belgian.label: Belgian", "XVkbd*layout_panel*danish.label: Danish", @@ -266,6 +268,8 @@ "XVkbd*layout_panel*turkish.label: Turkish", "XVkbd*layout_panel*uk.label: United Kingdom", "XVkbd*layout_panel*latin1.label: Latin-1", +"XVkbd*layout_panel*small.label: Small Keyboard", +"XVkbd*layout_panel*strip.label: Key Strip", "XVkbd*Iconify.width: 20", "XVkbd*Iconify.shadowWidth: 0", "XVkbd*Iconify.resizable: false", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-fitaly.ad new/xvkbd-3.1/XVkbd-fitaly.ad --- old/xvkbd-3.0/XVkbd-fitaly.ad 2004-05-04 05:53:17.000000000 +0200 +++ new/xvkbd-3.1/XVkbd-fitaly.ad 2010-01-17 01:50:19.000000000 +0100 @@ -9,6 +9,7 @@ xvkbd.title: xvkbd - Virtual Keyboard ("Fitaly" Style) +xvkbd.inheritGeoemetry: false xvkbd.compact: true xvkbd.form*Repeater.shadowWidth: 1 xvkbd.form*Command.shadowWidth: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-korean.ad new/xvkbd-3.1/XVkbd-korean.ad --- old/xvkbd-3.0/XVkbd-korean.ad 2004-05-04 05:56:07.000000000 +0200 +++ new/xvkbd-3.1/XVkbd-korean.ad 2009-12-17 12:42:12.000000000 +0100 @@ -67,7 +67,7 @@ Tab q w e r t y u i o p [ ] Delete \n\ Caps_Lock a s d f g h j k l ; ' Return \n\ Shift_L z x c v b n m , . / Shift_R \n\ - MainMenu Constrol_L Alt_L Meta_L space Mode_switch Left Right Up Down Focus + MainMenu Control_L Alt_L Meta_L space Mode_switch Left Right Up Down Focus xvkbd.KeyLabels: \ Esc F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 \n\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-slovene.ad new/xvkbd-3.1/XVkbd-slovene.ad --- old/xvkbd-3.0/XVkbd-slovene.ad 2004-05-04 05:53:17.000000000 +0200 +++ new/xvkbd-3.1/XVkbd-slovene.ad 2009-12-17 12:42:12.000000000 +0100 @@ -35,7 +35,7 @@ xvkbd.AltgrKeys: \ F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 BackSpace \n\ Escape ~ 2 ^ 4 5 6 7 8 9 0 ' + cedilla currency \n\ - Tab \\ | e r t z u i o p division multiply Delele \n\ + Tab \\ | e r t z u i o p division multiply Delete \n\ Control_L a s d f g h j lstroke Lstroke ccaron ssharp Return \n\ Shift_L < y x c @ { } section , . - Multi_key Shift_R \n\ MainMenu Caps_Lock Alt_L Meta_L space Mode_switch Left Right Up Down Focus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-small.ad new/xvkbd-3.1/XVkbd-small.ad --- old/xvkbd-3.0/XVkbd-small.ad 2006-09-08 15:39:43.000000000 +0200 +++ new/xvkbd-3.1/XVkbd-small.ad 2010-01-17 01:49:01.000000000 +0100 @@ -10,6 +10,7 @@ !! Please note that you must take account of size of the window border !! when you want set window position from right/bottom of the screen. ! +xvkbd.inheritGeoemetry: false xvkbd.windowGeometry: 220x85-5-25 xvkbd.keypad_panel.geometry: 100x100 xvkbd.sun_fkey_panel.geometry: 70x120 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-strip.ad new/xvkbd-3.1/XVkbd-strip.ad --- old/xvkbd-3.0/XVkbd-strip.ad 1970-01-01 01:00:00.000000000 +0100 +++ new/xvkbd-3.1/XVkbd-strip.ad 2010-01-17 03:19:19.000000000 +0100 @@ -0,0 +1,232 @@ +!! XVkbd-strip.ad - sample app-defaults file for xvkbd +!! by Tom Sato <VEF00200(a)nifty.ne.jp>, http://homepage3.nifty.com/tsato/ +!! +!! Last update: 2010-01-16 + +#include "XVkbd-common" + +! Make the virtual keyboard support most Latin-1 characters +! +xvkbd.title: xvkbd - Virtual Keyboard + +xvkbd.inheritGeoemetry: false +xvkbd.modalKeytop: true +xvkbd.keypad: false +xvkbd.keypadOnly: true +xvkbd.geometry: +0-0 +xvkbd.keypad_panel.geometry: -0-0 +xvkbd*keypad.vertDistance: 0 +xvkbd*keypad.horizDistance: 0 + +xvkbd*banner.width: 1 +xvkbd*banner.height: 1 +xvkbd.form*Command.width: 27 +xvkbd.form*Command.height: 22 +xvkbd.form*Repeater.width: 27 +xvkbd.form*Repeater.height: 22 +xvkbd.form*Return.width: 54 +xvkbd.form*MainMenu.width: 27 +xvkbd.form*Control_L.width: 18 +xvkbd.form*Shift_L.width: 18 +xvkbd.form*Mode_switch.width: 18 +xvkbd.keypad_panel*Repeater.width: 27 +xvkbd.keypad_panel*Repeater.height: 22 +xvkbd*Command.horizDistance: 0 +xvkbd*Repeater.horizDistance: 0 +xvkbd*Command.justify: center +xvkbd*Repeater.justify: center +xvkbd*Command.justify: center +xvkbd*Repeater.justify: center +xvkbd*vertDistance: 0 + +xvkbd*Focus.bitmap: /usr/include/X11/bitmaps/target + +xvkbd.NormalKeys: \ + a n \n\ + b o \n\ + c p \n\ + d q \n\ + e r \n\ + f s \n\ + g t \n\ + h u \n\ + i v \n\ + j w \n\ + k x \n\ + l y \n\ + m z \n\ + space BackSpace \n\ + Return \n\ + Control_L Shift_L Mode_switch \n\ + Focus MainMenu + +xvkbd.ShiftKeys: \ + A N \n\ + B O \n\ + C P \n\ + D Q \n\ + E R \n\ + F S \n\ + G T \n\ + H U \n\ + I V \n\ + J W \n\ + K X \n\ + L Y \n\ + M Z \n\ + space BackSpace \n\ + Return \n\ + Control_L Shift_L Mode_switch \n\ + Focus MainMenu + +xvkbd.NormalKeyLabels: \ + a n \n\ + b o \n\ + c p \n\ + d q \n\ + e r \n\ + f s \n\ + g t \n\ + h u \n\ + i v \n\ + j w \n\ + k x \n\ + l y \n\ + m z \n\ + space BS \n\ + Return \n\ + Ct Sh Ag \n\ + Focus MainMenu + +xvkbd.ShiftKeyLabels: \ + A N \n\ + B O \n\ + C P \n\ + D Q \n\ + E R \n\ + F S \n\ + G T \n\ + H U \n\ + I V \n\ + J W \n\ + K X \n\ + L Y \n\ + M Z \n\ + space BS \n\ + Return \n\ + Ctrl Shift AltGr \n\ + Focus MainMenu + +xvkbd.AltgrKeys: \ + , . \n\ + ; : \n\ + ! ? \n\ + ( ) \n\ + { } \n\ + [ ] \n\ + < > \n\ + # $ \n\ + % ^ \n\ + & @ \n\ + _ ~ \n\ + | = \n\ + ' " \n\ + \\ BackSpace \n\ + Return \n\ + Control_L Shift_L Mode_switch \n\ + Focus MainMenu + +xvkbd.AltgrKeyLabels: \ + , . \n\ + ; : \n\ + ! ? \n\ + ( ) \n\ + { } \n\ + [ ] \n\ + < > \n\ + # $ \n\ + % ^ \n\ + & @ \n\ + _ ~ \n\ + | = \n\ + ' " \n\ + \\ BS \n\ + Return \n\ + Ct Sh Ag \n\ + Focus MainMenu + +xvkbd.ShiftAltgrKeys: \ + Escape Tab \n\ + + - \n\ + * / \n\ + 0 5 \n\ + 1 6 \n\ + 2 7 \n\ + 3 8 \n\ + 4 9 \n\ + . , \n\ + Left Right \n\ + Up Down \n\ + F1 F4 \n\ + F2 F5 \n\ + space BackSpace \n\ + Return \n\ + Control_L Shift_L Mode_switch \n\ + Focus MainMenu + +xvkbd.ShiftAltgrKeyLabels: \ + Esc Tab \n\ + + - \n\ + * / \n\ + 0 5 \n\ + 1 6 \n\ + 2 7 \n\ + 3 8 \n\ + 4 9 \n\ + . , \n\ + left right \n\ + up down \n\ + F1 F4 \n\ + F2 F5 \n\ + space BS \n\ + Return \n\ + Ct Sh Ag \n\ + Focus MainMenu + +xvkbd.KeypadLabels: \ + Esc Tab \n\ + + - \n\ + * / \n\ + 0 F1 \n\ + 1 F2 \n\ + 2 F3 \n\ + 3 F4 \n\ + 4 F5 \n\ + 5 F6 \n\ + 6 F7 \n\ + 7 F8 \n\ + 8 F9 \n\ + 9 F10 \n\ + . Ent \n\ + left right \n\ + up down \n\ + Del Ins + +xvkbd.NormalKeypad: \ + Escape Tab \n\ + KP_Add KP_Subtract \n\ + KP_Multiply KP_Divide \n\ + KP_0 F1 \n\ + KP_1 F2 \n\ + KP_2 F3 \n\ + KP_3 F4 \n\ + KP_4 F5 \n\ + KP_5 F6 \n\ + KP_6 F7 \n\ + KP_7 F8 \n\ + KP_8 F9 \n\ + KP_9 F10 \n\ + . Enter \n\ + Left Right \n\ + Up Down \n\ + Delete Insert diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-uk.ad new/xvkbd-3.1/XVkbd-uk.ad --- old/xvkbd-3.0/XVkbd-uk.ad 2004-05-04 05:53:17.000000000 +0200 +++ new/xvkbd-3.1/XVkbd-uk.ad 2009-12-17 12:42:12.000000000 +0100 @@ -23,7 +23,7 @@ xvkbd.ShiftKeys: \ F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 BackSpace \n\ - Escape ! " � $ % ^ & = ( ) _ + � ~ \n\ + Escape ! " � $ % ^ & * ( ) _ + � ~ \n\ Tab Q W E R T Y U I O P { } Delete \n\ Control_L A S D F G H J K L : @ Return \n\ Shift_L | Z X C V B N M < > ? Multi_key Shift_R \n\ @@ -31,7 +31,7 @@ xvkbd.KeyLabels: \ F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Backspace \n\ - Esc !\n1 "\n2 �\n3 $\n4 %\n5 ^\n6 &\n7 =\n8 (\n9 )\n0 _\n- +\n= �\n` ~\n# \n\ + Esc !\n1 "\n2 �\n3 $\n4 %\n5 ^\n6 &\n7 *\n8 (\n9 )\n0 _\n- +\n= �\n` ~\n# \n\ Tab Q W E R T Y U I O P {\n[ }\n] Del \n\ Control A S D F G H J K L :\n; @\n' Return \n\ Shift |\n\\ Z X C V B N M <\n, >\n. ?\n/ Com\npose Shift \n\ @@ -47,7 +47,7 @@ xvkbd.ShiftKeyLabels: \ F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Backspace \n\ - Esc ! " � $ % ^ & = ( ) _ + � ~ \n\ + Esc ! " � $ % ^ & * ( ) _ + � ~ \n\ Tab Q W E R T Y U I O P { } Del \n\ Ctrl A S D F G H J K L : @ Return \n\ Shift | Z X C V B N M < > ? Comp Shift \n\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/resources.h new/xvkbd-3.1/resources.h --- old/xvkbd-3.0/resources.h 2008-05-05 12:22:15.000000000 +0200 +++ new/xvkbd-3.1/resources.h 2010-01-17 01:39:37.000000000 +0100 @@ -24,6 +24,7 @@ String show_manual_command; String geometry; + Boolean inherit_geometry; Boolean debug; Boolean xtest; Boolean no_sync; @@ -80,6 +81,11 @@ String shift_key_labels; String altgr_key_labels; String shift_altgr_key_labels; + + String keypad_normal; + String keypad_shift; + String keypad_labels; + String deadkeys; int altgr_keycode; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/xvkbd.c new/xvkbd-3.1/xvkbd.c --- old/xvkbd-3.0/xvkbd.c 2008-05-05 15:03:41.000000000 +0200 +++ new/xvkbd-3.1/xvkbd.c 2010-01-17 04:02:34.000000000 +0100 @@ -1,8 +1,8 @@ /* * xvkbd - Virtual Keyboard for X Window System - * (Version 3.0, 2008-05-05) + * (Version 3.1, 2010-01-17) * - * Copyright (C) 2000-2008 by Tom Sato <VEF00200(a)nifty.ne.jp> + * Copyright (C) 2000-2010 by Tom Sato <VEF00200(a)nifty.ne.jp> * http://homepage3.nifty.com/tsato/ * * This program is free software; you can redistribute it and/or @@ -54,14 +54,14 @@ #endif #include "resources.h" -#define PROGRAM_NAME_WITH_VERSION "xvkbd (v3.0)" +#define PROGRAM_NAME_WITH_VERSION "xvkbd (v3.1)" /* * Default keyboard layout is hardcoded here. * Layout of the main keyboard can be redefined by resources. */ -#define NUM_KEY_ROWS 6 -#define NUM_KEY_COLS 20 +#define NUM_KEY_ROWS 25 +#define NUM_KEY_COLS 25 static char *keys_normal[NUM_KEY_ROWS][NUM_KEY_COLS] = { { "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "BackSpace" }, @@ -116,8 +116,8 @@ static char *shift_altgr_key_labels[NUM_KEY_ROWS][NUM_KEY_COLS] = { { NULL } }; -#define NUM_KEYPAD_ROWS 5 -#define NUM_KEYPAD_COLS 5 +#define NUM_KEYPAD_ROWS NUM_KEY_ROWS +#define NUM_KEYPAD_COLS NUM_KEY_COLS static char *keypad[NUM_KEYPAD_ROWS][NUM_KEYPAD_COLS] = { { "Num_Lock", "KP_Divide", "KP_Multiply", "Focus" }, @@ -213,7 +213,7 @@ { "description", "Description", XtRString, sizeof(char *), Offset(description), XtRImmediate, PROGRAM_NAME_WITH_VERSION " - virtual keyboard for X window system\n\n" - "Copyright (C) 2000-2008 by Tom Sato <VEF00200(a)nifty.ne.jp>\n" + "Copyright (C) 2000-2010 by Tom Sato <VEF00200(a)nifty.ne.jp>\n" "http://homepage3.nifty.com/tsato/\n\n" "This program is free software with ABSOLUTELY NO WARRANTY,\n" "distributed under the terms of the GNU General Public License.\n" }, @@ -222,6 +222,8 @@ { "windowGeometry", "Geometry", XtRString, sizeof(char *), Offset(geometry), XtRImmediate, "" }, + { "inheritGeoemetry", "Inherit", XtRBoolean, sizeof(Boolean), + Offset(inherit_geometry), XtRImmediate, (XtPointer)TRUE }, { "debug", "Debug", XtRBoolean, sizeof(Boolean), Offset(debug), XtRImmediate, (XtPointer)FALSE }, #ifdef USE_XTEST @@ -338,6 +340,14 @@ Offset(altgr_key_labels), XtRImmediate, "" }, { "shiftaltgrkeylabels", "ShiftAltgrKeyLabels", XtRString, sizeof(char *), Offset(shift_altgr_key_labels), XtRImmediate, "" }, + + { "normalkeypad", "NormalKeypad", XtRString, sizeof(char *), + Offset(keypad_normal), XtRImmediate, "" }, + { "shiftkeypad", "ShiftKeypad", XtRString, sizeof(char *), + Offset(keypad_shift), XtRImmediate, "" }, + { "keypad_labels", "KeypadLabels", XtRString, sizeof(char *), + Offset(keypad_labels), XtRImmediate, "" }, + { "deadkeys", "DeadKeys", XtRString, sizeof(char *), Offset(deadkeys), XtRImmediate, "" }, { "altgrKeycode", "AltgrKeycode", XtRInt, sizeof(int), @@ -364,7 +374,7 @@ { "keyClickDuration", "KeyClickDuration", XtRInt, sizeof(int), Offset(key_click_duration), XtRImmediate, (XtPointer)1 }, { "autoClickDelay", "AutoClickDelay", XtRInt, sizeof(int), - Offset(autoclick_delay), XtRImmediate, (XtPointer)500 }, + Offset(autoclick_delay), XtRImmediate, (XtPointer)0 }, }; #undef Offset @@ -1701,11 +1711,16 @@ for (i = 1; i < argc1; i++) { if (strncmp(argv1[i], "-geom", strlen("-geom")) == 0) { - argv1[i + 1] = GetWindowGeometry(toplevel); + if (appres.inherit_geometry) { + argv1[i + 1] = GetWindowGeometry(toplevel); + } else if (i + 2 == argc1) { + argv1[i] = NULL; + argc1 = i; + } break; } } - if (i == argc1) { + if (i == argc1 && appres.inherit_geometry) { argv1[argc1++] = "-geometry"; argv1[argc1++] = GetWindowGeometry(toplevel); argv1[argc1] = NULL; @@ -2131,6 +2146,14 @@ } } +void SignalUser1(void) +{ + XWindowAttributes attr; + XGetWindowAttributes(dpy, XtWindow(toplevel), &attr); + IconifyWindow(None, attr.map_state != IsUnmapped); + XSync(dpy, FALSE); +} + /* * This will be called when user pressed a key on the screen. */ @@ -2360,9 +2383,11 @@ char *s = XtNewString(spec); char *cp; int row, col; + int key_rows = NUM_KEY_ROWS; + int key_cols = NUM_KEY_COLS; - for (row = 0; row < NUM_KEY_ROWS; row++) { - for (col = 0; col < NUM_KEY_COLS; col++) array[row][col] = NULL; + for (row = 0; row < key_rows; row++) { + for (col = 0; col < key_cols; col++) array[row][col] = NULL; } row = 0; col = 0; @@ -2374,10 +2399,10 @@ cp = cp + 1; } if (*cp != '\0') { - if (NUM_KEY_ROWS <= row) { + if (key_rows <= row) { fprintf(stderr, "%s: too many key rows: \"%s\" ignored\n", PROGRAM_NAME, cp); - } else if (NUM_KEY_COLS <= col) { + } else if (key_cols <= col) { fprintf(stderr, "%s: too many keys in a row: \"%s\" ignored\n", PROGRAM_NAME, cp); } else { @@ -2622,8 +2647,11 @@ first_row = appres.function_key ? 0 : 1; if (!appres.keypad_only) { for (row = first_row; row < NUM_KEY_ROWS; row++) { + if (keys_normal[row][0] == NULL) continue; + sprintf(name, "row%d", row); key_box[row] = XtVaCreateManagedWidget(name, formWidgetClass, form, NULL); + key_box[row + 1] = None; if (row != first_row) XtVaSetValues(key_box[row], XtNfromVert, key_box[row - 1], NULL); else if (!appres.function_key) @@ -2698,7 +2726,7 @@ } } - if (appres.keypad) MakeKeypad(form, key_box[0], key_box[1]); + if (appres.keypad) MakeKeypad(form, key_box[0], key_box[1]); if (!appres.keypad_only && appres.function_key && appres.keypad) { XtVaCreateManagedWidget("banner", labelWidgetClass, form, @@ -2733,12 +2761,12 @@ XtVaGetValues(key_box[1], XtNwidth, &max_wd, NULL); } else { max_wd = 0; - for (row = first_row; row < NUM_KEY_ROWS; row++) { + for (row = first_row; row < NUM_KEY_ROWS && key_box[row] != None; row++) { XtVaGetValues(key_box[row], XtNwidth, &wd, NULL); if (max_wd < wd) max_wd = wd; } } - for (row = first_row; row < NUM_KEY_ROWS; row++) { + for (row = first_row; row < NUM_KEY_ROWS && key_box[row] != None; row++) { XtVaSetValues(key_box[row], XtNwidth, max_wd, NULL); } } @@ -3270,6 +3298,7 @@ NULL, }; + Boolean open_keypad_panel = FALSE; char ch; Window child; int op, ev, err; @@ -3305,7 +3334,7 @@ } if (appres.keypad_only && !appres.keypad) { appres.keypad_only = FALSE; - fprintf(stderr, "%s: warning: keypad_only ignored\n", PROGRAM_NAME); + open_keypad_panel = TRUE; } if (appres.no_sync) { @@ -3368,6 +3397,16 @@ if (0 < strlen(appres.shift_altgr_key_labels)) RedefineKeys(shift_altgr_key_labels, appres.shift_altgr_key_labels); + if (0 < strlen(appres.keypad_normal)) { + RedefineKeys(keypad, appres.keypad_normal); + RedefineKeys(keypad_shift, appres.keypad_normal); + RedefineKeys(keypad_label, appres.keypad_normal); + } + if (0 < strlen(appres.keypad_shift)) + RedefineKeys(keypad_shift, appres.keypad_shift); + if (0 < strlen(appres.keypad_labels)) + RedefineKeys(keypad_label, appres.keypad_labels); + MakeKeyboard(FALSE); if (focused_window != None && @@ -3419,8 +3458,22 @@ #endif } + { +#ifdef SYSV + signal(SIGUSR1, SignalUser1); +#else + struct sigaction sigact; + sigact.sa_handler = SignalUser1; + sigemptyset(&sigact.sa_mask); + sigact.sa_flags = 0; + sigaction(SIGUSR1, &sigact, NULL); +#endif + } + SetIconBitmap(toplevel); + if (open_keypad_panel) MenuSelected(None, "keypad"); + XtAppMainLoop(app_con); } exit(0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/xvkbd.man new/xvkbd-3.1/xvkbd.man --- old/xvkbd-3.0/xvkbd.man 2008-05-05 15:12:13.000000000 +0200 +++ new/xvkbd-3.1/xvkbd.man 2010-01-17 04:25:59.000000000 +0100 @@ -1,4 +1,4 @@ -.TH xvkbd 1 2008-05-05 +.TH xvkbd 1 2010-01-17 .SH NAME @@ -558,14 +558,14 @@ .SH "Download" .TP 4 \fILatest Official Release\fP -\fIhttp://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.0.tar.gz\fP +\fIhttp://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.1.tar.gz\fP .br -- source of version 3.0 (2008-05-05) +- source of version 3.1 (2010-01-17) .TP 4 previous release -http://homepage3.nifty.com/tsato/xvkbd/xvkbd-2.9.tar.gz\fP +http://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.0.tar.gz .br -- source of version 2.9 (2008-03-30) +- source of version 3.0 (2008-05-05) .PP \fIxvkbd\fP is distributed under the terms of the GNU General Public License. @@ -760,8 +760,8 @@ .PP If the first character of the assigned string is `\fB!\fP', the string will be used as command to be executed when the key is clicked. -String starting with `\fB!\fP' can be assigned -by putting `\fB\\\fP' before `\fB!\fP'. +To assign string starting with `\fB!\fP' or `\fB\\\fP', +put `\fB\\\fP' before the string. .PP The file is \fB$HOME/.xvkbd\fP in default, and it can be changed by setting the filename @@ -1127,6 +1127,20 @@ New automatic click feature. .IP " - " 6 Key-click sounds when key is pressed. +.TP 4 +Version 3.1 (2010-01-17) +.IP " - " 6 +Changed the default setting for automatic click to OFF, which was set ON in the previous release in error and caused confusion. +.IP " - " 6 +The keypad is now customizable, too (see XVkbd-strip.ad for the example). +.IP " - " 6 +Up to 25x25 keys can now be supported both for the main keyboard and the keypad. +.IP " - " 6 +Able to open the keypad panel when startup, by setting `\fBxvkbd.keypad: false\fP' and `\fBxvkbd.keypadOnly: true\fP'. +.IP " - " 6 +Fixed errors in some keyboard layout files (Korean, Slovene, UK). +.IP " - " 6 +A new sample layout file XVkbd-strip.ad. .SH "Author" \fIxvkbd\fP was written by Tom Sato, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wwwoffle for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package wwwoffle for openSUSE:Factory checked in at Mon Mar 1 01:51:23 CET 2010. -------- --- wwwoffle/wwwoffle.changes 2010-02-22 14:25:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/wwwoffle/wwwoffle.changes 2010-02-26 10:51:10.000000000 +0100 @@ -1,0 +2,16 @@ +Fri Feb 26 10:48:57 CET 2010 - anicka(a)suse.cz + +- update to 2.9f + * Return a 304 reply if online and the cached page won't be + refreshed and meets the conditions for this header. + * Remove the use of the libgnutls-config program and search for the + library in the normal configure script method. + * When making a HEAD request use the cached version if possible. + * Add a new option to the wwwoffle program to close and re-open + the log file. + * Add an option to expire certificates after a longer than + default time. + * Add an option to use a faster but weaker source of random numbers + for key generation (/dev/urandom instead of /dev/random). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- wwwoffle-2.9e.tar.bz2 New: ---- wwwoffle-2.9f.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wwwoffle.spec ++++++ --- /var/tmp/diff_new_pack.CbrINK/_old 2010-03-01 01:51:15.000000000 +0100 +++ /var/tmp/diff_new_pack.CbrINK/_new 2010-03-01 01:51:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package wwwoffle (Version 2.9e) +# spec file for package wwwoffle (Version 2.9f) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,8 +25,8 @@ AutoReqProv: on Summary: World Wide Web Offline Proxy Url: http://gedanken.demon.co.uk/wwwoffle/ -Version: 2.9e -Release: 4 +Version: 2.9f +Release: 1 Source0: http://gedanken.demon.co.uk/download-wwwoffle/%{name}-%{version}.tar.bz2 Source1: rc.%name Source3: ip-up.%name ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wv2 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package wv2 for openSUSE:Factory checked in at Mon Mar 1 01:51:05 CET 2010. -------- --- wv2/wv2.changes 2009-01-17 04:11:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/wv2/wv2.changes 2010-02-25 18:50:22.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Feb 25 18:25:12 CET 2010 - dimstar(a)opensuse.org + +- Update to 0.4.2: + + Basic support for images + + Basic support for tables + + Changed build system to cmake +- Drop patches wv2-gcc43.patch and wv2-diff.patch +- BuildRequire cmake +- Rename the library package according SLPP to libwv2-4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- wv2-0.2.3.tar.bz2 wv2-gcc43.patch wv2.diff New: ---- wv2-0.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wv2.spec ++++++ --- /var/tmp/diff_new_pack.EUii9z/_old 2010-03-01 01:50:50.000000000 +0100 +++ /var/tmp/diff_new_pack.EUii9z/_new 2010-03-01 01:50:50.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package wv2 (Version 0.2.3) +# spec file for package wv2 (Version 0.4.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,102 +15,91 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: wv2 -BuildRequires: gcc-c++ libgsf-devel -License: LGPL v2.1 or later -Group: System/Libraries -AutoReqProv: on -Version: 0.2.3 -Release: 253 +Version: 0.4.2 +Release: 1 +License: LGPLv2.1+ Summary: Library for Importing Microsoft Word (tm) Documents -Source: %name-%{version}.tar.bz2 Url: http://sourceforge.net/projects/wvware -Patch: %name.diff -Patch1: %name-gcc43.patch +Group: System/Libraries +Source: %{name}-%{version}.tar.bz2 +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: libgsf-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The wv2 library is used to import Microsoft Word documents in koffice for example. +%package -n libwv2-4 +Summary: Library for Importing Microsoft Word (tm) Documents +Group: System/Libraries +License: LGPLv2.1+ - -Authors: --------- - Dom Lachowicz <cinamod(a)hotmail.com> - Shaheed Haque <srhaque(a)iee.org> - Werner Trobin <trobin(a)kde.org> - David Faure <faure(a)kde.org> +%description -n libwv2-4 +The wv2 library is used to import Microsoft Word documents in koffice +for example. %package devel -License: LGPL v2.1 or later -Group: System/Libraries +License: LGPLv2.1+ Summary: Library for Importing Microsoft Word(tm) Documents - development files -Requires: wv2 = %{version} -Requires: bzip2 libgsf-devel libstdc++-devel +Group: System/Libraries +Requires: bzip2 +Requires: libgsf-devel +Requires: libstdc++-devel +Requires: lib%{name}-4 = %{version} %description devel The wv2 library is used to import Microsoft Word documents in koffice for example. - - -Authors: --------- - Dom Lachowicz <cinamod(a)hotmail.com> - Shaheed Haque <srhaque(a)iee.org> - Werner Trobin <trobin(a)kde.org> - David Faure <faure(a)kde.org> - %prep %setup -q -%patch -%patch1 -p1 %build - rm -rf autom4te.cache - autoreconf --force --install - CFLAGS="$RPM_OPT_FLAGS -fstack-protector" \ - CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector" \ -%configure --with-pic \ - --disable-debug \ - --disable-static +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ +%ifarch x86_64 +-DLIB_SUFFIX=64 \ +%endif +. +# THAT DOT BELONGS TO THE CMAKE CALL %{__make} %{?jobs:-j%jobs} %install - make DESTDIR=$RPM_BUILD_ROOT install - mkdir -p $RPM_BUILD_ROOT/%_defaultdocdir/wv2/ +%makeinstall + find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print + mkdir -p %{buildroot}%_defaultdocdir/wv2/ cp -a doc AUTHORS README TODO COPYING.LIB \ - $RPM_BUILD_ROOT/%_defaultdocdir/wv2/ - rm -rf $RPM_BUILD_ROOT/%_defaultdocdir/wv2/doc/escher/CVS - rm -rf $RPM_BUILD_ROOT/%_defaultdocdir/wv2/doc/CVS - rm -rf $RPM_BUILD_ROOT/%_defaultdocdir/wv2/doc/.cvsignore -%{__rm} -f %{buildroot}%{_libdir}/*.la + %{buildroot}%_defaultdocdir/wv2/ + rm -rf %{buildroot}%_defaultdocdir/wv2/doc/escher/CVS + rm -rf %{buildroot}%_defaultdocdir/wv2/doc/CVS + rm -rf %{buildroot}%_defaultdocdir/wv2/doc/.cvsignore -%post -p /sbin/ldconfig +%post -n libwv2-4 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libwv2-4 -p /sbin/ldconfig %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%files +%files -n libwv2-4 %defattr(-, root, root) %dir %_defaultdocdir/wv2 %doc %_defaultdocdir/wv2/AUTHORS %doc %_defaultdocdir/wv2/COPYING.LIB -/%_libdir/libwv2.so.* +/%{_libdir}/libwv2.so.* %files devel %defattr(-, root, root) %doc %_defaultdocdir/wv2/doc %doc %_defaultdocdir/wv2/README %doc %_defaultdocdir/wv2/TODO -/usr/bin/wv2-config -/usr/include/wv2 -/%_libdir/libwv2.so +%{_bindir}/wv2-config +%{_includedir}/wv2 +%{_libdir}/libwv2.so +%{_libdir}/wvWare %changelog ++++++ wv2-0.2.3.tar.bz2 -> wv2-0.4.2.tar.bz2 ++++++ ++++ 124792 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wt for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package wt for openSUSE:Factory checked in at Mon Mar 1 01:51:00 CET 2010. -------- --- wt/wt.changes 2010-01-26 13:39:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/wt/wt.changes 2010-02-25 11:21:34.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Feb 25 10:07:09 UTC 2010 - poletti.marco(a)gmail.com + +- Update to 3.1.1 + * mxml: replace mxml with an (adapted) rapidxml browser. + * WCanvasPaintDevice: Use HTML5 native canvas text when available + * Improved themes + * Chart/WAxis: added setLabelFont(), labelFont() methods + * WContainerWidget: support resetting a layout manager + * Bug fixes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- wt-3.1.0.tar.bz2 New: ---- wt-3.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wt.spec ++++++ --- /var/tmp/diff_new_pack.WeArZ2/_old 2010-03-01 01:50:48.000000000 +0100 +++ /var/tmp/diff_new_pack.WeArZ2/_new 2010-03-01 01:50:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package wt (Version 3.1.0) +# spec file for package wt (Version 3.1.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ License: GPLv2 Group: Development/Libraries/C and C++ AutoReqProv: on -Version: 3.1.0 +Version: 3.1.1 Release: 1 Summary: Web Toolkit Source0: %{name}-%{version}.tar.bz2 @@ -121,6 +121,10 @@ mkdir %{buildroot}%{_docdir}/%{name}-devel/ cp -rv ../doc/* %{buildroot}%{_docdir}/%{name}-devel/ mv -v %{buildroot}%{_datadir}/Wt %{buildroot}%{_datadir}/wt + +# We mustn't package .orig files +find %{buildroot}%{_includedir}/Wt -name '*.orig' -delete + %fdupes %{buildroot}%{_docdir} %fdupes %{buildroot}%{_datadir} @@ -145,7 +149,7 @@ %files devel %defattr(-,root,root) -%{_includedir}/* +%{_includedir}/Wt %exclude %{_libdir}/*.so.%{version} %{_libdir}/*.so.* %{_libdir}/*.so ++++++ wt-3.1.0.tar.bz2 -> wt-3.1.1.tar.bz2 ++++++ wt/wt-3.1.0.tar.bz2 /mounts/work_src_done/STABLE/wt/wt-3.1.1.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vm-install for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at Mon Mar 1 01:50:38 CET 2010. -------- --- vm-install/vm-install.changes 2010-02-06 00:39:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/vm-install/vm-install.changes 2010-02-26 19:08:48.000000000 +0100 @@ -1,0 +2,28 @@ +Wed Feb 24 13:58:26 MST 2010 - carnold(a)novell.com + +- bnc#582608 - virt-manager/vm-install doesn't allow to setup + virtio devices for kvm + +------------------------------------------------------------------- +Mon Feb 22 15:29:54 MST 2010 - carnold(a)novell.com + +- bnc#574657 - libvirt always output error message when installing + a KVM guest OS using virt-manager or vm-install although the + installation is successful + +------------------------------------------------------------------- +Mon Feb 22 14:33:04 MST 2010 - carnold(a)novell.com + +- Include a default file extension for disk images. + +------------------------------------------------------------------- +Tue Feb 16 14:07:50 MST 2010 - carnold(a)novell.com + +- bnc#580183 - vm-install: some semantic errors found by pylint + +------------------------------------------------------------------- +Mon Feb 8 09:40:54 MST 2010 - carnold(a)novell.com + +- bnc#577862 - list index out of range, if no disks are specified. + +------------------------------------------------------------------- @@ -171 +199 @@ -Thu Jul 30 17:18:06 MDT 2009 - carnold(a)novell.com +Thu Jul 30 17:16:47 MDT 2009 - carnold(a)novell.com @@ -173 +201 @@ -- bnc#526855 - Cannot set MAC address for PV guest in vm-install +- bnc#526885 - Cannot set MAC address for PV guest in vm-install @@ -176 +204 @@ -Thu Jul 30 08:38:06 MDT 2009 - carnold(a)novell.com +Thu Jul 30 08:35:47 MDT 2009 - carnold(a)novell.com @@ -181,7 +209 @@ -Wed Jul 29 13:45:54 MDT 2009 - carnold(a)novell.com - -- fate#306125: Virtual machines are not able to boot from CD to - allow upgrade to OES2SP1 - -------------------------------------------------------------------- -Fri Jul 17 10:00:20 MDT 2009 - carnold(a)novell.com +Fri Jul 17 09:50:01 MDT 2009 - carnold(a)novell.com @@ -198 +220 @@ -Tue Jun 2 15:53:36 MDT 2009 - carnold(a)novell.com +Tue Jun 2 10:16:45 MDT 2009 - carnold(a)novell.com @@ -203 +225 @@ -Tue May 12 15:54:01 MDT 2009 - carnold(a)novell.com +Tue May 12 15:09:17 MDT 2009 - carnold(a)novell.com @@ -209 +231 @@ -Thu Apr 30 17:27:52 MDT 2009 - carnold(a)novell.com +Mon May 4 15:31:16 MDT 2009 - carnold(a)novell.com @@ -211 +233,2 @@ -- Improved KVM support. +- bnc#499052 - installing an HVM SLES 10 SP2 VM with one nic gives + you two identical network cards. @@ -214 +237 @@ -Mon Mar 27 15:01:18 MDT 2009 - carnold(a)novell.com +Mon Mar 27 14:57:18 MDT 2009 - carnold(a)novell.com @@ -220 +243,31 @@ -Fri Mar 27 11:34:25 MDT 2009 - carnold(a)novell.com +Mon Mar 23 11:39:48 MDT 2009 - carnold(a)novell.com + +- bnc#487667 - SLES 11 Xen, RHEL 4 HVM guest has no mouse or + keyboard in GUI + +------------------------------------------------------------------- +Fri Mar 13 11:29:13 MDT 2009 - carnold(a)novell.com + +- bnc#412642 - vm-install: XEN full virtualization of NetWare 6.5 + SP6 not possible + +------------------------------------------------------------------- +Tue Mar 10 11:44:04 MDT 2009 - carnold(a)novell.com + +- bnc#483323 - Problems to configure section Installation of + operating system in vm-install (GUI version) for paravirtualized + system + +------------------------------------------------------------------- +Tue Mar 10 11:25:07 MDT 2009 - carnold(a)novell.com + +- bnc#473478 - mouse is disabled in sles 9 sp4 HVM guests + +------------------------------------------------------------------- +Tue Mar 10 09:56:09 MDT 2009 - carnold(a)novell.com + +- bnc#475826 - selecting virtual disk for install still defaults + back to PXE boot + +------------------------------------------------------------------- +Tue Mar 10 09:35:17 MDT 2009 - carnold(a)novell.com @@ -222 +275 @@ -- bnc#486824 – Xen OS install window error dialog message +- bnc#468567 - pv installs using network source duplicates the entry @@ -225 +278 @@ -Mon Mar 16 16:24:31 MDT 2009 - carnold(a)novell.com +Mon Mar 9 16:28:37 MDT 2009 - carnold(a)novell.com @@ -227,2 +280,2 @@ -- bnc#470971 - vm-install asks for samba password on console - (even for guest only samba shares) - Kong Wei patch +- bnc#468860 - XEN PXE boot of paravirtualized (pv) domU does not + work. Revised to support special sles installation media. calling whatdependson for head-i586 Old: ---- vm-install-0.4.18.tar.bz2 New: ---- vm-install-0.4.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.LwssY5/_old 2010-03-01 01:50:28.000000000 +0100 +++ /var/tmp/diff_new_pack.LwssY5/_new 2010-03-01 01:50:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package vm-install (Version 0.4.18) +# spec file for package vm-install (Version 0.4.21) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,13 +26,13 @@ License: GPLv2+ Group: System/Emulators/PC AutoReqProv: yes -Version: 0.4.18 +Version: 0.4.21 Release: 1 Summary: Tool to Define a Virtual Machine and Install Its Operating System -Source0: %{name}-0.4.18.tar.bz2 +Source0: %{name}-0.4.21.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 -Requires: libvirt python-urlgrabber libxml2-python libvirt-python udhcp tftp +Requires: libvirt python-urlgrabber libxml2-python libvirt-python virt-utils udhcp tftp %define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()") %description ++++++ vm-install-0.4.18.tar.bz2 -> vm-install-0.4.21.tar.bz2 ++++++ ++++ 1812 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/Makefile new/vm-install-0.4.21/Makefile --- old/vm-install-0.4.18/Makefile 2010-01-25 21:55:24.000000000 +0100 +++ new/vm-install-0.4.21/Makefile 2010-02-25 00:31:00.000000000 +0100 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.4.18 +VER = 0.4.21 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/bin/vm-install new/vm-install-0.4.21/bin/vm-install --- old/vm-install-0.4.18/bin/vm-install 2010-01-07 19:48:30.000000000 +0100 +++ new/vm-install-0.4.21/bin/vm-install 2010-02-25 00:30:59.000000000 +0100 @@ -79,7 +79,7 @@ vminstall.advanced.parse_string(parser.values, value) def setConnection(option, opt_str, value, parser): - connection = vminstall.xen_hypervisor.parse_string(value) + connection = vminstall.libvirt_hypervisor.parse_string(value) if connection: parser.values.connect = connection diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/glade/vm-install.glade new/vm-install-0.4.21/glade/vm-install.glade --- old/vm-install-0.4.18/glade/vm-install.glade 2010-01-07 19:48:30.000000000 +0100 +++ new/vm-install-0.4.21/glade/vm-install.glade 2010-02-26 17:42:34.000000000 +0100 @@ -8612,6 +8612,26 @@ <property name="fill">False</property> </packing> </child> + + <child> + <widget class="GtkCheckButton" id="disk-virtio"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">ro</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_disk_virtio_toggled" last_modification_time="Fri, 12 Jan 2007 20:39:21 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> <packing> <property name="left_attach">1</property> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/po/ar.po new/vm-install-0.4.21/po/ar.po --- old/vm-install-0.4.18/po/ar.po 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/po/ar.po 2010-02-25 00:31:00.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-15 15:26-0700\n" -"PO-Revision-Date: 2010-02-03 07:42\n" +"PO-Revision-Date: 2010-02-17 08:53\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/po/cs.po new/vm-install-0.4.21/po/cs.po --- old/vm-install-0.4.18/po/cs.po 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/po/cs.po 2010-02-25 00:31:00.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-15 15:26-0700\n" -"PO-Revision-Date: 2010-02-01 15:45\n" +"PO-Revision-Date: 2010-02-15 10:29\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -172,7 +172,7 @@ #: src/vminstall/msg.py:76 msgid "An error occurred while reading the configuration file." -msgstr "Při čtení souboru konfigurace došlo k chybě." +msgstr "Při čtení konfiguračního souboru došlo k chybě." #: src/vminstall/msg.py:79 msgid "The operating system is incompatible with the processor architecture of this machine." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/po/de.po new/vm-install-0.4.21/po/de.po --- old/vm-install-0.4.18/po/de.po 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/po/de.po 2010-02-25 00:31:00.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-15 15:26-0700\n" -"PO-Revision-Date: 2010-02-04 11:01\n" +"PO-Revision-Date: 2010-02-16 11:14\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ #: src/vminstall/msg.py:67 msgid "You must shutdown the VM before upgrading." -msgstr "Der virtuelle Computer muss vor der Aktualisierung heruntergefahren werden." +msgstr "Der virtuelle Computer muss vor der Aufrüstung heruntergefahren werden." #: src/vminstall/msg.py:70 msgid "The installation source is using an unsupported protocol." @@ -172,7 +172,7 @@ #: src/vminstall/msg.py:76 msgid "An error occurred while reading the configuration file." -msgstr "Beim Lesen der Konfigurationsdatei ist ein Fehler aufgetreten." +msgstr "Fehler beim Lesen der Konfigurationsdatei." #: src/vminstall/msg.py:79 msgid "The operating system is incompatible with the processor architecture of this machine." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/po/es.po new/vm-install-0.4.21/po/es.po --- old/vm-install-0.4.18/po/es.po 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/po/es.po 2010-02-25 00:31:00.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-15 15:26-0700\n" -"PO-Revision-Date: 2010-02-02 07:14\n" +"PO-Revision-Date: 2010-02-15 13:51\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -468,7 +468,7 @@ #: src/vminstall/msg.py:168 msgid "Keymap" -msgstr "Teclado" +msgstr "Mapa de teclas" #: src/vminstall/msg.py:169 msgid "None" @@ -690,7 +690,7 @@ #: src/vminstall/msg.py:237 msgid "Please specify the keyboard translation map file." -msgstr "Especifique el archivo de asignación de traducción del teclado." +msgstr "Especifique el archivo de mapa de traducción del teclado." #: src/vminstall/msg.py:241 msgid "Virtual Disks" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/po/fr.po new/vm-install-0.4.21/po/fr.po --- old/vm-install-0.4.18/po/fr.po 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/po/fr.po 2010-02-25 00:31:00.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-15 15:26-0700\n" -"PO-Revision-Date: 2010-02-02 07:48\n" +"PO-Revision-Date: 2010-02-15 10:46\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -468,7 +468,7 @@ #: src/vminstall/msg.py:168 msgid "Keymap" -msgstr "Keymap" +msgstr "Codage clavier" #: src/vminstall/msg.py:169 msgid "None" @@ -690,7 +690,7 @@ #: src/vminstall/msg.py:237 msgid "Please specify the keyboard translation map file." -msgstr "Veuillez spécifier le fichier de mappage de traduction du clavier." +msgstr "Veuillez spécifier le fichier de codage clavier." #: src/vminstall/msg.py:241 msgid "Virtual Disks" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/po/hu.po new/vm-install-0.4.21/po/hu.po --- old/vm-install-0.4.18/po/hu.po 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/po/hu.po 2010-02-25 00:31:00.000000000 +0100 @@ -4,19 +4,19 @@ # Copyright (C) YEAR Novell, Inc. # This file is distributed under the same license as the PACKAGE package. # -# Kalman Kemenczy <kkemenczy(a)novell.com>, 2007, 2008, 2009. +# Kalman Kemenczy <kkemenczy(a)novell.com>, 2007, 2008, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-15 15:26-0700\n" -"PO-Revision-Date: 2009-10-10 13:19+0200\n" +"PO-Revision-Date: 2010-02-09 18:51+0100\n" "Last-Translator: Kalman Kemenczy <kkemenczy(a)novell.com>\n" -"Language-Team: Hungarian <hu(a)li.org>\n" +"Language-Team: Hungarian <kde-i18n-doc(a)kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/vminstall/msg.py:22 @@ -29,7 +29,7 @@ #: src/vminstall/msg.py:24 msgid "Warning" -msgstr "" +msgstr "Figyelem" #: src/vminstall/msg.py:25 msgid "Aborted" @@ -240,15 +240,16 @@ msgstr "Nincs elegendő szabad terület az eszközön a lemezképhez." #: src/vminstall/msg.py:92 -#, fuzzy msgid "Create disk image failed." -msgstr "Ritka (sparse) lemezkép létrehozása" +msgstr "A lemezkép létrehozása nem sikerült." #: src/vminstall/msg.py:93 msgid "" "You are overcommitting the amount of disk space available on this device. " "Continue anyways?" msgstr "" +"Több lemezterületet foglalt le, mint amennyi az eszközön rendelkezésre áll. " +"Ennek ellenére folytatja?" #: src/vminstall/msg.py:96 msgid "The job was canceled." @@ -500,7 +501,7 @@ #: src/vminstall/msg.py:168 msgid "Keymap" -msgstr "" +msgstr "Billentyűzetkiosztás" #: src/vminstall/msg.py:169 msgid "None" @@ -516,15 +517,15 @@ #: src/vminstall/msg.py:172 msgid "Description" -msgstr "" +msgstr "Leírás" #: src/vminstall/msg.py:173 msgid "Enabled" -msgstr "" +msgstr "Engedélyezett" #: src/vminstall/msg.py:174 msgid "Option" -msgstr "" +msgstr "Opció" #: src/vminstall/msg.py:177 msgid "Create a Virtual Machine" @@ -556,7 +557,7 @@ #: src/vminstall/msg.py:184 msgid "Graphics and Keyboard" -msgstr "" +msgstr "Grafika és billentyűzet" #: src/vminstall/msg.py:185 msgid "Disks" @@ -588,7 +589,7 @@ #: src/vminstall/msg.py:192 msgid "Advanced Settings" -msgstr "" +msgstr "További beállítások" #: src/vminstall/msg.py:195 msgid "" @@ -757,10 +758,14 @@ "understand clearly the consequences of enabling or disabling a particular " "setting." msgstr "" +"Figyelem: Vm-install automatikusan kezeli ezeket a beállításokat a " +"telepített az operációs rendszertől függően. Bizonyosodjon meg arról, hogy " +"tisztában van az egyes beállítások engedélyezésével és letiltásával járó " +"következményekkel." #: src/vminstall/msg.py:222 msgid "Reset to Defaults" -msgstr "" +msgstr "Alapértékek visszaállítása" #: src/vminstall/msg.py:225 msgid "" @@ -817,9 +822,8 @@ msgstr "Grafikus támogatás nélkül" #: src/vminstall/msg.py:237 -#, fuzzy msgid "Please specify the keyboard translation map file." -msgstr "Adja meg a virtuális hálózati csatoló beállításait." +msgstr "Adja meg a billentyűzetkiosztási fájlt." #: src/vminstall/msg.py:241 msgid "Virtual Disks" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/po/it.po new/vm-install-0.4.21/po/it.po --- old/vm-install-0.4.18/po/it.po 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/po/it.po 2010-02-25 00:31:00.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-15 15:26-0700\n" -"PO-Revision-Date: 2010-02-03 13:32\n" +"PO-Revision-Date: 2010-02-15 15:04\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/po/ja.po new/vm-install-0.4.21/po/ja.po --- old/vm-install-0.4.18/po/ja.po 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/po/ja.po 2010-02-25 00:31:00.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-15 15:26-0700\n" -"PO-Revision-Date: 2010-02-02 10:44\n" +"PO-Revision-Date: 2010-02-15 11:11\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/po/nl.po new/vm-install-0.4.21/po/nl.po --- old/vm-install-0.4.18/po/nl.po 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/po/nl.po 2010-02-25 00:31:00.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-15 15:26-0700\n" -"PO-Revision-Date: 2010-02-01 15:17\n" +"PO-Revision-Date: 2010-02-15 12:19\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -248,7 +248,7 @@ #: src/vminstall/msg.py:105 msgid "The operating system cannot be upgraded from this tool." -msgstr "Het besturingssysteem kan niet worden geüpgrade met dit hulpmiddel." +msgstr "Het besturingssysteem kan niet worden geüpgraded met dit hulpmiddel." #: src/vminstall/msg.py:108 msgid "NetWare" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/po/pl.po new/vm-install-0.4.21/po/pl.po --- old/vm-install-0.4.18/po/pl.po 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/po/pl.po 2010-02-25 00:31:00.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-15 15:26-0700\n" -"PO-Revision-Date: 2010-02-04 12:10\n" +"PO-Revision-Date: 2010-02-16 12:10\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/po/pt_BR.po new/vm-install-0.4.21/po/pt_BR.po --- old/vm-install-0.4.18/po/pt_BR.po 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/po/pt_BR.po 2010-02-25 00:31:00.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-15 15:26-0700\n" -"PO-Revision-Date: 2010-02-02 08:19\n" +"PO-Revision-Date: 2010-02-15 13:26\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/po/ru.po new/vm-install-0.4.21/po/ru.po --- old/vm-install-0.4.18/po/ru.po 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/po/ru.po 2010-02-25 00:31:00.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-15 15:26-0700\n" -"PO-Revision-Date: 2010-02-02 12:00\n" +"PO-Revision-Date: 2010-02-17 08:18\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/po/sv.po new/vm-install-0.4.21/po/sv.po --- old/vm-install-0.4.18/po/sv.po 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/po/sv.po 2010-02-25 00:31:00.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-15 15:26-0700\n" -"PO-Revision-Date: 2010-02-02 11:19\n" +"PO-Revision-Date: 2010-02-15 14:08\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/po/zh_CN.po new/vm-install-0.4.21/po/zh_CN.po --- old/vm-install-0.4.18/po/zh_CN.po 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/po/zh_CN.po 2010-02-25 00:31:00.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-15 15:26-0700\n" -"PO-Revision-Date: 2010-02-01 11:12\n" +"PO-Revision-Date: 2010-02-15 08:16\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/po/zh_TW.po new/vm-install-0.4.21/po/zh_TW.po --- old/vm-install-0.4.18/po/zh_TW.po 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/po/zh_TW.po 2010-02-25 00:31:00.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-15 15:26-0700\n" -"PO-Revision-Date: 2010-02-01 11:44\n" +"PO-Revision-Date: 2010-02-15 09:32\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/setup.py new/vm-install-0.4.21/setup.py --- old/vm-install-0.4.18/setup.py 2010-01-25 21:55:24.000000000 +0100 +++ new/vm-install-0.4.21/setup.py 2010-02-25 00:31:00.000000000 +0100 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.4.18', + version='0.4.21', description='Define a virtual machine and install its operating system', author='Charles Coffing', author_email='ccoffing(a)novell.com', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vmdisks/disks.py new/vm-install-0.4.21/src/vmdisks/disks.py --- old/vm-install-0.4.18/src/vmdisks/disks.py 2010-02-06 00:32:08.000000000 +0100 +++ new/vm-install-0.4.21/src/vmdisks/disks.py 2010-02-26 17:42:34.000000000 +0100 @@ -338,6 +338,40 @@ } kvm_disk_protocols = ["bochs:", "cloop:", "cow:", "dmg:", "file:", "nbd:", "parallels:", "phy:", "qcow:", "qcow2:", "raw:", "vmdk:", "vpc:", "vvfat:"] +protocol_file_extensions = { + 'file': "raw", + 'tap:aio': "raw", + 'raw': "raw", + 'tap:qcow2': "qcow2", + 'qcow2': "qcow2", + 'qcow': "qcow", + 'tap:vmdk': "vmdk", + 'vmdk': "vmdk", + 'tap:vhd': "vhd", + 'vpc': "vpc", + 'vvfat': "vfat", + 'dmg': "dmg", + 'cow': "cow", + 'bochs': "bchs", + 'cloop': "clp", + 'parallels': "par" +} + +file_extension_protocols = { + 'raw': ['file','tap:aio','raw'], + 'qcow2': ['tap:qcow2','qcow2'], + 'qcow': ['qcow'], + 'vmdk': ['tap:vmdk','vmdk'], + 'vhd': ['tap:vhd'], + 'vpc': ['vpc'], + 'vfat': ['vvfat'], + 'dmg': ['dmg'], + 'cow': ['cow'], + 'bchs': ['bochs'], + 'clp': ['cloop'], + 'par': ['parallels'] +} + def parse_string(disk, extended=False, blocks=None): """Parses a text representation of a disk, and returns such a disk object. @@ -484,6 +518,7 @@ self.set_virtual_size(blocks) self.set_ro(ro) self.args = args + self.set_virtio() if vminstall.caps.is_kvm() or vminstall.caps.is_qemu(): self._protocols = kvm_disk_protocols @@ -612,9 +647,10 @@ if os.path.exists(dpath): dsize = disk.driver.size(dpath) vsize = disk.get_virtual_size() - if dsize <= vsize: - blocks = vsize - dsize - requested_blocks += blocks + if dsize is not None and vsize is not None: + if dsize <= vsize: + blocks = vsize - dsize + requested_blocks += blocks continue fs = self._get_fs(disk.get_pdev()) if new_disk_fs == fs: @@ -695,14 +731,23 @@ if 'create' in dir(self.driver) and not self.driver.size(self.get_path()): self._blocks = blocks + def _get_image_extension(self): + ext_type = "" + p = self.get_proto() + if p in protocol_file_extensions: + ext_type = protocol_file_extensions[p] + ext_type = "." + ext_type + return ext_type + def _update_template_path(self): if self._template_lock: return num = -1 + ext = self._get_image_extension() while True: num += 1 used = False - path = os.path.join(vminstall.paths.imagedir, self.vmname, 'disk%d' % num) + path = os.path.join(vminstall.paths.imagedir, self.vmname, 'disk%d%s' % (num,ext)) if os.path.exists(path): continue for disk in self.disk_group: @@ -758,6 +803,14 @@ self._ro = ro ro = property(get_ro, set_ro) + def set_virtio(self): + if vminstall.caps.is_xen(): + self.virtio = False + else: + if self._vdevType == self.DEVICE_CDROM: + self.virtio = False + else: + self.virtio = True #--------------------------------------------------------------------------- # Class: Disk @@ -809,7 +862,7 @@ # </disk> # #--------------------------------------------------------------------------- - def get_xml_config(self): + def get_xml_config(self, virtio=False): opts = [] vals = self.driver.proto.split(':') # Driver protocol may have two parts, split it. @@ -894,7 +947,10 @@ # from the style of the device name. eg, a device named 'sda' will # typically be exported using a SCSI bus. # - opts.append("<target dev='%s'/>" % self.vdev) + if vminstall.caps.is_xen() or virtio is False: + opts.append("<target dev='%s'/>" % self.vdev) + else: + opts.append("<target dev='%s' bus='virtio'/>" % self.vdev) # # Readonly tag diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/ParaVirtGuest.py new/vm-install-0.4.21/src/vminstall/ParaVirtGuest.py --- old/vm-install-0.4.18/src/vminstall/ParaVirtGuest.py 2010-01-07 19:48:30.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/ParaVirtGuest.py 2010-02-25 00:30:59.000000000 +0100 @@ -23,6 +23,7 @@ import paths import util import vmdisks +import time def loopsetup(vdev): """Sets up the loop mapping for a disk image. @@ -223,7 +224,7 @@ finally: mounted_disk.unmount() else: - (_, kfn, ifn) = self._get_paravirt_images(vdev, partitions, copy=True, progress=progress) + (_, kfn, ifn) = self._get_paravirt_images(vdev, partitions, copy=True, progress=progress) finally: source.block_detach() else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/VMDefaults.py new/vm-install-0.4.21/src/vminstall/VMDefaults.py --- old/vm-install-0.4.18/src/vminstall/VMDefaults.py 2010-01-25 21:55:24.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/VMDefaults.py 2010-02-26 17:42:34.000000000 +0100 @@ -84,6 +84,9 @@ return False def usb(self): return False + def virtio(self): + # KVM only + return False class LinuxDefaults(GenericDefaults): def xterm_args(self): @@ -208,6 +211,8 @@ return [ self._disk_template(0, self._disk_size()) ] def supports_32nonpae(self): return False + def virtio(self): + return True class SLED10Defaults(SUSEDefaults): def name(self): @@ -230,6 +235,8 @@ return 16 def supports_32nonpae(self): return False + def virtio(self): + return True class SLES8Defaults(SUSEDefaults): def name(self): @@ -274,6 +281,8 @@ return True def supports_32nonpae(self): return False + def virtio(self): + return True class NetWareDefaults(GenericDefaults): def group(self): @@ -304,7 +313,7 @@ def name(self): return msg.oes2nw def virt_support(self): - return ('xen') + return ('xen') def min_memory(self): return 512 def default_memory(self): @@ -425,7 +434,7 @@ return 40 def disks(self): return [ self._disk_template(0, self._disk_size()) ] - def enlightened(): + def enlightened(self): return True def num_vcpus(self): return caps.vcpu_processors(4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/VMPXE.py new/vm-install-0.4.21/src/vminstall/VMPXE.py --- old/vm-install-0.4.18/src/vminstall/VMPXE.py 2010-01-07 19:48:30.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/VMPXE.py 2010-02-25 00:30:59.000000000 +0100 @@ -146,25 +146,25 @@ for mediaroot in self._getMediaRoots(base, urlopen): #one of mediaroot is '.' so it is fine either for single-media sources for a in arches: - kfn = '/%s/boot/%s/vmlinuz-xen' % (mediaroot, a[0]) - ifn = '/%s/boot/%s/initrd-xen' % (mediaroot, a[0]) - log.debug("Checking for %s..." % (base+kfn)) - try: - kfd = urlopen(base + kfn) - except: - continue - self.kfn = util.copy_to_temp(kfd, prefix='kernel.', progress=lambda f:progress(0.1+f*0.45)) - kfd.close() - die_zero(self.kfn) - try: - ifd = urlopen(base + ifn) - except: - continue - self.ifn = util.copy_to_temp(ifd, prefix='install-initrd.', progress=lambda f:progress(0.55+f*0.45)) - ifd.close() - die_zero(self.kfn) - log.debug("Unpacked kernel/initrd found: %s %s" % (kfn, ifn)) - return (self.kfn, self.ifn) + kfn = '/%s/boot/%s/vmlinuz-xen' % (mediaroot, a[0]) + ifn = '/%s/boot/%s/initrd-xen' % (mediaroot, a[0]) + log.debug("Checking for %s..." % (base+kfn)) + try: + kfd = urlopen(base + kfn) + except: + continue + self.kfn = util.copy_to_temp(kfd, prefix='kernel.', progress=lambda f:progress(0.1+f*0.45)) + kfd.close() + die_zero(self.kfn) + try: + ifd = urlopen(base + ifn) + except: + continue + self.ifn = util.copy_to_temp(ifd, prefix='install-initrd.', progress=lambda f:progress(0.55+f*0.45)) + ifd.close() + die_zero(self.kfn) + log.debug("Unpacked kernel/initrd found: %s %s" % (kfn, ifn)) + return (self.kfn, self.ifn) except grabber.URLGrabError, e: raise InstSrcError(urlgrabber=e.errno, details='%s\n%s' % (url, e.strerror)) @@ -237,7 +237,7 @@ #cmd="tftp 147.2.207.153 -c get "+ i #for test dlres[i]=commands.getstatusoutput(cmd) if not tftp_success (dlres[i]): - success=0 + success=0 if success == 1: self.kfn = vminstall.paths.imagedir+os.path.basename(kernel_list[options.pxe_label])+"."+str(os.getpid()) @@ -248,7 +248,7 @@ log.debug("Kernel provided by PXE is not xen-enabled.") os.unlink(self.kfn) os.unlink(self.ifn) - success=0; + success=0 if success == 1: log.debug("Using installation kernel/initrd provided by PXE: %s %s" % (self.kfn, self.ifn)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/VMRedHat.py new/vm-install-0.4.21/src/vminstall/VMRedHat.py --- old/vm-install-0.4.18/src/vminstall/VMRedHat.py 2010-01-07 19:48:30.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/VMRedHat.py 2010-02-25 00:30:59.000000000 +0100 @@ -17,6 +17,7 @@ import mount import msg import util +import os class VMRedHat(VMLinux): def _kernel(self, base): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/advanced.py new/vm-install-0.4.21/src/vminstall/advanced.py --- old/vm-install-0.4.18/src/vminstall/advanced.py 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/advanced.py 2010-02-26 17:42:34.000000000 +0100 @@ -52,6 +52,7 @@ 'apic': ['0', "Enable Advanced Programmable Interrupt Controller."], 'pae': ['1', "Enable Physical Address Extension."], 'usb': ['0', "Emulate Universal Serial Bus devices"], + 'virtio': ['0', "Enable Virtualization IO"], } # Parse command line data @@ -65,7 +66,7 @@ raise ParamError(err=ParamError.E_INVALID, details=p) if not value.isdigit() or int(value) != 0 and int(value) != 1: raise ParamError(err=ParamError.E_INVALID, details=p) - ok = set_advanced_state(opt, int(value), options) + (ok,state) = set_advanced_state(opt, int(value), options) if not ok: raise ParamError(err=ParamError.E_INVALID, details=p) @@ -164,6 +165,8 @@ current_state = defaults.vpt_align if (defaults.vpt_align is not None) else int(adv_args[arg][0]) elif arg == 'xen_platform_pci': current_state = defaults.xen_platform_pci if (defaults.xen_platform_pci is not None) else int(adv_args[arg][0]) + elif arg == 'virtio': + current_state = defaults.virtio if (defaults.virtio is not None) else int(adv_args[arg][0]) list.set_value(iter, 0, current_state) # Set a specific option based on the state @@ -172,10 +175,9 @@ options.acpi = state elif arg == 'apic': if vmdefaults: - options.apic = vmdefaults.apic() - else: - options.apic = state - if arg == 'blkif': + state = vmdefaults.apic() + options.apic = state + elif arg == 'blkif': options.blkif = state elif arg == 'extid': options.extid = state @@ -189,7 +191,7 @@ options.localtime = state elif arg == 'memory_sharing': options.memory_sharing = state - if arg == 'netif': + elif arg == 'netif': options.netif = state elif arg == 'monitor': options.monitor = state @@ -202,7 +204,7 @@ elif arg == 'pae': options.pae = state elif arg == 'pci_msitranslate': - options.pci_msitranslate = state + options.pci_msitranslate = state elif arg == 'pci_power_mgmt': options.pci_power_mgmt = state elif arg == 'sdl': @@ -213,7 +215,7 @@ options.suppress_spurious_page_faults = state elif arg == 'timer_mode': options.timer_mode = state - if arg == 'tpmif': + elif arg == 'tpmif': options.tpmif = state elif arg == 'usb': options.usb = state @@ -222,12 +224,16 @@ elif arg == 'vnc': options.vnc = state elif arg == 'vpt_align': - options.vpt_align = state + options.vpt_align = state elif arg == 'xen_platform_pci': options.xen_platform_pci = state + elif arg == 'virtio': + if vmdefaults: + state = vmdefaults.virtio() + options.virtio = state else: - return False - return True + return (False, state) + return (True, state) # Set the state of an option based on what was checked in the list def set_advanced_arg(list, item_offset, state, options): @@ -241,8 +247,10 @@ items.sort() i = 0 for arg in items: + if arg[0] == 'usb': + continue state = int(arg[1][0]) - set_advanced_state(arg[0], state, options, vmdefaults) + (ok, state) = set_advanced_state(arg[0], state, options, vmdefaults) iter = list.get_iter(i,) i = i + 1 list.set_value(iter, 0, state) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/caps.py new/vm-install-0.4.21/src/vminstall/caps.py --- old/vm-install-0.4.18/src/vminstall/caps.py 2010-01-07 19:48:30.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/caps.py 2010-02-25 00:30:59.000000000 +0100 @@ -41,7 +41,7 @@ return num_processors def vcpu_processors(max_vcpus): - cpus = cpu_processors(); + cpus = cpu_processors() if ( cpus > max_vcpus ): cpus = max_vcpus return cpus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/graphics_adapter.py new/vm-install-0.4.21/src/vminstall/graphics_adapter.py --- old/vm-install-0.4.18/src/vminstall/graphics_adapter.py 2010-01-07 19:48:30.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/graphics_adapter.py 2010-02-25 00:30:59.000000000 +0100 @@ -108,8 +108,8 @@ # Initializes the class. #--------------------------------------------------------------------------- def __init__(self): - _FullyVirtualGraphicsAdapterList = ['cirrus','vesa'] - _ParaVirtualGraphicsAdapterList = ['para'] + self._FullyVirtualGraphicsAdapterList = ['cirrus', 'vesa'] + self._ParaVirtualGraphicsAdapterList = ['para'] # # Aways call the parent __init__ function after we @@ -155,7 +155,7 @@ # Initializes the class. #--------------------------------------------------------------------------- def __init__(self): - _FullyVirtualGraphicsAdapterList = ['cirrus','std','vmware'] + self._FullyVirtualGraphicsAdapterList = ['cirrus', 'std', 'vmware'] # # Aways call the parent __init__ function after we diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/gtk/disk_widgets.py new/vm-install-0.4.21/src/vminstall/gtk/disk_widgets.py --- old/vm-install-0.4.18/src/vminstall/gtk/disk_widgets.py 2010-01-07 19:48:29.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/gtk/disk_widgets.py 2010-02-26 17:42:34.000000000 +0100 @@ -18,6 +18,7 @@ from tree_view import * from chooser import * from vmdisks.disks import disk_protocols, kvm_disk_protocols +from vmdisks.disks import protocol_file_extensions, file_extension_protocols class DisksView(PyTreeView): def __init__(self, disks, renumber=True): @@ -70,7 +71,7 @@ self.disks_widget = self.glade.get_widget('disks') self.disks_widget.get_parent().remove(self.disks_widget) self.topwin.destroy() - + # Right now, set renumber based on allow_reorder; maybe later expose # a separate setting self.renumber = allow_reorder @@ -195,7 +196,7 @@ class DiskEditWidget: - def __init__(self): + def __init__(self, virtio=False): self.disk = None self.glade = gtk.glade.XML(vminstall.paths.gladedir + 'vm-install.glade', 'disk-edit-window') self.topwin = self.glade.get_widget('disk-edit-window') @@ -233,6 +234,9 @@ def set_radio_text(name, text=None, modifier=None, markup=False): widget = self.glade.get_widget(name).get_children()[0] vminstall.msg.set_text(name, widget, text, modifier, markup) + set_radio_text('disk-virtio', text=vminstall.msg.enable_virtio) + if vminstall.caps.is_xen() or virtio is False: + self.glade.get_widget('disk-virtio').hide_all() set_radio_text('disk-ro', text=vminstall.msg.read_only) set_radio_text('disk-sparse', text=vminstall.msg.create_sparse) set_text('disk_help') @@ -249,6 +253,7 @@ 'on_disk_gb_editing_done': self.disk_gb_editing_done, 'on_disk_sparse_toggled': self.disk_sparse_toggled, 'on_disk_ro_toggled': self.disk_ro_toggled, + 'on_disk_virtio_toggled': self.disk_virtio_toggled, 'on_disk_browse_clicked': self.browse_existing_disk, 'on_disk_new_clicked': self.browse_new_disk, }) @@ -299,6 +304,7 @@ self.disk_gb_editing_done() self.disk_sparse_toggled() self.disk_ro_toggled() + self.disk_virtio_toggled() self.disk.validate() return self.disk @@ -320,6 +326,22 @@ if update: self.refresh(canonicalize=False) + def update_file_extension(self, disk_image, new_proto): + new_proto = new_proto.rsplit(":", 1)[0] + ext = disk_image.rsplit(".", 1) + # Is there an extension on the image name? + if len(ext) > 1: + path = ext[0] + ext = ext[1] + # Check to see if the extension is one we recognize + if ext in file_extension_protocols: + p = file_extension_protocols[ext] + # Check to see if the extension matches the protocol + if new_proto not in p: + if new_proto in protocol_file_extensions: + disk_image = path + "." + protocol_file_extensions[new_proto] + return disk_image + def disk_protocol_changed(self, widget=None, update=True): if not widget: widget = self.glade.get_widget('disk-protocol') @@ -338,6 +360,7 @@ else: prottext += ":" text = disktext.replace(text, prottext, 1) + text = self.update_file_extension(text, prottext) self.disk.pdev = text self.refresh() except: @@ -366,6 +389,11 @@ widget = self.glade.get_widget('disk-ro') self.disk.ro = widget.get_active() + def disk_virtio_toggled(self, widget=None): + if not widget: + widget = self.glade.get_widget('disk-virtio') + self.disk.virtio = widget.get_active() + def refresh(self, canonicalize=True): button = self.glade.get_widget('disk-new-button') if (self.disk.vdevtype == vmdisks.Disk.DEVICE_DISK): @@ -408,6 +436,9 @@ widget = self.glade.get_widget('disk-ro') widget.set_active(self.disk.ro) widget.set_sensitive(self.disk._vdevType != vmdisks.Disk.DEVICE_CDROM) + widget = self.glade.get_widget('disk-virtio') + widget.set_active(self.disk.virtio) + widget.set_sensitive(self.disk._vdevType != vmdisks.Disk.DEVICE_CDROM) widget = self.glade.get_widget('disk-sparse') widget.set_active(not self.disk.args.has_key('sparse') or self.disk.args['sparse']) widget.set_sensitive(not exists and self.disk._vdevType != vmdisks.Disk.DEVICE_CDROM) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/gtk/interface.py new/vm-install-0.4.21/src/vminstall/gtk/interface.py --- old/vm-install-0.4.18/src/vminstall/gtk/interface.py 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/gtk/interface.py 2010-02-26 17:42:34.000000000 +0100 @@ -147,7 +147,7 @@ edit_fn=self.do_edit_disk, add_cdrom_fn=self.do_new_cdrom, add_harddisk_fn=self.do_new_harddisk) self.window.get_widget('disks-vbox').pack_end(self.disks_widget.get_widget()) - self.disk_edit_widget = DiskEditWidget() + self.disk_edit_widget = DiskEditWidget(VMDefaults[defaults.os_type].virtio()) self.window.get_widget('disk-edit-vbox').pack_end(self.disk_edit_widget.get_widget()) # Connect the button event with the method that handles the event. @@ -305,7 +305,7 @@ set_radio_text('os_install_yes') if caps.is_kvm() or caps.is_qemu(): self.window.get_widget('os_install_upgrade').hide_all() - self.window.get_widget('advanced-settings-button').hide_all() + #self.window.get_widget('advanced-settings-button').hide_all() else: set_radio_text('os_install_upgrade') set_radio_text('pv-src-disk', text=vminstall.msg.virtual_disk, modifier=prompt) @@ -440,7 +440,7 @@ def is_visible(self): if self.topwin.flags() & gtk.VISIBLE: - return True + return True return False def _set_summary_title(self, widget, text): @@ -500,6 +500,8 @@ disk.update(vmname=self.defaults.name) self.disk_edit_widget.set(disk) self.notebook.set_current_page(self.pages['disk']) + if not vminstall.caps.is_xen() and self.defaults.virtio is True: + self.disk_edit_widget.glade.get_widget('disk-virtio').show_all() return True def do_remove_disk(self, disk): @@ -513,6 +515,11 @@ return False self.current_disk_index = index self.disk_edit_widget.set(disk.copy()) + if vminstall.caps.is_xen() or self.defaults.virtio is False: + self.disk_edit_widget.glade.get_widget('disk-virtio').hide_all() + else: + self.disk_edit_widget.glade.get_widget('disk-virtio').show_all() + log.debug("Editing disk '%s'" % str(disk)) self.notebook.set_current_page(self.pages['disk']) return True @@ -1860,7 +1867,7 @@ self.options.smboptions = "user=%s,passwd=%s" % (smbuser,smbpasswd) self.defaults.smboptions = self.options.smboptions dialog.destroy() - log.debug("u:%s, p:%s", smbuser, smbpasswd); + log.debug("u:%s, p:%s", smbuser, smbpasswd) def run(job, options, defaults): gtk.gdk.threads_init() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/job.py new/vm-install-0.4.21/src/vminstall/job.py --- old/vm-install-0.4.18/src/vminstall/job.py 2010-01-07 19:48:30.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/job.py 2010-02-25 00:30:59.000000000 +0100 @@ -24,6 +24,8 @@ import paths import util import hypervisor +import xen_hypervisor +import libvirt_hypervisor import console class Job(object): @@ -430,8 +432,8 @@ _line = line[0:index] new = " (kernel " + self.guest.kernel + ")\n" if not ramdisk_found: - new = new + " (ramdisk " + self.guest.initrd + ")\n" - ramdisk_found = 1 + new = new + " (ramdisk " + self.guest.initrd + ")\n" + ramdisk_found = 1 _line = _line + new end = len(line) (index,found) = find_closing_brace(line, index, end) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/keytable.py new/vm-install-0.4.21/src/vminstall/keytable.py --- old/vm-install-0.4.18/src/vminstall/keytable.py 2010-01-07 19:48:30.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/keytable.py 2010-02-25 00:30:59.000000000 +0100 @@ -18,6 +18,7 @@ import caps import os import re +from log import log # keytable_name_from_dom0:keymap_name_to_Xen keytable = { @@ -75,7 +76,7 @@ try: f = open(KEYBOARD_DIR, "r") except IOError, e: - logging.debug('Could not open "/etc/sysconfig/keyboard" ' + str(e)) + log.debug('Could not open "/etc/sysconfig/keyboard" ' + str(e)) else: while 1: s = f.readline() @@ -83,13 +84,13 @@ break s = re.sub("\s+", "", s) if re.search('^KEYTABLE=\".*\"$', s) != None: - kt = s.split('"')[1] - if ".map.gz" in kt: - kt = kt.rstrip(".map.gz") - if keytable.has_key(kt): - keymap = keytable[kt] + kt = s.split('"')[1] + if ".map.gz" in kt: + kt = kt.rstrip(".map.gz") + if keytable.has_key(kt): + keymap = keytable[kt] f.close - return keymap; + return keymap def read_keymaps(): if caps.is_xen(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/kvm_guest.py new/vm-install-0.4.21/src/vminstall/kvm_guest.py --- old/vm-install-0.4.18/src/vminstall/kvm_guest.py 2010-01-21 19:05:56.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/kvm_guest.py 2010-02-26 17:42:34.000000000 +0100 @@ -69,7 +69,8 @@ """Get the disk config in the libvirt XML format""" ret = [] for disk in self.options.disks + self.tmpdisks: - ret.extend(disk.get_xml_config()) + use_virtio = self.options.virtio and disk.virtio + ret.extend(disk.get_xml_config(use_virtio)) return ret def _get_network_xml(self): @@ -97,7 +98,7 @@ ret = [] keymap = keytable.get_keymap(self.options.keymap) if keymap != None: - ret = ['<keymap>%s</keymap>' % keymap] + ret = ['<keymap>%s</keymap>' % keymap] return ret def _get_input_xml(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/libvirt_hypervisor.py new/vm-install-0.4.21/src/vminstall/libvirt_hypervisor.py --- old/vm-install-0.4.18/src/vminstall/libvirt_hypervisor.py 2010-01-25 21:55:24.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/libvirt_hypervisor.py 2010-02-25 00:30:59.000000000 +0100 @@ -14,17 +14,24 @@ ################################################################################ from hypervisor import Hypervisor +from exceptions import ParamError from log import log import libvirt import caps +import time #--------------------------------------------------------------------------- # Method: libvirt_error_handler # Global handler to suppress the noise from libvirt #--------------------------------------------------------------------------- def libvirt_error_handler(ctx, err): - log.debug('Error: Libvirt - %s' % err) + if err is not None: + log.debug('Error: Libvirt - %s' % err) +def parse_string(uri): + if uri.startswith("xen") or uri.startswith("qemu") or uri.startswith("test"): + return LibVirtHypervisor(uri) + raise ParamError(err=ParamError.E_INVALID, details=uri) ################################################################################ # Class: LibVirtHypervisor @@ -58,12 +65,13 @@ # Method: delete #--------------------------------------------------------------------------- def delete(self, domid): - """Destroys a running instance; erases from xend""" + """Destroys a running instance; erases from libvirt""" try: if self.virDom is None: self.virDom = self.lookup(domid) domInfo = self.virDom.info() self.virDom.destroy() + self.virDom.undefine() except: pass @@ -83,7 +91,7 @@ # Method: destroy #--------------------------------------------------------------------------- def destroy(self, domid): - """Destroys a running instance; does not erase from xend""" + """Destroys a running instance; does not erase from libvirt""" try: if self.virDom is None: self.virDom = self.lookup(domid) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/msg.py new/vm-install-0.4.21/src/vminstall/msg.py --- old/vm-install-0.4.18/src/vminstall/msg.py 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/msg.py 2010-02-26 17:42:34.000000000 +0100 @@ -220,7 +220,7 @@ cli_exit_help = _("Press \'q\' or the Escape key to exit.") advanced_help = _("Warning: Vm-install automatically manages these configuration settings depending on the operating system to be installed. It is expected that you understand clearly the consequences of enabling or disabling a particular setting.") advanced_reset = _("Reset to Defaults") -maximum_memory_warning = _("Setting the Maximum Memory value greater than the Initial Memory value requires the VM operating system to have a memory balloon driver.") +maximum_memory_warning = _("Setting the maximum memory greater than the initial memory requires the VM operating system to have a memory balloon driver.") # Processors hardware_help = _("Specify the amount of memory and number of processors to allocate for the VM.") @@ -244,6 +244,7 @@ size_gb = _("Size (GB)") create_sparse = _("Create Sparse Image File") read_only = _("Read-Only Access") +enable_virtio = _("Enable Virtualization IO") type_hard_disk = _("Hard Disk") type_cdrom = _("CD-ROM or DVD") type_floppy = _("Floppy Disk") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/options.py new/vm-install-0.4.21/src/vminstall/options.py --- old/vm-install-0.4.18/src/vminstall/options.py 2010-02-06 00:32:09.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/options.py 2010-02-25 00:30:59.000000000 +0100 @@ -257,14 +257,11 @@ if not os.path.exists(value): bad() elif item == 'connect': - if not caps.is_xen(): - import libvirt_hypervisor - if not isinstance(value, libvirt_hypervisor.LibVirtHypervisor): - bad() - else: - import xen_hypervisor - if not isinstance(value, xen_hypervisor.Xend): - bad() + import libvirt_hypervisor + import xen_hypervisor + if not isinstance(value, libvirt_hypervisor.LibVirtHypervisor) and \ + not isinstance(value, xen_hypervisor.Xend): + bad() elif item == 'acpi' or item == 'extid' or item == 'blkif' or \ item == 'hap' or item == 'hpet' or item == 'isa' or \ item == 'localtime' or item == 'memory_sharing' or \ @@ -274,7 +271,7 @@ item == 'sdl' or item == 'superpages' or \ item == 'suppress_spurious_page_faults' or item == 'timer_mode' or \ item == 'tpmif' or item == 'viridian' or item == 'vnc' or \ - item == 'vpt_align' or item == 'xen_platform_pci': + item == 'vpt_align' or item == 'xen_platform_pci' or item == 'virtio': check_type(value, (int, bool)) value = bool(value) self.__dict__[item] = value @@ -363,20 +360,18 @@ log.debug("start recalculation") # connect needs to be first - - if options.connect: + if options.connect or not caps.is_xen(): + # NOTE: This is the path for KVM or xen using libvirt instead of the xend APIs + if not options.connect: + import libvirt_hypervisor + options.connect = libvirt_hypervisor.LibVirtHypervisor("qemu:///system") + options.use_libvirt = True defaults.connect = options.connect options.use_libvirt = True else: - if not caps.is_xen(): - # NOTE: the KVM path is coming through here! Yea! - import libvirt_hypervisor - defaults.connect = libvirt_hypervisor.LibVirtHypervisor("qemu:///system") - options.use_libvirt = True - else: - import xen_hypervisor - defaults.connect = xen_hypervisor.Xend(None) - options.use_libvirt = False + import xen_hypervisor + defaults.connect = xen_hypervisor.Xend(None) + options.use_libvirt = False hypervisor.connection = defaults.connect old_os_type = defaults.os_type @@ -404,13 +399,13 @@ options.install = OS_INSTALL_NO if options.install is None: - if options.upgrade: - defaults.install = OS_INSTALL_UPGRADE - else: - defaults.install = OS_INSTALL_YES - options.install = defaults.install + if options.upgrade: + defaults.install = OS_INSTALL_UPGRADE + else: + defaults.install = OS_INSTALL_YES + options.install = defaults.install else: - defaults.install = options.install + defaults.install = options.install if options.upgrade_managed_vm: defaults.upgrade_managed_vm = options.upgrade_managed_vm @@ -434,8 +429,9 @@ defaults.upgrade_managed_vm = True if options.name: - defaults.name = options.name - else: + if defaults.name != options.name: + defaults.name = options.name + elif defaults.name is None or old_os_type != defaults.os_type: i = 0 while True: name = defaults.os_type @@ -584,9 +580,9 @@ disks[i].pdev == disks[j].pdev): raise DiskResourceError(err=DiskResourceError.E_CONFLICT, details='%s\n%s' % (disks[i], disks[j])) - defaults.disks.sort(lambda d1,d2: cmp(d1.vdev, d2.vdev)) - if not defaults.disks[0].args.has_key('sparse'): - defaults.disks[0].args['sparse'] = True + defaults.disks.sort(lambda d1,d2: cmp(d1.vdev, d2.vdev)) + if not defaults.disks[0].args.has_key('sparse'): + defaults.disks[0].args['sparse'] = True if options.nics is not None: defaults.nics = options.nics @@ -679,7 +675,7 @@ defaults._runtime_args = vmdefaults.actions().getRuntimeArgs(defaults) if options._runtime_args: defaults._runtime_args += ' %s' % options._runtime_args - + if options.config_dir: defaults.config_dir = options.config_dir else: @@ -689,7 +685,7 @@ defaults.smboptions = options.smboptions # Advanced options shared - if options.apic: + if options.apic is not None: defaults.apic = options.apic else: defaults.apic = vmdefaults.apic() @@ -705,7 +701,7 @@ defaults.extid = options.extid defaults.hap = options.hap defaults.hpet = options.hpet - if options.hpet: + if options.hpet is not None: defaults.hpet = options.hpet else: defaults.hpet = vmdefaults.hpet() @@ -728,6 +724,11 @@ defaults.vnc = options.vnc defaults.vpt_align = options.vpt_align defaults.xen_platform_pci = options.xen_platform_pci + else: + if options.virtio is not None: + defaults.virtio = options.virtio + else: + defaults.virtio = vmdefaults.virtio() # Now give the OS a chance to voice its opinion: vmdefaults.actions().preprocessOptions(defaults) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/text/interface.py new/vm-install-0.4.21/src/vminstall/text/interface.py --- old/vm-install-0.4.18/src/vminstall/text/interface.py 2010-01-25 21:55:23.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/text/interface.py 2010-02-09 00:03:33.000000000 +0100 @@ -276,6 +276,8 @@ if not options.max_memoryMB: get_num(vminstall.msg.max_memory_prompt, options.memoryMB, max_memory, options.memoryMB, 'max_memoryMB') + if options.max_memoryMB > options.memoryMB: + output_wrap(vminstall.msg.warning + ': ' + vminstall.msg.maximum_memory_warning + '\n') if not options.vcpus: get_num(vminstall.msg.vcpus_prompt, 1, vmdefaults.max_cpus(), defaults.vcpus, 'vcpus') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/xen_guest.py new/vm-install-0.4.21/src/vminstall/xen_guest.py --- old/vm-install-0.4.18/src/vminstall/xen_guest.py 2010-01-07 19:48:30.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/xen_guest.py 2010-02-25 00:30:59.000000000 +0100 @@ -223,14 +223,14 @@ ret = [] keymap = keytable.get_keymap(self.options.keymap) if keymap != None: - ret = ['<keymap>%s</keymap>' % keymap] + ret = ['<keymap>%s</keymap>' % keymap] return ret def _get_keymap_xen(self): ret = '' keymap = keytable.get_keymap(self.options.keymap) if keymap != None: - ret = "keymap=\"%s\"\n" %(keymap) + ret = "keymap=\"%s\"\n" %(keymap) return ret def _get_graphics_xml(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vm-install-0.4.18/src/vminstall/xen_hypervisor.py new/vm-install-0.4.21/src/vminstall/xen_hypervisor.py --- old/vm-install-0.4.18/src/vminstall/xen_hypervisor.py 2010-01-07 19:48:30.000000000 +0100 +++ new/vm-install-0.4.21/src/vminstall/xen_hypervisor.py 2010-02-25 00:30:59.000000000 +0100 @@ -16,15 +16,22 @@ ################################################################################ import time -from xen.xend import XendOptions +try: + from xen.xend import XendOptions +except: + pass from hypervisor import Hypervisor +from exceptions import ParamError try: # Xen 3.1+ from xen.util.xmlrpcclient import ServerProxy except: - # Xen 3.0.4 and older - from xen.util.xmlrpclib2 import ServerProxy + try: + # Xen 3.0.4 and older + from xen.util.xmlrpclib2 import ServerProxy + except: + pass def parse_string(uri): if not uri.startswith("xen") and not uri.startswith("qemu"): @@ -54,6 +61,7 @@ self.uri = 'httpu://%s' % Xend.XML_RPC_SOCKET self.server = ServerProxy(self.uri) self.use_libvirt = False + self.virDom = None #--------------------------------------------------------------------------- @@ -62,10 +70,7 @@ def delete(self, domid): """Destroys a running instance; erases from xend""" try: - if self.virDom is None: - self.virDom = self.lookup(domid) - domInfo = self.virDom.info() - self.virDom.destroy() + self.server.xend.domain.delete(domid) except: pass @@ -127,20 +132,15 @@ domain = self.domain(domid) if not domain: return False - if self.use_libvirt is False: - wait = False - for d in domain: - if type(d) == list and len(d) > 1 and d[0] == 'state': - if len(d[1]) > 1 and not 'p' in d[1]: - return True - time.sleep(1.0) - wait = True - break - if not wait: + wait = False + for d in domain: + if type(d) == list and len(d) > 1 and d[0] == 'state': + if len(d[1]) > 1 and not 'p' in d[1]: + return True + time.sleep(1.0) + wait = True break - else: - domInfo = domain.info() - if domInfo[0] == 0 or domInfo[0] == 1: - return True + if not wait: + break return False ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit virtualbox-ose for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package virtualbox-ose for openSUSE:Factory checked in at Mon Mar 1 01:50:26 CET 2010. -------- --- virtualbox-ose/virtualbox-ose.changes 2010-02-15 16:53:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.changes 2010-02-26 10:58:43.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Feb 26 08:36:48 UTC 2010 - mseben(a)novell.com + +- fix gcc build issues - use gcc4.3 for build (currently virtualbox + doesn't support gcc4.5 +- added ret-in-nonvoid-fnc.diff to fix post build checks + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- vbox-ret-in-nonvoid-fnc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox-ose.spec ++++++ --- /var/tmp/diff_new_pack.6smTCQ/_old 2010-03-01 01:50:17.000000000 +0100 +++ /var/tmp/diff_new_pack.6smTCQ/_new 2010-03-01 01:50:17.000000000 +0100 @@ -37,24 +37,20 @@ BuildRequires: SDL-devel kernel-syms module-init-tools BuildRequires: e2fsprogs-devel libcap-devel libcurl-devel python-devel update-desktop-files BuildRequires: hal-devel pulseaudio-devel xorg-x11-devel -BuildRequires: kbuild udev +BuildRequires: gcc43-c++ kbuild udev # is needed only as owner of xorg/modules directory BuildRequires: xorg-x11-server-sdk %ifarch amd64 x86_64 ia32e em64t -BuildRequires: gcc-32bit hal-32bit BuildRequires: xorg-x11-libX11-devel-32bit xorg-x11-libXt-devel-32bit xorg-x11-libs-32bit -BuildRequires: libgcc-32bit xorg-x11-libXext-devel-32bit xorg-x11-libXmu-devel-32bit -%if %suse_version > 1110 -BuildRequires: libstdc++44-devel-32bit -%else +BuildRequires: hal-32bit xorg-x11-libXext-devel-32bit xorg-x11-libXmu-devel-32bit BuildRequires: libstdc++43-devel-32bit -%endif +BuildRequires: gcc43-32bit libgcc-32bit # ifarch %endif # ExclusiveArch: %ix86 x86_64 Version: 3.1.4 -Release: 1 +Release: 2 Summary: VirtualBox OSE is an Emulator License: GPLv2+ Group: System/Emulators/PC @@ -85,6 +81,8 @@ #PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is.displayed, when user #try to start VirtualBox and is not memeber of vboxusers group Patch19: virtualbox-ose-permissions_warning.diff +#fix post build checks, could be dropped when we switch to newer gcc +Patch20: vbox-ret-in-nonvoid-fnc.diff # BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils permissions @@ -174,6 +172,7 @@ %patch18 %endif %patch19 -p1 +%patch20 -p1 %__cp %{SOURCE7} . %build @@ -188,6 +187,8 @@ # %__sed 's/#define CONFIG_XEN 1//g' > linux/autoconf.h %__sed -i 's|@vboxinstdir@|%{_vbox_instdir}|' LocalConfig.kmk ./configure \ + --with-g++=/usr/bin/g++-4.3 \ + --with-gcc=/usr/bin/gcc-4.3 \ --with-linux=/usr/src/linux-obj/%{_target_cpu}/default \ $EXTRA_OPTS /usr/bin/kmk \ ++++++ vbox-ret-in-nonvoid-fnc.diff ++++++ Index: VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/nic.c =================================================================== --- VirtualBox-3.1.4_OSE.orig/src/VBox/Devices/PC/Etherboot-src/core/nic.c +++ VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/nic.c @@ -478,6 +478,7 @@ int eth_load(struct dev *dev __unused) } interruptible_sleep(2); /* lay off the server for a while */ longjmp(restart_etherboot, -1); + return 0; } Index: VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/osloader.c =================================================================== --- VirtualBox-3.1.4_OSE.orig/src/VBox/Devices/PC/Etherboot-src/core/osloader.c +++ VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/osloader.c @@ -81,6 +81,7 @@ dead_download - Restart etherboot if pro **************************************************************************/ static sector_t dead_download ( unsigned char *data __unused, unsigned int len __unused, int eof __unused) { longjmp(restart_etherboot, -2); + return 0; } #ifdef IMAGE_MULTIBOOT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit virt-viewer for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package virt-viewer for openSUSE:Factory checked in at Mon Mar 1 01:50:17 CET 2010. -------- --- virt-viewer/virt-viewer.changes 2009-08-04 16:37:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/virt-viewer/virt-viewer.changes 2010-02-27 00:42:57.000000000 +0100 @@ -1,0 +2,21 @@ +Thu Feb 11 11:55:51 MST 2010 - carnold(a)novell.com + +- bnc#574591 - There is no prompt if I view a inexist guest OS + using virt-viewer + report-error.patch + +------------------------------------------------------------------- +Fri Dec 4 06:53:43 MST 2009 - carnold(a)novell.com + +- Fixed the 'Send Key' menu with all the missing keys for netware and + windows. + glade-keycombo.patch + +------------------------------------------------------------------- +Mon Nov 9 15:24:20 MST 2009 - carnold(a)novell.com + +- bnc#553633 - Update breaks menu access keys in virt-viewer and + still misses some key sequences. + This is a SLE10 bug fixed for SLE11. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- glade-keycombo.patch keymap.diff report-error.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-viewer.spec ++++++ --- /var/tmp/diff_new_pack.vX2XKm/_old 2010-03-01 01:50:11.000000000 +0100 +++ /var/tmp/diff_new_pack.vX2XKm/_new 2010-03-01 01:50:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package virt-viewer (Version 0.2.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,10 +19,10 @@ Name: virt-viewer Version: 0.2.0 -Release: 1 +Release: 2 Summary: Virtual Machine Viewer Group: System/Monitoring -License: GPL v2 or later +License: GPLv2+ Url: http://www.virt-manager.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: virt-viewer-0.2.0.tar.gz @@ -30,11 +30,15 @@ Patch1: vnc-listen.patch Patch2: windows-keycombo.patch Patch3: netware-keycombo.patch +Patch4: glade-keycombo.patch +Patch5: keymap.diff +Patch6: report-error.patch BuildRequires: gtk2-devel BuildRequires: libvirt-devel BuildRequires: libxml2-devel BuildRequires: gtk-vnc-devel >= 0.1.0 BuildRequires: libglade2-devel +BuildRequires: libpixman #our build requirements BuildRequires: xen-devel Requires: netcat @@ -57,6 +61,9 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +#%patch5 -p1 +%patch6 -p1 %build # Note: remote GTKVNC_CFLAGS and GTKVNC_LIBS when gtk-vnc.pc is fixed in STABLE ++++++ glade-keycombo.patch ++++++ Index: virt-viewer-0.2.0/src/viewer.glade =================================================================== --- virt-viewer-0.2.0.orig/src/viewer.glade +++ virt-viewer-0.2.0/src/viewer.glade @@ -98,11 +98,88 @@ </widget> </child> <child> + <widget class="GtkMenuItem" id="menu-send-css"> + <property name="visible">True</property> + <property name="label" translatable="yes">Ctrl+Scroll+Scr_oll</property> + <property name="use_underline">True</property> + <signal name="activate" handler="viewer_menu_send" object="css"/> + </widget> + </child> + <child> <widget class="GtkSeparatorMenuItem" id="separatormenuitem2"> <property name="visible">True</property> </widget> </child> <child> + <widget class="GtkMenuItem" id="menu-send-f8"> + <property name="visible">True</property> + <property name="label" translatable="yes">_F8</property> + <property name="use_underline">True</property> + <signal name="activate" handler="viewer_menu_send" object="f8"/> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="menu-send-f10"> + <property name="visible">True</property> + <property name="label" translatable="yes">F1_0</property> + <property name="use_underline">True</property> + <signal name="activate" handler="viewer_menu_send" object="f10"/> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="menu-send-af10"> + <property name="visible">True</property> + <property name="label" translatable="yes">A_lt+F10</property> + <property name="use_underline">True</property> + <signal name="activate" handler="viewer_menu_send" object="af10"/> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="menu-send-atab"> + <property name="visible">True</property> + <property name="label" translatable="yes">Alt+_Tab</property> + <property name="use_underline">True</property> + <signal name="activate" handler="viewer_menu_send" object="atab"/> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="menu-send-aesc"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Alt+Esc</property> + <property name="use_underline">True</property> + <signal name="activate" handler="viewer_menu_send" object="aesc"/> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="menu-send-cesc"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Ctrl+Esc</property> + <property name="use_underline">True</property> + <signal name="activate" handler="viewer_menu_send" object="cesc"/> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="menu-send-caesc"> + <property name="visible">True</property> + <property name="label" translatable="yes">Ctrl+Alt+_Esc</property> + <property name="use_underline">True</property> + <signal name="activate" handler="viewer_menu_send" object="caesc"/> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="menu-send-assesc"> + <property name="visible">True</property> + <property name="label" translatable="yes">Alt+Shift+Sh_ift+Esc</property> + <property name="use_underline">True</property> + <signal name="activate" handler="viewer_menu_send" object="assesc"/> + </widget> + </child> + <child> + <widget class="GtkSeparatorMenuItem" id="separatormenuitem3"> + <property name="visible">True</property> + </widget> + </child> + <child> <widget class="GtkMenuItem" id="menu-send-caf1"> <property name="visible">True</property> <property name="label" translatable="yes">Ctrl+Alt+F_1</property> @@ -199,7 +276,7 @@ </widget> </child> <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem3"> + <widget class="GtkSeparatorMenuItem" id="separatormenuitem4"> <property name="visible">True</property> </widget> </child> ++++++ keymap.diff ++++++ ++++ 868 lines (skipped) ++++++ netware-keycombo.patch ++++++ --- /var/tmp/diff_new_pack.vX2XKm/_old 2010-03-01 01:50:11.000000000 +0100 +++ /var/tmp/diff_new_pack.vX2XKm/_new 2010-03-01 01:50:11.000000000 +0100 @@ -11,15 +11,36 @@ struct keyComboDef { guint keys[MAX_KEY_COMBO]; guint nkeys; -@@ -80,6 +80,11 @@ static const struct keyComboDef keyCombo +@@ -78,7 +78,16 @@ struct keyComboDef { + static const struct keyComboDef keyCombos[] = { + { { GDK_Control_L, GDK_Alt_L, GDK_Delete }, 3, "Ctrl+Alt+_Del"}, { { GDK_Control_L, GDK_Alt_L, GDK_BackSpace }, 3, "Ctrl+Alt+_Backspace"}, - { { GDK_Control_R, GDK_Scroll_Lock, GDK_Scroll_Lock }, 3, "Ctrl+Scroll+Scroll"}, - { {}, 0, "" }, -+ { { GDK_F8 }, 1, "F_8"}, -+ { { GDK_F10 }, 1, "F_10"}, -+ { { GDK_Alt_L, GDK_F10 }, 2, "Alt+F_10"}, -+ { { GDK_Alt_R, GDK_Shift_R, GDK_Shift_L, GDK_Escape }, 4, "Alt+Shift+Shift+Esc"}, +- { { GDK_Control_R, GDK_Scroll_Lock, GDK_Scroll_Lock }, 3, "Ctrl+Scroll+Scroll"}, ++ { { GDK_Control_R, GDK_Scroll_Lock, GDK_Scroll_Lock }, 3, "Ctrl+Scroll+Scr_oll"}, + { {}, 0, "" }, ++ { { GDK_F8 }, 1, "_F8"}, ++ { { GDK_F10 }, 1, "F1_0"}, ++ { { GDK_Alt_L, GDK_F10 }, 2, "A_lt+F10"}, ++ { { GDK_Alt_L, GDK_Tab }, 2, "Alt+_Tab"}, ++ { { GDK_Alt_L, GDK_Escape }, 2, "_Alt+Esc"}, ++ { { GDK_Control_L, GDK_Escape }, 2, "_Ctrl+Esc"}, ++ { { GDK_Control_L, GDK_Alt_L, GDK_Escape }, 3, "Ctrl+Alt+_Esc"}, ++ { { GDK_Alt_R, GDK_Shift_R, GDK_Shift_L, GDK_Escape }, 4, "Alt+Shift+Sh_ift+Esc"}, + { {}, 0, "" }, { { GDK_Control_L, GDK_Alt_L, GDK_F1 }, 3, "Ctrl+Alt+F_1"}, { { GDK_Control_L, GDK_Alt_L, GDK_F2 }, 3, "Ctrl+Alt+F_2"}, - { { GDK_Control_L, GDK_Alt_L, GDK_F3 }, 3, "Ctrl+Alt+F_3"}, +@@ -88,10 +97,10 @@ static const struct keyComboDef keyCombo + { { GDK_Control_L, GDK_Alt_L, GDK_F6 }, 3, "Ctrl+Alt+F_6"}, + { { GDK_Control_L, GDK_Alt_L, GDK_F7 }, 3, "Ctrl+Alt+F_7"}, + { { GDK_Control_L, GDK_Alt_L, GDK_F8 }, 3, "Ctrl+Alt+F_8"}, +- { { GDK_Control_L, GDK_Alt_L, GDK_F5 }, 3, "Ctrl+Alt+F_9"}, +- { { GDK_Control_L, GDK_Alt_L, GDK_F6 }, 3, "Ctrl+Alt+F1_0"}, +- { { GDK_Control_L, GDK_Alt_L, GDK_F7 }, 3, "Ctrl+Alt+F11"}, +- { { GDK_Control_L, GDK_Alt_L, GDK_F8 }, 3, "Ctrl+Alt+F12"}, ++ { { GDK_Control_L, GDK_Alt_L, GDK_F9 }, 3, "Ctrl+Alt+F_9"}, ++ { { GDK_Control_L, GDK_Alt_L, GDK_F10 }, 3, "Ct_rl+Alt+F10"}, ++ { { GDK_Control_L, GDK_Alt_L, GDK_F11 }, 3, "Ctrl+Alt+F11"}, ++ { { GDK_Control_L, GDK_Alt_L, GDK_F12 }, 3, "Ctrl+Alt+F12"}, + { {}, 0, "" }, + { { GDK_Print }, 1, "_PrintScreen"}, + }; ++++++ report-error.patch ++++++ Index: virt-viewer-0.2.0/src/viewer.c =================================================================== --- virt-viewer-0.2.0.orig/src/viewer.c +++ virt-viewer-0.2.0/src/viewer.c @@ -992,6 +992,7 @@ static int viewer_initial_connect(VirtVi viewer_set_status(viewer, "Waiting for guest domain to be created"); goto done; } else { + fprintf(stderr, "Cannot find guest %s\n", viewer->domkey); DEBUG_LOG("Cannot find guest"); goto cleanup; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit virt-manager for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at Mon Mar 1 01:50:00 CET 2010. -------- --- virt-manager/virt-manager.changes 2010-01-09 00:18:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/virt-manager/virt-manager.changes 2010-02-26 19:33:46.000000000 +0100 @@ -1,0 +2,27 @@ +Tue Feb 23 14:20:52 CST 2010 - jsong(a)novell.com + +- virtinst-storage-ocfs2.diff (Xin Wei Hu) + * add ocfs2 to pool of dir (Filesystem Directory) type in libvirt + +------------------------------------------------------------------- +Mon Feb 15 23:24:12 UTC 2010 - chris(a)computersalat.de + +- Update to virt-manager version 0.8.3 + * New ability to manage network interfaces: start, stop, and view + existing interfaces. Provision new bridge, bond, and vlan devices. + * New option to 'customize VM before install', which allows + adjusting most VM options from the install wizard. +- Update to virtinst version 0.500.2 + * virt-install: New option --autostart for setting domain + autostart flag + * virt-install: Allow specifying --host-device with lsusb and + lspci format (0x1234:0x5678 for USB, etc) + * virtinst: New 'Interface' module for building libvirt + interface XML +- cleanup spec + * norootforbuild + * sort TAGS +- some rpmlint stuff + * configfile + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- virt-manager-0.8.2.tar.bz2 virtinst-0.500.1.tar.bz2 New: ---- virt-manager-0.8.3.tar.bz2 virtinst-0.500.2.tar.bz2 virtinst-storage-ocfs2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.DJ2VtK/_old 2010-03-01 01:49:48.000000000 +0100 +++ /var/tmp/diff_new_pack.DJ2VtK/_new 2010-03-01 01:49:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package virt-manager (Version 0.8.2) +# spec file for package virt-manager (Version 0.8.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,24 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild - -Name: virt-manager %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}} %define gsysconfdir /etc %define gconftool /usr/bin/gconftool-2 %define virtinst_maj 0 %define virtinst_min 500 -%define virtinst_rel 1 +%define virtinst_rel 2 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} -Version: 0.8.2 -Release: 1 + +Name: virt-manager Summary: Virtual Machine Manager +Version: 0.8.3 +Release: 1 Group: System/Monitoring License: LGPLv2.1+ Url: http://virt-manager.et.redhat.com -BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %{ix86} x86_64 Source0: virt-manager-%{version}.tar.bz2 Source1: %{virtinst_name}.tar.bz2 Patch50: virtman-desktop.diff @@ -47,6 +46,28 @@ Patch59: virtman-keycombo.diff Patch60: virtman-autoconnect.diff Patch81: virtinst-cdrom.diff +Patch82: virtinst-storage-ocfs2.diff +ExclusiveArch: %{ix86} x86_64 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%gconf_schemas_prereq +# +#rpmlint BuildRequires: python +BuildRequires: gtk2-devel +BuildRequires: python-devel +BuildRequires: gettext +BuildRequires: scrollkeeper +BuildRequires: intltool +#rpmlint BuildRequires: python-gtk +BuildRequires: python-gtk-devel +BuildRequires: python-gobject2-devel +BuildRequires: gconf2-devel +BuildRequires: desktop-file-utils +BuildRequires: update-desktop-files +# virtinst BuildRequires +BuildRequires: libxml2-python +BuildRequires: python-urlgrabber +BuildRequires: libvirt-python +# # Requires: pygtk2 >= 1.99.12-6 Requires: python-gtk # Requires: gnome-python2-gconf >= 1.99.11-7 @@ -86,23 +107,6 @@ # Add requires for non Xen installations Requires: python-urlgrabber Requires: vm-install -#rpmlint BuildRequires: python -BuildRequires: gtk2-devel -BuildRequires: python-devel -BuildRequires: gettext -BuildRequires: scrollkeeper -BuildRequires: intltool -#rpmlint BuildRequires: python-gtk -BuildRequires: python-gtk-devel -BuildRequires: python-gobject2-devel -BuildRequires: gconf2-devel -BuildRequires: desktop-file-utils -BuildRequires: update-desktop-files -# virtinst BuildRequires -BuildRequires: libxml2-python -BuildRequires: python-urlgrabber -BuildRequires: libvirt-python -%gconf_schemas_prereq %description Virtual Machine Manager provides a graphical tool for administering @@ -132,6 +136,7 @@ %patch60 -p1 pushd $RPM_BUILD_DIR/%{virtinst_name} %patch81 -p1 +%patch82 -p1 popd # sed -i -e "s@sr\@Latn@sr\@latin@" configure # mv po/sr(a)Latn.po po/sr(a)latin.po @@ -157,6 +162,7 @@ rm -f $RPM_BUILD_ROOT/usr/share/locale/fr/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/it/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/sr/LC_MESSAGES/virtinst.mo +rm -f $RPM_BUILD_ROOT/usr/share/locale/ru/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/pt_BR/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/sr(a)latin/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/zh_CN/LC_MESSAGES/virtinst.mo @@ -166,7 +172,6 @@ rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-install.1 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-convert.1 rm -f $RPM_BUILD_ROOT/usr/share/man/man5/virt-image.5 -# rm -f $RPM_BUILD_ROOT/usr/share/virt-manager/virtinst-0.500.3-py2.?.egg-info popd #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la @@ -202,7 +207,7 @@ %dir %{_datadir}/gconf/schemas %config %{_datadir}/gconf/schemas/%{name}.schemas %else -%{gsysconfdir}/gconf/schemas/%{name}.schemas +%config %{gsysconfdir}/gconf/schemas/%{name}.schemas %endif %{_bindir}/%{name} %{_libexecdir}/%{name}-launch @@ -233,7 +238,7 @@ %dir %{_datadir}/%{name}/virtconv/parsers %{_datadir}/%{name}/virtconv/parsers/*.py %{_datadir}/%{name}/virtconv/parsers/*.pyc -%{_datadir}/%{name}/virtinst-0.500.1-py2.6.egg-info +%{_datadir}/%{name}/%{virtinst_name}-py2.6.egg-info %doc %{_datadir}/gnome/help/%{name}/C/figures/*.png %doc %{_datadir}/gnome/help/%{name}/C/*.xml # FIXME: autobuild complains that these are unowned (not true...) ++++++ virt-manager-0.8.2.tar.bz2 -> virt-manager-0.8.3.tar.bz2 ++++++ ++++ 136899 lines of diff (skipped) ++++++ virtinst-0.500.1.tar.bz2 -> virtinst-0.500.2.tar.bz2 ++++++ ++++ 25253 lines of diff (skipped) ++++++ virtinst-cdrom.diff ++++++ --- /var/tmp/diff_new_pack.DJ2VtK/_old 2010-03-01 01:49:50.000000000 +0100 +++ /var/tmp/diff_new_pack.DJ2VtK/_new 2010-03-01 01:49:50.000000000 +0100 @@ -1,10 +1,10 @@ -Index: virtinst-0.500.1/virtinst/VirtualDisk.py +Index: virtinst-0.500.2/virtinst/VirtualDisk.py =================================================================== ---- virtinst-0.500.1.orig/virtinst/VirtualDisk.py -+++ virtinst-0.500.1/virtinst/VirtualDisk.py -@@ -1354,14 +1354,18 @@ class VirtualDisk(VirtualDevice): +--- virtinst-0.500.2.orig/virtinst/VirtualDisk.py ++++ virtinst-0.500.2/virtinst/VirtualDisk.py +@@ -1370,14 +1370,18 @@ class VirtualDisk(VirtualDevice): + self.target = "hdc" return self.target - raise ValueError(_("IDE CDROM must use 'hdc', but target in use.")) - # Regular scanning + # Start cdrom at 'c' and skip 'c' for non-cdrom ++++++ virtinst-storage-ocfs2.diff ++++++ --- virtinst-0.500.2.orig/virtinst/Storage.py Tue Feb 23 13:54:26 2010 +0800 +++ virtinst-0.500.2/virtinst/Storage.py Tue Feb 23 13:58:59 2010 +0800 @@ -519,7 +519,7 @@ get_volume_class = staticmethod(get_volume_class) formats = [ "auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf", - "gfs", "gfs2", "vfat", "hfs+", "xfs" ] + "gfs", "gfs2", "vfat", "hfs+", "xfs", "ocfs2" ] # Register applicable property methods from parent class perms = property(StorageObject.get_perms, StorageObject.set_perms) ++++++ virtman-autoconnect.diff ++++++ --- /var/tmp/diff_new_pack.DJ2VtK/_old 2010-03-01 01:49:50.000000000 +0100 +++ /var/tmp/diff_new_pack.DJ2VtK/_new 2010-03-01 01:49:50.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.2/src/virtManager/engine.py +Index: virt-manager-0.8.3/src/virtManager/engine.py =================================================================== ---- virt-manager-0.8.2.orig/src/virtManager/engine.py -+++ virt-manager-0.8.2/src/virtManager/engine.py -@@ -470,7 +470,7 @@ class vmmEngine(gobject.GObject): +--- virt-manager-0.8.3.orig/src/virtManager/engine.py ++++ virt-manager-0.8.3/src/virtManager/engine.py +@@ -471,7 +471,7 @@ class vmmEngine(gobject.GObject): self.emit("connection-added", conn) self.config.add_connection(conn.get_uri()) if autoconnect: ++++++ virtman-cdrom.diff ++++++ --- /var/tmp/diff_new_pack.DJ2VtK/_old 2010-03-01 01:49:50.000000000 +0100 +++ /var/tmp/diff_new_pack.DJ2VtK/_new 2010-03-01 01:49:50.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-manager-0.8.2/src/virtManager/addhardware.py +Index: virt-manager-0.8.3/src/virtManager/addhardware.py =================================================================== ---- virt-manager-0.8.2.orig/src/virtManager/addhardware.py -+++ virt-manager-0.8.2/src/virtManager/addhardware.py +--- virt-manager-0.8.3.orig/src/virtManager/addhardware.py ++++ virt-manager-0.8.3/src/virtManager/addhardware.py @@ -465,6 +465,7 @@ class vmmAddHardware(gobject.GObject): if self.vm.get_hv_type() == "kvm": add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk") ++++++ virtman-desktop.diff ++++++ --- /var/tmp/diff_new_pack.DJ2VtK/_old 2010-03-01 01:49:50.000000000 +0100 +++ /var/tmp/diff_new_pack.DJ2VtK/_new 2010-03-01 01:49:50.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-manager-0.8.2/src/Makefile.am +Index: virt-manager-0.8.3/src/Makefile.am =================================================================== ---- virt-manager-0.8.2.orig/src/Makefile.am -+++ virt-manager-0.8.2/src/Makefile.am +--- virt-manager-0.8.3.orig/src/Makefile.am ++++ virt-manager-0.8.3/src/Makefile.am @@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch gladedir = $(pkgdatadir) glade_DATA = $(wildcard $(srcdir)/*.glade) @@ -11,10 +11,10 @@ desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA = $(PACKAGE).desktop -Index: virt-manager-0.8.2/src/Makefile.in +Index: virt-manager-0.8.3/src/Makefile.in =================================================================== ---- virt-manager-0.8.2.orig/src/Makefile.in -+++ virt-manager-0.8.2/src/Makefile.in +--- virt-manager-0.8.3.orig/src/Makefile.in ++++ virt-manager-0.8.3/src/Makefile.in @@ -240,7 +240,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in libexec_SCRIPTS = $(PACKAGE)-launch gladedir = $(pkgdatadir) @@ -24,10 +24,10 @@ desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA = $(PACKAGE).desktop dbusdir = $(datadir)/dbus-1/services -Index: virt-manager-0.8.2/src/virt-manager.desktop.in.in +Index: virt-manager-0.8.3/src/virt-manager.desktop.in.in =================================================================== ---- virt-manager-0.8.2.orig/src/virt-manager.desktop.in.in -+++ virt-manager-0.8.2/src/virt-manager.desktop.in.in +--- virt-manager-0.8.3.orig/src/virt-manager.desktop.in.in ++++ virt-manager-0.8.3/src/virt-manager.desktop.in.in @@ -1,9 +1,20 @@ [Desktop Entry] _Name=Virtual Machine Manager ++++++ virtman-help.diff ++++++ --- /var/tmp/diff_new_pack.DJ2VtK/_old 2010-03-01 01:49:50.000000000 +0100 +++ /var/tmp/diff_new_pack.DJ2VtK/_new 2010-03-01 01:49:50.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-manager-0.8.2/help/virt-manager/C/virt-manager.xml +Index: virt-manager-0.8.3/help/virt-manager/C/virt-manager.xml =================================================================== ---- virt-manager-0.8.2.orig/help/virt-manager/C/virt-manager.xml -+++ virt-manager-0.8.2/help/virt-manager/C/virt-manager.xml +--- virt-manager-0.8.3.orig/help/virt-manager/C/virt-manager.xml ++++ virt-manager-0.8.3/help/virt-manager/C/virt-manager.xml @@ -821,218 +821,9 @@ <title>The Create Wizard</title> <para>The Create Wizard helps you gather the information necessary to create ++++++ virtman-keycombo.diff ++++++ --- /var/tmp/diff_new_pack.DJ2VtK/_old 2010-03-01 01:49:50.000000000 +0100 +++ /var/tmp/diff_new_pack.DJ2VtK/_new 2010-03-01 01:49:50.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-manager-0.8.2/src/vmm-details.glade +Index: virt-manager-0.8.3/src/vmm-details.glade =================================================================== ---- virt-manager-0.8.2.orig/src/vmm-details.glade -+++ virt-manager-0.8.2/src/vmm-details.glade +--- virt-manager-0.8.3.orig/src/vmm-details.glade ++++ virt-manager-0.8.3/src/vmm-details.glade @@ -339,11 +339,85 @@ </widget> </child> @@ -97,11 +97,11 @@ <property name="visible">True</property> </widget> </child> -Index: virt-manager-0.8.2/src/virtManager/details.py +Index: virt-manager-0.8.3/src/virtManager/details.py =================================================================== ---- virt-manager-0.8.2.orig/src/virtManager/details.py -+++ virt-manager-0.8.2/src/virtManager/details.py -@@ -240,6 +240,14 @@ class vmmDetails(gobject.GObject): +--- virt-manager-0.8.3.orig/src/virtManager/details.py ++++ virt-manager-0.8.3/src/virtManager/details.py +@@ -259,6 +259,14 @@ class vmmDetails(gobject.GObject): "on_details_menu_send_cad_activate": self.console.send_key, "on_details_menu_send_cab_activate": self.console.send_key, @@ -116,10 +116,10 @@ "on_details_menu_send_caf1_activate": self.console.send_key, "on_details_menu_send_caf2_activate": self.console.send_key, "on_details_menu_send_caf3_activate": self.console.send_key, -Index: virt-manager-0.8.2/src/virtManager/console.py +Index: virt-manager-0.8.3/src/virtManager/console.py =================================================================== ---- virt-manager-0.8.2.orig/src/virtManager/console.py -+++ virt-manager-0.8.2/src/virtManager/console.py +--- virt-manager-0.8.3.orig/src/virtManager/console.py ++++ virt-manager-0.8.3/src/virtManager/console.py @@ -321,6 +321,22 @@ class vmmConsolePages(gobject.GObject): keys = ["Control_L", "Alt_L", "Delete"] elif src.get_name() == "details-menu-send-cab": ++++++ virtman-kvm.diff ++++++ --- /var/tmp/diff_new_pack.DJ2VtK/_old 2010-03-01 01:49:50.000000000 +0100 +++ /var/tmp/diff_new_pack.DJ2VtK/_new 2010-03-01 01:49:50.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.2/src/virt-manager.py.in +Index: virt-manager-0.8.3/src/virt-manager.py.in =================================================================== ---- virt-manager-0.8.2.orig/src/virt-manager.py.in -+++ virt-manager-0.8.2/src/virt-manager.py.in -@@ -198,7 +198,8 @@ def default_uri(): +--- virt-manager-0.8.3.orig/src/virt-manager.py.in ++++ virt-manager-0.8.3/src/virt-manager.py.in +@@ -209,7 +209,8 @@ def default_uri(): tryuri = "xen:///" elif (os.path.exists("/usr/bin/qemu") or os.path.exists("/usr/bin/qemu-kvm") or ++++++ virtman-netcat.diff ++++++ --- /var/tmp/diff_new_pack.DJ2VtK/_old 2010-03-01 01:49:50.000000000 +0100 +++ /var/tmp/diff_new_pack.DJ2VtK/_new 2010-03-01 01:49:50.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.2/src/virtManager/console.py +Index: virt-manager-0.8.3/src/virtManager/console.py =================================================================== ---- virt-manager-0.8.2.orig/src/virtManager/console.py -+++ virt-manager-0.8.2/src/virtManager/console.py -@@ -506,7 +506,7 @@ class vmmConsolePages(gobject.GObject): +--- virt-manager-0.8.3.orig/src/virtManager/console.py ++++ virt-manager-0.8.3/src/virtManager/console.py +@@ -505,7 +505,7 @@ class vmmConsolePages(gobject.GObject): if username: argv += ['-l', username] ++++++ virtman-vminstall.diff ++++++ --- /var/tmp/diff_new_pack.DJ2VtK/_old 2010-03-01 01:49:50.000000000 +0100 +++ /var/tmp/diff_new_pack.DJ2VtK/_new 2010-03-01 01:49:50.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-manager-0.8.2/src/virtManager/engine.py +Index: virt-manager-0.8.3/src/virtManager/engine.py =================================================================== ---- virt-manager-0.8.2.orig/src/virtManager/engine.py -+++ virt-manager-0.8.2/src/virtManager/engine.py +--- virt-manager-0.8.3.orig/src/virtManager/engine.py ++++ virt-manager-0.8.3/src/virtManager/engine.py @@ -38,7 +38,8 @@ from virtManager.manager import vmmManag from virtManager.migrate import vmmMigrateDialog from virtManager.details import vmmDetails @@ -12,7 +12,7 @@ from virtManager.host import vmmHost from virtManager.error import vmmErrorDialog from virtManager.systray import vmmSystray -@@ -435,13 +436,24 @@ class vmmEngine(gobject.GObject): +@@ -436,13 +437,24 @@ class vmmEngine(gobject.GObject): return False return True ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0