Hello community, here is the log from the commit of package vmx-manager checked in at Wed Jan 31 02:09:13 CET 2007. -------- --- vmx-manager/vmx-manager.changes 2007-01-31 00:49:11.000000000 +0100 +++ /mounts/work_src_done/NOARCH/vmx-manager/vmx-manager.changes 2007-01-31 02:06:57.378709000 +0100 @@ -2 +2 @@ -Wed Jan 31 00:49:04 CET 2007 - ro@suse.de +Wed Jan 31 02:06:45 CET 2007 - ro@suse.de @@ -4 +4,18 @@ -- GNOME moved to /usr +- GNOME moved to /usr + +------------------------------------------------------------------- +Wed Jan 31 01:10:02 CET 2007 - james@suse.de + +- make new ethernet device default to using NAT on mobile devices + and bridged otherwise. + +- when the operating system is changed, also change the ethernet device + type to match the suggested one for that OS. + +- constrain the memory spin button to 4 megabyte increments + +------------------------------------------------------------------- +Tue Jan 30 23:01:42 CET 2007 - james@suse.de + +- update to 0.2.4, fixes a regression when setting the amount + of memory to use for a machine Old: ---- vmx-manager-0.2.3.tar.bz2 New: ---- vmx-manager-0.2.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vmx-manager.spec ++++++ --- /var/tmp/diff_new_pack.wV8429/_old 2007-01-31 02:08:58.000000000 +0100 +++ /var/tmp/diff_new_pack.wV8429/_new 2007-01-31 02:08:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package vmx-manager (Version 0.2.3) +# spec file for package vmx-manager (Version 0.2.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ License: GNU General Public License (GPL) Group: Productivity/Other Autoreqprov: on -Version: 0.2.3 -Release: 2 +Version: 0.2.5 +Release: 1 Summary: Create, configure, and manage VMware virtual machines Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -74,6 +74,15 @@ %changelog -n vmx-manager * Wed Jan 31 2007 - ro@suse.de - GNOME moved to /usr +* Wed Jan 31 2007 - james@suse.de +- make new ethernet device default to using NAT on mobile devices + and bridged otherwise. +- when the operating system is changed, also change the ethernet device + type to match the suggested one for that OS. +- constrain the memory spin button to 4 megabyte increments +* Tue Jan 30 2007 - james@suse.de +- update to 0.2.4, fixes a regression when setting the amount + of memory to use for a machine * Thu Jan 18 2007 - james@suse.de - update to 0.2.3, containing two bug fixes - #236385 and #236417 * Fri Jan 12 2007 - james@suse.de ++++++ vmx-manager-0.2.3.tar.bz2 -> vmx-manager-0.2.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/ChangeLog new/vmx-manager-0.2.5/ChangeLog --- old/vmx-manager-0.2.3/ChangeLog 2007-01-18 21:24:07.000000000 +0100 +++ new/vmx-manager-0.2.5/ChangeLog 2007-01-31 01:07:53.000000000 +0100 @@ -1,3 +1,20 @@ +2007-01-30 James Willcox <snorp@novell.com> + + * configure.ac: bump to 0.2.5 + * src/ConfigDialog.cs: when the operating system is changed, also + change the type of network card in the machine to the suggested one. + * src/Utility.cs: add GetDefaultNetworkType, which picks NAT if the + host machine is a laptop, bridged otherwise. This way if the user + switches between wired and wireless connections, the VMs will maintain + their connections. + * TODO: added + +2007-01-30 James Willcox <snorp@novell.com> + + * configure.ac: bump to 0.2.4 + * src/ConfigDialog.cs (Load): set the os combo first to avoid nuking + the memory spin button value. + 2007-01-18 James Willcox <snorp@novell.com> * configure.ac: bump to 0.2.3 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/configure new/vmx-manager-0.2.5/configure --- old/vmx-manager-0.2.3/configure 2007-01-18 21:23:30.000000000 +0100 +++ new/vmx-manager-0.2.5/configure 2007-01-31 01:02:02.000000000 +0100 @@ -2071,7 +2071,7 @@ # Define the identity of the package. PACKAGE=vmx-manager - VERSION=0.2.3 + VERSION=0.2.5 cat >>confdefs.h <<_ACEOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/configure.ac new/vmx-manager-0.2.5/configure.ac --- old/vmx-manager-0.2.3/configure.ac 2007-01-18 21:23:21.000000000 +0100 +++ new/vmx-manager-0.2.5/configure.ac 2007-01-31 01:01:52.000000000 +0100 @@ -1,6 +1,6 @@ AC_INIT(src/EntryPoint.cs) -AM_INIT_AUTOMAKE(vmx-manager, 0.2.3) +AM_INIT_AUTOMAKE(vmx-manager, 0.2.5) AM_MAINTAINER_MODE AC_PROG_INTLTOOL([0.21]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/data/defaults.vmx new/vmx-manager-0.2.5/data/defaults.vmx --- old/vmx-manager-0.2.3/data/defaults.vmx 2007-01-03 20:56:33.000000000 +0100 +++ new/vmx-manager-0.2.5/data/defaults.vmx 2007-01-31 00:49:36.000000000 +0100 @@ -8,10 +8,8 @@ floppy0.fileName = "/dev/fd0" floppy0.present = "FALSE" -ethernet0.present = "TRUE" usb.present = "TRUE" sound.present = "TRUE" sound.virtualDev = "es1371" guestOS = "sles" -ethernet0.addressType = "generated" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/data/vmx-manager.glade new/vmx-manager-0.2.5/data/vmx-manager.glade --- old/vmx-manager-0.2.3/data/vmx-manager.glade 2007-01-03 20:56:33.000000000 +0100 +++ new/vmx-manager-0.2.5/data/vmx-manager.glade 2007-01-31 00:55:45.000000000 +0100 @@ -700,7 +700,7 @@ <property name="update_policy">GTK_UPDATE_ALWAYS</property> <property name="snap_to_ticks">False</property> <property name="wrap">False</property> - <property name="adjustment">1 0 4096 1 10 10</property> + <property name="adjustment">1 0 4096 4 4 4</property> </widget> <packing> <property name="padding">0</property> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/src/ConfigDialog.cs new/vmx-manager-0.2.5/src/ConfigDialog.cs --- old/vmx-manager-0.2.3/src/ConfigDialog.cs 2007-01-18 21:05:10.000000000 +0100 +++ new/vmx-manager-0.2.5/src/ConfigDialog.cs 2007-01-31 00:54:18.000000000 +0100 @@ -140,6 +140,10 @@ } memorySpin.Value = os.SuggestedRam; + + foreach (VirtualEthernet ethernet in machine.EthernetDevices) { + ethernet.EthernetType = os.SuggestedEthernetDeviceType; + } } private void OnPopupPosition (Menu menu, out int x, out int y, out bool push_in) { @@ -170,12 +174,12 @@ } private void Load () { + SetOsCombo (); + nameEntry.Text = machine.Name; memorySpin.Value = machine.MemorySize; soundToggle.Active = machine.SoundEnabled; usbToggle.Active = machine.UsbEnabled; - - SetOsCombo (); } private GuestOperatingSystem GetSelectedOs () { @@ -271,7 +275,7 @@ } private void OnAddEthernet (object o, EventArgs args) { - VirtualEthernet ethernet = new VirtualEthernet (NetworkType.Bridged, null, + VirtualEthernet ethernet = new VirtualEthernet (Utility.GetDefaultNetworkType (), null, machine.OperatingSystem.SuggestedEthernetDeviceType); EthernetConfigDialog dialog = new EthernetConfigDialog (ethernet, this); dialog.Response += delegate (object b, ResponseArgs rargs) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/src/Utility.cs new/vmx-manager-0.2.5/src/Utility.cs --- old/vmx-manager-0.2.3/src/Utility.cs 2007-01-04 19:35:40.000000000 +0100 +++ new/vmx-manager-0.2.5/src/Utility.cs 2007-01-31 01:04:02.000000000 +0100 @@ -77,7 +77,7 @@ case "nat": return NetworkType.Nat; default: - return NetworkType.Bridged; + return GetDefaultNetworkType (); } } @@ -363,6 +363,15 @@ return devices; } + public static NetworkType GetDefaultNetworkType () { + Hal.Device computer = new Hal.Device ("/org/freedesktop/Hal/devices/computer"); + if (computer.GetPropertyString ("system.formfactor") == "laptop") { + return NetworkType.Nat; + } else { + return NetworkType.Bridged; + } + } + public static int GetHostMemorySize () { Regex regex = new Regex ("MemTotal:.*?([0-9]+).*kB"); using (StreamReader reader = new StreamReader (File.OpenRead ("/proc/meminfo"))) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/src/VirtualMachineManager.cs new/vmx-manager-0.2.5/src/VirtualMachineManager.cs --- old/vmx-manager-0.2.3/src/VirtualMachineManager.cs 2007-01-03 20:56:33.000000000 +0100 +++ new/vmx-manager-0.2.5/src/VirtualMachineManager.cs 2007-01-31 00:50:51.000000000 +0100 @@ -136,6 +136,11 @@ if (GetMachine (name) == null && GetMachineByFileName (name) == null) { VirtualMachine machine = CreateMachine (name); + // add one network interface + VirtualEthernet ethernet = new VirtualEthernet (Utility.GetDefaultNetworkType (), null, + machine.OperatingSystem.SuggestedEthernetDeviceType); + machine.AddEthernetDevice (ethernet); + // add a default 6gb disk VirtualHardDisk disk = new VirtualHardDisk (0, 0, DiskBusType.Ide, (long) 6 * 1024 * 1024 * 1024); disk.HardDiskType = HardDiskType.SplitSparse; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org