Mailinglist Archive: yast-commit (396 mails)

< Previous Next >
[yast-commit] r65261 - in /trunk/vm: VERSION package/yast2-vm.changes src/Makefile.am src/RelocationServer.ycp src/relocation-server.desktop src/xen.desktop src/xen.ycp yast2-vm.spec.in
Author: charlesa
Date: Fri Aug 5 21:40:30 2011
New Revision: 65261

URL: http://svn.opensuse.org/viewcvs/yast?rev=65261&view=rev
Log:
- Update desktop files with more descriptive information in the GenericName
field.
- Restore xen.desktop and xen.ycp
- 2.21.1

Added:
trunk/vm/src/xen.desktop
trunk/vm/src/xen.ycp
Modified:
trunk/vm/VERSION
trunk/vm/package/yast2-vm.changes
trunk/vm/src/Makefile.am
trunk/vm/src/RelocationServer.ycp
trunk/vm/src/relocation-server.desktop
trunk/vm/yast2-vm.spec.in

Modified: trunk/vm/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/vm/VERSION?rev=65261&r1=65260&r2=65261&view=diff
==============================================================================
--- trunk/vm/VERSION (original)
+++ trunk/vm/VERSION Fri Aug 5 21:40:30 2011
@@ -1 +1 @@
-2.21.0
+2.21.1

Modified: trunk/vm/package/yast2-vm.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/vm/package/yast2-vm.changes?rev=65261&r1=65260&r2=65261&view=diff
==============================================================================
--- trunk/vm/package/yast2-vm.changes (original)
+++ trunk/vm/package/yast2-vm.changes Fri Aug 5 21:40:30 2011
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Fri Aug 5 13:15:17 MDT 2011 - carnold@xxxxxxxxxx
+
+- Update desktop files with more descriptive information in the
+ GenericName field.
+- Restore xen.desktop and xen.ycp
+- 2.21.1
+
+-------------------------------------------------------------------
Fri Aug 5 12:35:48 CEST 2011 - tgoettlicher@xxxxxxx

- fixed .desktop file (bnc #681249)

Modified: trunk/vm/src/Makefile.am
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/Makefile.am?rev=65261&r1=65260&r2=65261&view=diff
==============================================================================
--- trunk/vm/src/Makefile.am (original)
+++ trunk/vm/src/Makefile.am Fri Aug 5 21:40:30 2011
@@ -7,25 +7,33 @@
groupdir = @desktopdir@/groups

client_DATA = \
+ xen.ycp \
vm_finish.ycp \
relocation-server.ycp

-ynclude_DATA = \
- helps.ycp \
- wizards.ycp \
- dialogs.ycp \
- complex.ycp
-
group_DATA = \
virtualization.desktop

desktop_DATA = \
+ xen.desktop \
relocation-server.desktop

module_DATA = \
- VM_XEN.ycp \
+ VM_XEN.ycp \
RelocationServer.ycp

-EXTRA_DIST = $(client_DATA) $(module_DATA) $(group_DATA) $(desktop_DATA)
+ynclude_DATA = \
+ helps.ycp \
+ wizards.ycp \
+ dialogs.ycp \
+ complex.ycp
+
+
+EXTRA_DIST = $(client_DATA) $(module_DATA) $(group_DATA) $(desktop_DATA)
$(ynclude_DATA)
+
+relocation-server:
+ test -l relocation-server || ln -s . relocation-server
+
+ycpchook = relocation-server

include $(top_srcdir)/Makefile.am.common

Modified: trunk/vm/src/RelocationServer.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/RelocationServer.ycp?rev=65261&r1=65260&r2=65261&view=diff
==============================================================================
--- trunk/vm/src/RelocationServer.ycp (original)
+++ trunk/vm/src/RelocationServer.ycp Fri Aug 5 21:40:30 2011
@@ -180,13 +180,13 @@
*/
boolean ReadXendService () {
if (Service::Status("xend") == 0) {
- xend_is_running = true;
+ xend_is_running = true;
+ y2milestone("Xend is running");
} else {
- xend_is_running = false;
+ xend_is_running = false;
+ y2milestone("Xend is not running");
}

- y2milestone((xend_is_running ? "Xend is running":"Xend is not running"));
-
return true;
}

@@ -197,10 +197,10 @@
boolean all_ok = true;

if (xend_is_running) {
- y2milestone("Restarting xend daemon");
- all_ok = Service::Restart("xend");
+ y2milestone("Restarting xend daemon");
+ all_ok = Service::Restart("xend");
} else {
- y2milestone("Xend is not running - leaving...");
+ y2milestone("Xend is not running - leaving...");
}

return all_ok;
@@ -242,21 +242,22 @@

if (Service::Status("libvirtd") == 0) {
libvirtd_is_running = true;
+ y2milestone("libvirtd is running");
} else {
libvirtd_is_running = false;
+ y2milestone("libvirtd is not running");
}
if (Service::Status("sshd") == 0) {
sshd_is_running = true;
+ y2milestone("sshd is running");
} else {
sshd_is_running = false;
+ y2milestone("sshd is not running");
}

list <string> ports =
SuSEFirewallServices::GetNeededTCPPorts("service:libvirtd-relocation-server");
libvirtd_ports = filter(string s, ports, {return (s !=
libvirtd_default_ports);});

- y2milestone((libvirtd_is_running ? "libvirtd is running":"libvirtd is not
running"));
- y2milestone((sshd_is_running ? "sshd is running":"sshd is not running"));
-
return true;
}


Modified: trunk/vm/src/relocation-server.desktop
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/relocation-server.desktop?rev=65261&r1=65260&r2=65261&view=diff
==============================================================================
--- trunk/vm/src/relocation-server.desktop (original)
+++ trunk/vm/src/relocation-server.desktop Fri Aug 5 21:40:30 2011
@@ -16,8 +16,8 @@
X-SuSE-YaST-AutoInstResource=

Icon=yast-vm-install
-Exec=/usr/bin/xdg-su -c '/sbin/yast2 relocation-server'
+Exec=/usr/bin/xdg-su -c "/sbin/yast2 relocation-server"

Name=Relocation Server Configuration
-GenericName=relocation-server
+GenericName=Configure Host for Virtual Machine Migration
StartupNotify=true

Added: trunk/vm/src/xen.desktop
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/xen.desktop?rev=65261&view=auto
==============================================================================
--- trunk/vm/src/xen.desktop (added)
+++ trunk/vm/src/xen.desktop Fri Aug 5 21:40:30 2011
@@ -0,0 +1,24 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-KDE-Library=yast2
+X-SuSE-YaST-Call=xen
+
+X-SuSE-YaST-Group=Virtualization
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoinstResource=
+
+Icon=yast-vm-install
+Exec=/usr/bin/xdg-su -c "/sbin/yast2 xen"
+
+Name=Install Hypervisor and Tools
+GenericName=Install Xen or KVM with Management Tools
+X-KDE-SubstituteUID=true
+StartupNotify=true
+

Added: trunk/vm/src/xen.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/xen.ycp?rev=65261&view=auto
==============================================================================
--- trunk/vm/src/xen.ycp (added)
+++ trunk/vm/src/xen.ycp Fri Aug 5 21:40:30 2011
@@ -0,0 +1,97 @@
+/*
------------------------------------------------------------------------------
+ * Copyright (c) 2007 Novell, Inc. All Rights Reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it
under
+ * the terms of version 2 of the GNU General Public License as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may
find
+ * current contact information at www.novell.com.
+ *
------------------------------------------------------------------------------
+ */
+
+/**
+ * File: clients/xen.ycp
+ * Package: Installation/management in a virtual machine
+ * Summary: Main virtual machine installation/management
+ * Authors: Michael G. Fritch <mgfritch@xxxxxxxxxx>
+ *
+ * $Id: xen.ycp 57028 2009-04-29 10:58:09Z lslezak $
+ */
+
+{
+
+ /***
+ * <h3>Configuration of novell-xad</h3>
+ */
+
+ textdomain "vm";
+
+ /* The main () */
+ y2milestone ("----------------------------------------");
+ y2milestone ("Xen (yast2-vm) module started");
+
+
+ import "Arch";
+ import "CommandLine";
+ import "Mode";
+ import "Package";
+ import "Popup";
+ import "Report";
+ import "VM_XEN";
+
+
+ // check whether VM can be started
+ boolean CheckConfiguration() {
+
+ boolean ret = true;
+
+ // check whether VM can be started (cannot start a vm using UML)
+ if ( VM_XEN::isUML() ) return false;
+
+ y2milestone("Checking for Xen installation");
+
+ // check the dom0 configuration...
+ ret = ret && VM_XEN::ConfigureDom0();
+ if (ret == false) return false;
+
+ y2milestone("CheckConfiguration returned: %1", ret);
+ return ret;
+ }
+
+ /* Main */
+
+ /**
+ * Definition of command line mode options
+ */
+ map cmdline = $[
+ "id" : "vm",
+ "help" : _("Install Hypervisor and Tools"),
+ "guihandler" : CheckConfiguration
+ ];
+
+
+ any rc = CommandLine::Run(cmdline);
+ y2milestone("YAST2-VM: rc = %1", rc);
+
+ // Always check the dom0 configuration
+// boolean ret = CheckConfiguration();
+// if (ret == false) return `abort;
+
+ /* Finish */
+ y2milestone("Xen (yast-vm) module finished");
+ y2milestone("----------------------------------------");
+
+ return `next;
+
+/* EOF */
+}
+

Modified: trunk/vm/yast2-vm.spec.in
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/vm/yast2-vm.spec.in?rev=65261&r1=65260&r2=65261&view=diff
==============================================================================
--- trunk/vm/yast2-vm.spec.in (original)
+++ trunk/vm/yast2-vm.spec.in Fri Aug 5 21:40:30 2011
@@ -2,12 +2,11 @@


@HEADER@
-Group: System/YaST
-ExclusiveArch: x86_64
+ExclusiveArch: %ix86 x86_64
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools
yast2-testsuite
Requires: yast2

-Summary: YaST2 - Virtual Machine Installer
+Summary: Configure Hypervisor and Tools for Xen and KVM

%description
This YaST module configures and installs a virtual machine.
@@ -17,17 +16,27 @@
@BUILD@

@INSTALL@
+%ifarch %ix86
+rm -f $RPM_BUILD_ROOT/usr/share/applications/YaST2/xen.desktop
+rm -f $RPM_BUILD_ROOT/usr/share/applications/YaST2/relocation-server.desktop
+%endif

@CLEAN@

%files
%defattr(-,root,root)
-%dir @yncludedir@/relocation-server
-@yncludedir@/relocation-server/*
+%dir @scrconfdir@
+%dir @yncludedir@
@clientdir@/relocation-server.ycp
+@clientdir@/xen.ycp
@clientdir@/vm_finish.ycp
@moduledir@/VM_XEN.y*
@moduledir@/RelocationServer.*
+@yncludedir@/*
+@scrconfdir@/*
@desktopdir@/groups/virtualization.desktop
+%ifarch x86_64
@desktopdir@/relocation-server.desktop
+@desktopdir@/xen.desktop
+%endif
%doc @docdir@

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages