3 commits - java/code java/conf
by Justin Sherrill
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 4 +---
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 2 +-
java/conf/cobbler/snippets/keep_system_id | 4 ++++
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit f2ec5bf5e353a6dfbcae0b5efea42ccd7eb87e3f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Sep 28 13:24:40 2010 -0400
fixing possible ISE where a cobbler system record already exists, but is not associated to a system when re-provisioning is initiated
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
index 671a3f5..4ec89b4 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
@@ -156,7 +156,7 @@ public class CobblerSystemCreateCommand extends CobblerCommand {
String uid = (String) sysmap.get("uid");
SystemRecord rec;
rec = SystemRecord.lookupById(CobblerXMLRPCHelper.getConnection(user),
- server.getCobblerId());
+ uid);
if (rec != null) {
return rec;
}
commit 57153858b958930a794a5153d0b2b6b5a062ba43
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Sep 28 13:23:55 2010 -0400
fixing issue where kickstarts woudl not show up for provisioning if the distro was created since the last tomcat restart
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index f63582a..8dd8103 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -590,9 +590,7 @@ public class KickstartFactory extends HibernateFactory {
String query = "KickstartableTree.findAccessibleToOrg";
session = HibernateFactory.getSession();
retval = session.getNamedQuery(query).
- setLong("org_id", org.getId().longValue())
- //Retrieve from cache if there
- .setCacheable(true).list();
+ setLong("org_id", org.getId().longValue()).list();
return retval;
}
commit c3b0aac56237e984596f89e45344d5ccdc0271be
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Sep 28 13:22:27 2010 -0400
adding ext4 support for duplicate systems
diff --git a/java/conf/cobbler/snippets/keep_system_id b/java/conf/cobbler/snippets/keep_system_id
index 2f05c66..0f31f37 100644
--- a/java/conf/cobbler/snippets/keep_system_id
+++ b/java/conf/cobbler/snippets/keep_system_id
@@ -7,6 +7,10 @@ rhn_keys_found=no
insmod /lib/jbd.o
insmod /lib/ext3.o
+if [ -f /lib/ext4.o ];
+ insmod /lib/ext4.o
+fi
+
mkdir -p /tmp/rhn
drives=$(list-harddrives | awk '{print $1}')
13 years, 7 months
java/conf
by Justin Sherrill
java/conf/cobbler/snippets/keep_system_id | 12 +-----------
java/conf/cobbler/snippets/post_reactivation_key | 15 +++++++++------
2 files changed, 10 insertions(+), 17 deletions(-)
New commits:
commit d3e9593c5a070f48de07f3cd1a2cf9b2fd7dca4d
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Sep 27 17:34:52 2010 -0400
637696 - fixing issue where kickstart could hang, either because of a rhel 5.5 kernel panic, or because RHEL 6 does not allow pre-scripts to continue running in the background
diff --git a/java/conf/cobbler/snippets/keep_system_id b/java/conf/cobbler/snippets/keep_system_id
index c27e05d..2f05c66 100644
--- a/java/conf/cobbler/snippets/keep_system_id
+++ b/java/conf/cobbler/snippets/keep_system_id
@@ -11,7 +11,7 @@ mkdir -p /tmp/rhn
drives=$(list-harddrives | awk '{print $1}')
for disk in $drives; do
- DISKS="$DISKS $(fdisk -l /dev/$disk | awk '/^\/dev/{print $1}')"
+ DISKS="$DISKS $(fdisk -l /dev/$disk | grep -v "swap\|LVM\|Extended" | awk '/^\/dev/{print $1}')"
done
# Try to find the keys on ordinary partitions
@@ -64,14 +64,4 @@ if [ "$rhn_keys_found" = "no" ]; then
done
fi
-# Loop until the RHN rpm is installed
-if [ "$rhn_keys_found" = "yes" ]; then
- while : ; do
- sleep 10
- if [ -d /mnt/sysimage/root ] ; then
- cp -af /tmp/rhn/* /mnt/sysimage/root/systemid.old
- break
- fi
- done &
-fi
#end raw
diff --git a/java/conf/cobbler/snippets/post_reactivation_key b/java/conf/cobbler/snippets/post_reactivation_key
index 9b7a972..2a5e0fc 100644
--- a/java/conf/cobbler/snippets/post_reactivation_key
+++ b/java/conf/cobbler/snippets/post_reactivation_key
@@ -1,23 +1,26 @@
-%post --interpreter /usr/bin/python
+%post --nochroot --interpreter /usr/bin/python
import xmlrpclib
+import shutil
import os
import os.path
-system_id = "/root/systemid.old"
+old_system_id = "/tmp/rhn/systemid"
+new_system_id = "/mnt/sysimage/root/systemid.old"
try:
new_keys = "$redhat_management_key"
for key in new_keys.split(','):
if key.startswith('re-'):
os.exit(0)
- if os.path.exists(system_id):
+ if os.path.exists(old_system_id):
client = xmlrpclib.Server("http://$http_server/rpc/api")
- key = client.system.obtain_reactivation_key(open(system_id).read())
- f = open("/tmp/key","w")
+ key = client.system.obtain_reactivation_key(open(old_system_id).read())
+ f = open("/mnt/sysimage/tmp/key","w")
f.write(key)
f.close()
+ shutil.copy(old_system_id, new_system_id)
except:
# xml rpc due to a old/bad system id
# we don't care about those
- # we'll register those as new.
+ # we'll register those as new.
pass
13 years, 7 months
Changes to 'refs/tags/spacewalk-setup-1.2.7-1'
by Miroslav Suchý
Tag 'spacewalk-setup-1.2.7-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-09-27 16:56 +0000
Tagging package [spacewalk-setup] version [1.2.7-1] in directory [spacewalk/setup/].
Changes since perl-NOCpulse-Probe-1.184.4-1:
Miroslav Suchý (1):
Automatic commit of package [spacewalk-setup] release [1.2.7-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
---
13 years, 7 months
Changes to 'refs/tags/spacewalk-branding-1.2.2-1'
by Miroslav Suchý
Tag 'spacewalk-branding-1.2.2-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-09-27 16:56 +0000
Tagging package [spacewalk-branding] version [1.2.2-1] in directory [branding/].
Changes since perl-NOCpulse-Probe-1.184.4-1:
Miroslav Suchý (2):
Automatic commit of package [spacewalk-setup] release [1.2.7-1].
Automatic commit of package [spacewalk-branding] release [1.2.2-1].
---
branding/spacewalk-branding.spec | 6 +++++-
rel-eng/packages/spacewalk-branding | 2 +-
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 11 ++++++++++-
4 files changed, 17 insertions(+), 4 deletions(-)
---
13 years, 7 months
Changes to 'refs/tags/perl-NOCpulse-Probe-1.184.4-1'
by Miroslav Suchý
Tag 'perl-NOCpulse-Probe-1.184.4-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-09-27 16:55 +0000
Tagging package [perl-NOCpulse-Probe] version [1.184.4-1] in directory [monitoring/PerlModules/NP/Probe/].
Changes since spacewalk-java-1.2.45-1:
Miroslav Suchý (1):
Automatic commit of package [perl-NOCpulse-Probe] release [1.184.4-1].
---
monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec | 5 ++++-
rel-eng/packages/perl-NOCpulse-Probe | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 7 months
2 commits - branding/spacewalk-branding.spec rel-eng/packages spacewalk/setup
by Miroslav Suchý
branding/spacewalk-branding.spec | 6 +++++-
rel-eng/packages/spacewalk-branding | 2 +-
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 11 ++++++++++-
4 files changed, 17 insertions(+), 4 deletions(-)
New commits:
commit 2d53ae2033347cc3c11078638aff14fc7011efe7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Sep 27 18:56:47 2010 +0200
Automatic commit of package [spacewalk-branding] release [1.2.2-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index 1d40183..064d3eb 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -1,5 +1,5 @@
Name: spacewalk-branding
-Version: 1.2.1
+Version: 1.2.2
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -80,6 +80,10 @@ rm -rf %{buildroot}
%changelog
+* Mon Sep 27 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.2-1
+- 627920 - Added a larger config file icon for symlinks. Thanks to Joshua Roys
+ (paji(a)redhat.com)
+
* Wed Sep 01 2010 Jan Pazdziora 1.2.1-1
- 567885 - "Spacewalk release 0.9" leads to 404 (coec(a)war.coesta.com)
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index 5bb3035..5db650b 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-1.2.1-1 branding/
+1.2.2-1 branding/
commit 0abfb5dd5937b68524185d7b5919a857a5da3b27
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Sep 27 18:56:05 2010 +0200
Automatic commit of package [spacewalk-setup] release [1.2.7-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 9323e21..4cd1887 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.2.6-1 spacewalk/setup/
+1.2.7-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index e75a16a..34078e8 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.2.6
+Version: 1.2.7
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,15 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Mon Sep 27 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.7-1
+- do not restart whole satellite when enabling monitoring
+ (mzazrivec(a)redhat.com)
+- use bind variables (mzazrivec(a)redhat.com)
+- don't use RHN::Utils in spacewalk-setup (mzazrivec(a)redhat.com)
+- need_oracle_9i_10g_upgrade is no longer needed (mzazrivec(a)redhat.com)
+- unify embedded database upgrades (mzazrivec(a)redhat.com)
+- use standard perl dbi in update_monitoring_scout (mzazrivec(a)redhat.com)
+
* Tue Sep 14 2010 Milan Zazrivec <mzazrivec(a)redhat.com> 1.2.6-1
- re-link /etc/smrsh/ack_enqueuer.pl during upgrade
- update monitoring scout setup directly by spacewalk-setup
13 years, 7 months
monitoring/PerlModules rel-eng/packages
by Miroslav Suchý
monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec | 5 ++++-
rel-eng/packages/perl-NOCpulse-Probe | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c975477e09a81a877f6845b45caf1663197beabe
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Sep 27 18:55:09 2010 +0200
Automatic commit of package [perl-NOCpulse-Probe] release [1.184.4-1].
diff --git a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
index bead81c..e2a8d27 100644
--- a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
+++ b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
@@ -2,7 +2,7 @@ Name: perl-NOCpulse-Probe
Summary: Monitoring probes for Spacewalk
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.184.3
+Version: 1.184.4
Release: 1%{?dist}
BuildArch: noarch
Group: Development/Libraries
@@ -146,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/NOCpulse::Probe::Shell::SQLPlus*
%changelog
+* Mon Sep 27 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.184.4-1
+- 636224 - fix typos in mange and output of --help
+
* Fri Aug 06 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.184.3-1
- 530519 - strip spaces from ipaddr
diff --git a/rel-eng/packages/perl-NOCpulse-Probe b/rel-eng/packages/perl-NOCpulse-Probe
index cee14fb..f408d0d 100644
--- a/rel-eng/packages/perl-NOCpulse-Probe
+++ b/rel-eng/packages/perl-NOCpulse-Probe
@@ -1 +1 @@
-1.184.3-1 monitoring/PerlModules/NP/Probe/
+1.184.4-1 monitoring/PerlModules/NP/Probe/
13 years, 7 months
Changes to 'refs/tags/spacewalk-schema-1.2.23-1'
by Miroslav Suchý
Tag 'spacewalk-schema-1.2.23-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-09-27 16:54 +0000
Tagging package [spacewalk-schema] version [1.2.23-1] in directory [schema/spacewalk/].
Changes since spacewalk-web-1.2.8-1:
Miroslav Suchý (1):
Automatic commit of package [spacewalk-schema] release [1.2.23-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
---
13 years, 7 months
Changes to 'refs/tags/spacewalk-java-1.2.45-1'
by Miroslav Suchý
Tag 'spacewalk-java-1.2.45-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-09-27 16:54 +0000
Tagging package [spacewalk-java] version [1.2.45-1] in directory [java/].
Changes since spacewalk-web-1.2.8-1:
Miroslav Suchý (2):
Automatic commit of package [spacewalk-schema] release [1.2.23-1].
Automatic commit of package [spacewalk-java] release [1.2.45-1].
---
java/spacewalk-java.spec | 20 +++++++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 9 ++++++++-
4 files changed, 29 insertions(+), 4 deletions(-)
---
13 years, 7 months
2 commits - java/spacewalk-java.spec rel-eng/packages schema/spacewalk
by Miroslav Suchý
java/spacewalk-java.spec | 20 +++++++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 9 ++++++++-
4 files changed, 29 insertions(+), 4 deletions(-)
New commits:
commit 52c586a08589c2bb11a07d34e72a6d48501fac89
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Sep 27 18:54:27 2010 +0200
Automatic commit of package [spacewalk-java] release [1.2.45-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index a349d3f..6e36e04 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.44
+Version: 1.2.45
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -336,6 +336,24 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Sep 27 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.45-1
+- Revert "591291 - added new API calls
+ channel.software.mergeErrataWithPackages" (aparsons(a)redhat.com)
+- fixing unit tests (jsherril(a)redhat.com)
+- fixing some strings associated with repo syncing (jsherril(a)redhat.com)
+- 636442 - fixing issue where calling packages.removePackage() api call could
+ result in a unique constraint exception (jsherril(a)redhat.com)
+- Fixed mroe checkstyle errors (paji(a)redhat.com)
+- Fixed a checkstyle error (paji(a)redhat.com)
+- 634230 - fixing issue where errata mailer would run continuously and never
+ mark the notification queue as being finished (jsherril(a)redhat.com)
+- 636610 - Small fix for the migration jsp bug (paji(a)redhat.com)
+- redundancy is the spice of life, adding back rhnServer to table joins since
+ its not so redundant. Reverts 9f09cf8bb9854c9f8bc6f4e497a49abec3affee2
+ (jsherril(a)redhat.com)
+- 629971 - added two county codes, better Localizer error message
+ (lzap+git(a)redhat.com)
+
* Thu Sep 23 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.44-1
- fixed erratamailer_fill_work_queue
- resource spelling script and several typo corrections
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index aca21da..825be3e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.44-1 java/
+1.2.45-1 java/
commit 5ca4719fc8eb7d5e218963f290328c6c45deb517
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Sep 27 18:54:12 2010 +0200
Automatic commit of package [spacewalk-schema] release [1.2.23-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index a70ce52..0ea08d8 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.2.22-1 schema/spacewalk/
+1.2.23-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index fd4503f..ddf89db 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.2.22
+Version: 1.2.23
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -59,6 +59,13 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Mon Sep 27 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.23-1
+- Marked PostgreSQL schema sources that are PostgreSQL-specific.
+ (jpazdziora(a)redhat.com)
+- The adler32 function does not seem to be used, removing.
+ (jpazdziora(a)redhat.com)
+- 636740 - asterisks in package search fixed (lzap+git(a)redhat.com)
+
* Mon Sep 20 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.22-1
- removed sequence used for rhnUserMessageStatus ids
13 years, 7 months