client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
New commits: commit f1fe8a1047678be9d0e63144d68cf94b79fe18a7 Author: James Bowes jbowes@redhat.com Date: Thu May 28 10:48:33 2009 -0400
Send smbios data to remaining_subscriptions during registration
For KVM or other non Xen virt types, rhn_register needs to send smbios info during a call to remaining_subscriptions, in case the user has no free channel entitlements, but would be granted a free for guest entitlement.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py index 4e1b3be..ea4bf0f 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py @@ -576,15 +576,19 @@ def getRemainingSubscriptions(username, password): # If we've gotten this far, we're definitely looking at hosted. # Hosted will have to support the sending of the release, and optionally, # the virt_uuid. - if virt_uuid is not None: + + if cfg['supportsSMBIOS']: + smbios = hardware.get_hal_smbios() subs = s.registration.remaining_subscriptions(username, password, arch, release, - virt_uuid) + virt_uuid, + smbios) else: subs = s.registration.remaining_subscriptions(username, password, arch, - release) + release, + virt_uuid)
log.log_debug('Server returned %s' % subs)
spacewalk-commits@lists.fedorahosted.org