client/tools/rhn-virtualization/rhn-virtualization.spec | 35 ---
client/tools/rhn-virtualization/scripts/Makefile | 2
client/tools/rhn-virtualization/scripts/rhn-virtualization-guest | 28 --
client/tools/rhn-virtualization/virtualization/report_uuid.py | 99 ----------
4 files changed, 6 insertions(+), 158 deletions(-)
New commits:
commit 2df4b968155893179416e15ae917050f8920649f
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Dec 7 19:01:26 2009 +0100
543980 - remove rhn-virtualization-guest script from Makefile
diff --git a/client/tools/rhn-virtualization/scripts/Makefile
b/client/tools/rhn-virtualization/scripts/Makefile
index 4f297a1..0bf7d23 100644
--- a/client/tools/rhn-virtualization/scripts/Makefile
+++ b/client/tools/rhn-virtualization/scripts/Makefile
@@ -3,7 +3,7 @@ PKGDIR1 = /etc/cron.d
CONF_DIR = /etc/sysconfig/rhn/virt
CONF_DIR_AUTO = /etc/sysconfig/rhn/virt/auto
-SCRIPTS = rhn-virtualization-host rhn-virtualization-guest
+SCRIPTS = rhn-virtualization-host
OTHER = rhn-virtualization.cron
all:
commit 79a301bcaa2ce83127a5a65c07b14e1b07e98d36
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Dec 7 18:52:58 2009 +0100
543980 - get rid of rhn-virtualization-guest package
rhn-virtualization-guest package should not be used nor built.
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec
b/client/tools/rhn-virtualization/rhn-virtualization.spec
index 66f6f31..f0484ba 100644
--- a/client/tools/rhn-virtualization/rhn-virtualization.spec
+++ b/client/tools/rhn-virtualization/rhn-virtualization.spec
@@ -21,14 +21,14 @@ rhn-virtualization provides various RHN/Spacewalk actions for
manipulation
virtual machine guest images.
%package common
-Summary: Files needed by both rhn-virtualization-host and -guest
+Summary: Files needed by rhn-virtualization-host
Group: System Environment/Base
Requires: rhn-client-tools
Requires: chkconfig
%description common
This package contains files that are needed by the rhn-virtualization-host
-and rhn-virtualization-guest packages.
+package.
%package host
Summary: RHN/Spacewalk Virtualization support specific to the Host system
@@ -36,22 +36,11 @@ Group: System Environment/Base
Requires: libvirt-python
Requires: rhn-virtualization-common
Requires: /usr/sbin/crond
-Conflicts: rhn-virtualization-guest
%description host
This package contains code for RHN's and Spacewalk's Virtualization support
that is specific to the Host system (a.k.a. Dom0).
-%package guest
-Summary: RHN/Spacewalk Virtualization support specific to Guest systems
-Group: System Environment/Base
-Requires: rhn-virtualization-common
-Conflicts: rhn-virtualization-host
-
-%description guest
-This package contains code for RHN's and Spacewalk's Virtualization support
-that is specific to Guest systems (a.k.a. DomUs).
-
%prep
%setup -q
@@ -80,13 +69,6 @@ rm -rf $RPM_BUILD_ROOT
%postun host
/sbin/service crond condrestart
-%post guest
-/sbin/chkconfig --add rhn-virtualization-guest
-/sbin/service rhn-virtualization-guest start
-
-%preun guest
-/sbin/chkconfig --del rhn-virtualization-guest
-
%files common
%defattr(-,root,root,-)
%dir %{rhn_dir}/virtualization
@@ -157,14 +139,6 @@ rm -rf $RPM_BUILD_ROOT
%{rhn_dir}/actions/virt.pyo
%doc LICENSE
-%files guest
-%defattr(-,root,root,-)
-%{_initrddir}/rhn-virtualization-guest
-%{rhn_dir}/virtualization/report_uuid.py
-%{rhn_dir}/virtualization/report_uuid.pyc
-%{rhn_dir}/virtualization/report_uuid.pyo
-%doc LICENSE
-
%changelog
* Wed Nov 25 2009 Miroslav Suchý <msuchy(a)redhat.com> 5.4.7-1
- 529688 - correctly detect Xen host
commit e99c7f98dc08aa839742beea0624005833de2030
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Dec 7 18:48:40 2009 +0100
543980 - remove scripts/rhn-virtualization-guest script
This script is part of rhn-virtualization-guest package that should not be
used nor built.
diff --git a/client/tools/rhn-virtualization/scripts/rhn-virtualization-guest
b/client/tools/rhn-virtualization/scripts/rhn-virtualization-guest
deleted file mode 100755
index 7bd4f10..0000000
--- a/client/tools/rhn-virtualization/scripts/rhn-virtualization-guest
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# chkconfig: 2345 99 99
-# description: Reports this guest's UUID to the satellite upon boot.
-
-. /etc/rc.d/init.d/functions
-
-PYTHONPATH="/usr/share/rhn:/usr/share/rhn/virtualization"
-SCRIPTPATH="/usr/share/rhn/virtualization"
-
-start() {
- python $SCRIPTPATH/report_uuid.py
- RETVAL=$?
-
- echo -n "Reporting guest UUID to RHN:"
- if [ $RETVAL -eq 0 ]; then echo_success; else echo_failure; fi
- echo
-
- return $RETVAL
-}
-
-case $1 in
- "start")
- start
- ;;
- *)
- echo "Usage: service rhn-virtualization-guest [start]"
- ;;
-esac
commit 4cc2533d345d9c3261344357e34b5db7ea969e27
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Dec 7 18:47:43 2009 +0100
543980 - remove report_uuid.py
This is part of rhn-virtualization-guest subpackage that should not be
used nor built.
diff --git a/client/tools/rhn-virtualization/virtualization/report_uuid.py
b/client/tools/rhn-virtualization/virtualization/report_uuid.py
deleted file mode 100644
index 7d7bb05..0000000
--- a/client/tools/rhn-virtualization/virtualization/report_uuid.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-import sys
-sys.path.append("/usr/share/rhn/")
-
-import os
-
-from virtualization.constants import StateType, \
- IdentityType, \
- PropertyType
-from virtualization.notification import Plan, \
- EventType, \
- TargetType
-from virtualization.util import dehyphenize_uuid
-
-
-def report_uuid():
- """
- Uploads the guests uuid to the satellite it's registered to.
- """
- if _is_guest_domain():
- my_uuid = _fetch_uuid()
- domain_identity = IdentityType.GUEST
- else:
- return None
-
- plan = Plan()
-
- plan.add(
- EventType.EXISTS,
- TargetType.SYSTEM,
- { PropertyType.IDENTITY : domain_identity,
- PropertyType.UUID : my_uuid })
-
- plan.execute()
-
-def _is_guest_domain():
- """
- This function returns true if this system is currently a guest domain.
- """
- return _fetch_uuid() is not None
-
-
-def _fetch_uuid():
- """
- This function returns the UUID of this system, if it is a guest. Otherwise,
- it returns None. To figure this out, we'll look for the existence of a
- UUID in one of the following (in order of precedence):
-
- - The kernel exporting it in sysfs, under /sys
- - The BIOS DMI data area accessible with dmidecode
- - An administrator simply sticking it in a plain text file /etc/uuid
- """
-
- # First check the /sys area.
- try:
- uuid_file = open('/sys/hypervisor/uuid', 'r')
- uuid = uuid_file.read()
- uuid_file.close()
- return dehyphenize_uuid(uuid)
- except IOError:
- # Failed. Move on to the next strategy.
- pass
-
- # Look in the BIOS DMI area.
- try:
- pass
- except:
- # Failed. Move on to the next strategy.
- pass
-
- # One more try -- a plain text file called /etc/uuid.
- try:
- uuid_text_file = open('/etc/uuid', 'r')
- uuid = uuid_text_file.read().strip()
- uuid_text_file.close()
- return uuid
- except IOError:
- # Failed. Guess we're not a guest.
- pass
-
- return None
-
-if __name__ == "__main__":
- report_uuid()
-
commit 017825145e740cf95d12304ee155ac567781edb3
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Dec 7 18:44:38 2009 +0100
533283 - don't restart crond if it wasn't running before
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec
b/client/tools/rhn-virtualization/rhn-virtualization.spec
index 110430b..66f6f31 100644
--- a/client/tools/rhn-virtualization/rhn-virtualization.spec
+++ b/client/tools/rhn-virtualization/rhn-virtualization.spec
@@ -35,6 +35,7 @@ Summary: RHN/Spacewalk Virtualization support specific to the Host
system
Group: System Environment/Base
Requires: libvirt-python
Requires: rhn-virtualization-common
+Requires: /usr/sbin/crond
Conflicts: rhn-virtualization-guest
%description host
@@ -71,13 +72,13 @@ rm -rf $RPM_BUILD_ROOT
%post host
/sbin/chkconfig --add rhn-virtualization-host
-/sbin/service crond restart
+/sbin/service crond condrestart
%preun host
/sbin/chkconfig --del rhn-virtualization-host
%postun host
-/sbin/service crond restart
+/sbin/service crond condrestart
%post guest
/sbin/chkconfig --add rhn-virtualization-guest