backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 716814008517e41ef81d0b45d6dd4db4622d545b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 30 09:49:36 2010 +0200
Automatic commit of package [spacewalk-backend] release [1.1.9-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 33b45bb..71466cb 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.1.8
+Version: 1.1.9
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -629,6 +629,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Apr 30 2010 Jan Pazdziora 1.1.9-1
+- 585233 - use log2stderr instead of the (debugging) print.
+- 585233 - fix the logic handling has_comps and missing comps_last_modified.
+- implemented <checksums> in <rhn-package-short> (michael.mraka(a)redhat.com)
+
* Thu Apr 29 2010 Jan Pazdziora 1.1.8-1
- 585233 - replace has-comps with rhn-channel-comps-last-modified.
- 585233 - use the rhn-channel-comps-last-modified element instead of boolean
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 790744f..6ae0e0e 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.1.8-1 backend/
+1.1.9-1 backend/
13 years, 11 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/taglibs/list/row/ExpandableRowRenderer.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 32c08337dc7dad2e6d085112609871ad89f57bcd
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Apr 29 18:49:43 2010 -0400
fixing RowRenderer, to do coloring more like the mockups
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/row/ExpandableRowRenderer.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/row/ExpandableRowRenderer.java
index 5c8da35..47f7919 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/row/ExpandableRowRenderer.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/row/ExpandableRowRenderer.java
@@ -40,10 +40,11 @@ public class ExpandableRowRenderer extends RowRenderer {
@Override
public String getRowClass(Object current) {
if (RhnListTagFunctions.isExpandable(current)) {
- return rowClasses[1];
+ rowNum++;
+ return rowClasses[rowNum%rowClasses.length];
}
else {
- return rowClasses[0];
+ return rowClasses[rowNum%rowClasses.length];
}
}
13 years, 11 months
java/code java/conf
by Partha Aji
java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java | 2 -
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp | 2 -
java/conf/cobbler/snippets/post_reactivation_key | 18 ++++++----
3 files changed, 14 insertions(+), 8 deletions(-)
New commits:
commit dad832de8102343edd6a21d1be42013115dd0b59
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Apr 29 17:05:20 2010 -0400
Made the post reactivation key logic more fail safe..
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java
index 380c86c..dfd44e6 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java
@@ -156,7 +156,7 @@ public class DataSetManipulator {
public List getAllData() {
List retval = new LinkedList();
retval.addAll(dataset);
- return retval;
+ return expand(retval);
}
/**
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp
index e874c45..50addb4 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp
@@ -43,7 +43,7 @@
<!-- Name Column -->
- <rl:column headerkey="systemlist.jsp.system">
+ <rl:column headerkey="systemlist.jsp.system" filterattr="id">
<rl:expandable rendericon="true">${current.key}</rl:expandable>
<rl:non-expandable rendericon="true">${current.id}</rl:non-expandable>
diff --git a/java/conf/cobbler/snippets/post_reactivation_key b/java/conf/cobbler/snippets/post_reactivation_key
index 37d564d..df38e4a 100644
--- a/java/conf/cobbler/snippets/post_reactivation_key
+++ b/java/conf/cobbler/snippets/post_reactivation_key
@@ -2,10 +2,16 @@
import xmlrpclib
import os.path
system_id = "/root/systemid.old"
-if os.path.exists(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")
- f.write(key)
- f.close()
+try:
+ if os.path.exists(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")
+ f.write(key)
+ f.close()
+except:
+ # xml rpc due to a old/bad system id
+ # we don't care about those
+ # we'll register those as new.
+ pass
13 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.1.9-1'
by Partha Aji
Tag 'spacewalk-java-1.1.9-1' created by Partha Aji <paji(a)redhat.com> at 2010-04-29 19:34 +0000
Tagging package [spacewalk-java] version [1.1.9-1] in directory [java/].
Changes since rhn-client-tools-1.1.2-1:
Jan Pazdziora (2):
585233 - fix the logic handling has_comps and missing comps_last_modified.
585233 - use log2stderr instead of the (debugging) print.
Joshua Roys (4):
Make rhncfg-client verify use lstat
Add an 'only' mode of operation to rhncfg-client verify
Remove spammy audit types from default search
587285 - provide a useful error message when lsetfilecon fails
Michael Mraka (1):
implemented <checksums> in <rhn-package-short>
Partha Aji (2):
Added changes to KS file to deal with dup profile reactivations
Automatic commit of package [spacewalk-java] release [1.1.9-1].
---
backend/satellite_tools/disk_dumper/iss.py | 2
backend/satellite_tools/exporter/exportLib.py | 42 +++--
backend/satellite_tools/xmlSource.py | 3
client/tools/rhncfg/config_client/rhncfgcli_verify.py | 18 ++
client/tools/rhncfg/config_common/transactions.py | 7
java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java | 11 +
java/code/src/com/redhat/rhn/manager/audit/AuditManager.java | 5
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 14 +
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSnippetLister.java | 10 +
java/conf/cobbler/snippets/keep_system_id | 77 ++++++++++
java/conf/cobbler/snippets/post_reactivation_key | 11 +
java/conf/cobbler/snippets/redhat_register | 27 +++
java/spacewalk-java.spec | 17 ++
rel-eng/packages/spacewalk-java | 2
14 files changed, 220 insertions(+), 26 deletions(-)
---
13 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Partha Aji
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 5af24776103861ac138cfe5f1f699e9b046d5204
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Apr 29 15:33:59 2010 -0400
Automatic commit of package [spacewalk-java] release [1.1.9-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index aa30299..7d570f9 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.1.8
+Version: 1.1.9
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -319,6 +319,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Apr 29 2010 Partha Aji <paji(a)redhat.com> 1.1.9-1
+- Added new cobbler snippets to enable sytem reactivation on bare metal reprovisioning
+ (paji(a)redhat.com)
+- Added code to show general snippets created in spacewalk.
+- Remove spammy audit types from default search (joshua.roys(a)gtri.gatech.edu)
+
* Thu Apr 29 2010 Tomas Lestach <tlestach(a)redhat.com> 1.1.8-1
- introducing DistChannelHandler (tlestach(a)redhat.com)
- add 2 new DistChannelMap related queries with appropriate methods
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5f0df26..1667882 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.1.8-1 java/
+1.1.9-1 java/
13 years, 11 months
java/code java/conf java/spacewalk-java.spec
by Partha Aji
java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java | 11 +
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 14 +
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSnippetLister.java | 10 +
java/conf/cobbler/snippets/keep_system_id | 77 ++++++++++
java/conf/cobbler/snippets/post_reactivation_key | 11 +
java/conf/cobbler/snippets/redhat_register | 27 +++
java/spacewalk-java.spec | 9 +
7 files changed, 157 insertions(+), 2 deletions(-)
New commits:
commit 7efdf40edee66d6684c93bac1093eb2678dc0902
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Apr 29 15:27:47 2010 -0400
Added changes to KS file to deal with dup profile reactivations
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java b/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java
index 1e16548..84dab98 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java
@@ -251,9 +251,14 @@ public class CobblerSnippet implements Comparable {
* @return the base name of the snippet file
*/
public String getName() {
+ if (path.getParentFile().equals(getSpacewalkSnippetsDir())) {
+ return getSpacewalkSnippetsDir().getName() +
+ File.separator + path.getName();
+ }
return path.getName();
}
+
/**
* Returns the name of the directory hosting the snippet file (same as dirname)
* i.e. returns ${spacewalk.snippets.dir}/${org.id}
@@ -322,6 +327,12 @@ public class CobblerSnippet implements Comparable {
}
private static boolean isCommonPath(File path) {
+ boolean isFileInsideSpacewalkTopLevelDir = path.isFile() &&
+ path.getParentFile().equals(getSpacewalkSnippetsDir());
+ if (isFileInsideSpacewalkTopLevelDir) {
+ return true;
+ }
+
return !path.getAbsolutePath().startsWith(
getSpacewalkSnippetsDir().getAbsolutePath()) &&
path.getAbsolutePath().
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index 7c23ddc..240f5b1 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -55,6 +55,12 @@ public class KickstartFormatter {
private static Logger log = Logger.getLogger(KickstartFormatter.class);
+
+ private static final String REDHAT_REGISTER_SNIPPET = "spacewalk/redhat_register";
+ private static final String POST_REACTIVATION_SNIPPET =
+ "spacewalk/post_reactivation_key";
+ private static final String KEEP_SYSTEM_ID_SNIPPET = "spacewalk/keep_system_id";
+
private static final String RAW_START = "#raw";
private static final String RAW_END = "#end raw";
private static final String NEWLINE = "\n";
@@ -215,17 +221,21 @@ public class KickstartFormatter {
buf.append(getPackageOptions());
buf.append(NEWLINE);
buf.append(getPackages());
- buf.append(NEWLINE);
+ buf.append(NEWLINE);
buf.append("%" + KickstartScript.TYPE_PRE);
buf.append(NEWLINE);
buf.append("$kickstart_start");
buf.append(NEWLINE);
addCobblerSnippet(buf, "pre_install_network_config");
buf.append(NEWLINE);
+ addCobblerSnippet(buf, KEEP_SYSTEM_ID_SNIPPET);
+ buf.append(NEWLINE);
buf.append(getPrePost(KickstartScript.TYPE_PRE));
buf.append(NEWLINE);
buf.append(getNoChroot());
buf.append(NEWLINE);
+ addCobblerSnippet(buf, POST_REACTIVATION_SNIPPET);
+ buf.append(NEWLINE);
buf.append(getRhnPost());
buf.append(MOTD_FOOTER);
buf.append(NEWLINE);
@@ -694,7 +704,7 @@ public class KickstartFormatter {
retval.append("/etc/init.d/haldaemon restart" + NEWLINE);
}
retval.append("# begin cobbler snippet" + NEWLINE);
- retval.append("$SNIPPET('redhat_register')" + NEWLINE);
+ addCobblerSnippet(retval, REDHAT_REGISTER_SNIPPET);
retval.append("# end cobbler snippet" + NEWLINE);
retval.append(NEWLINE);
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSnippetLister.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSnippetLister.java
index 5e3fb72..70657a4 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSnippetLister.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSnippetLister.java
@@ -73,6 +73,15 @@ public class CobblerSnippetLister extends BaseManager {
}
}
+ private void loadSnippetsInSpacewalkDir(List<CobblerSnippet> snippetFiles) {
+ for (File path : CobblerSnippet.getSpacewalkSnippetsDir().listFiles()) {
+ if (path.isFile() && !path.isHidden()) {
+ snippetFiles.add(CobblerSnippet.loadReadOnly(path));
+ }
+ }
+
+ }
+
/**
* Returns a list of snippets accessible to this user
* @param user the user has to be atleast a
@@ -92,6 +101,7 @@ public class CobblerSnippetLister extends BaseManager {
List<CobblerSnippet> snippetFiles = new LinkedList<CobblerSnippet>();
loadDefaultSnippets(CobblerSnippet.getCobblerSnippetsDir(),
snippetFiles);
+ loadSnippetsInSpacewalkDir(snippetFiles);
return snippetFiles;
}
diff --git a/java/conf/cobbler/snippets/keep_system_id b/java/conf/cobbler/snippets/keep_system_id
new file mode 100644
index 0000000..c27e05d
--- /dev/null
+++ b/java/conf/cobbler/snippets/keep_system_id
@@ -0,0 +1,77 @@
+#raw
+%pre
+echo "Saving RHN keys..." > /dev/ttyS0
+SYSTEM_ID=/etc/sysconfig/rhn/systemid
+rhn_keys_found=no
+
+insmod /lib/jbd.o
+insmod /lib/ext3.o
+
+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}')"
+done
+
+# Try to find the keys on ordinary partitions
+for disk in $DISKS; do
+ name=test-$(basename $disk)
+ mkdir -p /tmp/$name
+ mount $disk /tmp/$name
+ [ $? -eq 0 ] || continue # Skip to the next partition if the mount fails
+
+ # Copy current RHN host keys out to be reused
+ if [ -f /tmp/${name}$SYSTEM_ID ]; then
+ cp -a /tmp/${name}$SYSTEM_ID /tmp/rhn
+ rhn_keys_found="yes"
+ umount /tmp/$name
+ break
+ fi
+ umount /tmp/$name
+ rm -r /tmp/$name
+done
+
+# Try LVM if that didn't work
+if [ "$rhn_keys_found" = "no" ]; then
+ lvm lvmdiskscan
+ vgs=$(lvm vgs | tail -n +2 | awk '{ print $1 }')
+ for vg in $vgs; do
+ # Activate any VG we found
+ lvm vgchange -ay $vg
+ done
+
+ lvs=$(lvm lvs | tail -n +2 | awk '{ print "/dev/" $2 "/" $1 }')
+ for lv in $lvs; do
+ tmpdir=$(mktemp -d findkeys.XXXXXX)
+ mkdir -p /tmp/${tmpdir}
+ mount $lv /tmp/${tmpdir} || continue # Skip to next volume if this fails
+
+ # Let's see if the keys are in there
+ if [ -f /tmp/${tmpdir}$SYSTEM_ID ]; then
+ cp -a /tmp/${tmpdir}$SYSTEM_ID /tmp/rhn/
+ rhn_keys_found="yes"
+ umount /tmp/${tmpdir}
+ break # We're done!
+ fi
+ umount /tmp/${tmpdir}
+ rm -r /tmp/${tmpdir}
+ done
+
+ # And clean up..
+ for vg in $vgs; do
+ lvm vgchange -an $vg
+ 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
new file mode 100644
index 0000000..37d564d
--- /dev/null
+++ b/java/conf/cobbler/snippets/post_reactivation_key
@@ -0,0 +1,11 @@
+%post --interpreter /usr/bin/python
+import xmlrpclib
+import os.path
+system_id = "/root/systemid.old"
+if os.path.exists(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")
+ f.write(key)
+ f.close()
+
diff --git a/java/conf/cobbler/snippets/redhat_register b/java/conf/cobbler/snippets/redhat_register
new file mode 100644
index 0000000..0ad01a6
--- /dev/null
+++ b/java/conf/cobbler/snippets/redhat_register
@@ -0,0 +1,27 @@
+# begin Red Hat management server registration
+#if $redhat_management_type != "off" and $redhat_management_key != ""
+mkdir -p /usr/share/rhn/
+ #if $redhat_management_type == "site"
+ #set $mycert_file = "RHN-ORG-TRUSTED-SSL-CERT"
+ #set $mycert = "/usr/share/rhn/" + $mycert_file
+wget http://$redhat_management_server/pub/RHN-ORG-TRUSTED-SSL-CERT -O $mycert
+perl -npe 's/RHNS-CA-CERT/$mycert_file/g' -i /etc/sysconfig/rhn/*
+ #end if
+ #if $redhat_management_type == "hosted"
+ #set $mycert = "/usr/share/rhn/RHNS-CA-CERT"
+ #end if
+ #set $endpoint = "https://%s/XMLRPC" % $redhat_management_server
+key=""
+if [ -f /tmp/key ]; then
+ key=`cat /tmp/key`
+fi
+
+if [ \$key ]; then
+ rhnreg_ks --serverUrl=$endpoint --sslCACert=$mycert --activationkey=\$key,$redhat_management_key
+else
+ rhnreg_ks --serverUrl=$endpoint --sslCACert=$mycert --activationkey=$redhat_management_key
+fi
+#else
+# not configured to register to any Red Hat management server (ok)
+#end if
+# end Red Hat management server registration
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3a3aaae..aa30299 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -244,6 +244,11 @@ install -m 755 conf/logrotate/rhn_web_api $RPM_BUILD_ROOT/%{_sysconfdir}/logrota
install -m 755 scripts/taskomatic $RPM_BUILD_ROOT/%{_initrddir}
install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar $RPM_BUILD_ROOT/%{_datadir}/rhn/lib
install -m 644 conf/log4j.properties.taskomatic $RPM_BUILD_ROOT/%{_datadir}/rhn/classes/log4j.properties
+
+install -m 644 conf/cobbler/snippets/keep_system_id $RPM_BUILD_ROOT/%{cobdirsnippets}/keep_system_id
+install -m 644 conf/cobbler/snippets/post_reactivation_key $RPM_BUILD_ROOT/%{cobdirsnippets}/post_reactivation_key
+install -m 644 conf/cobbler/snippets/redhat_register $RPM_BUILD_ROOT/%{cobdirsnippets}/redhat_register
+
ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT/%{_bindir}/taskomaticd
ln -s -f %{_javadir}/ojdbc14.jar $RPM_BUILD_ROOT%{jardir}/ojdbc14.jar
install -d -m 755 $RPM_BUILD_ROOT/%{realcobsnippetsdir}
@@ -274,6 +279,9 @@ fi
%dir %{cobprofdirup}
%dir %{cobprofdirwiz}
%dir %{cobdirsnippets}
+%config %{cobdirsnippets}/keep_system_id
+%config %{cobdirsnippets}/post_reactivation_key
+%config %{cobdirsnippets}/redhat_register
%{appdir}/*
%if 0%{?rhel} && 0%{?rhel} < 6
%config(noreplace) %{_sysconfdir}/tomcat5/Catalina/localhost/rhn.xml
@@ -296,6 +304,7 @@ fi
%config %{_sysconfdir}/rhn/default/rhn_org_quartz.conf
%config %{_sysconfdir}/logrotate.d/rhn_web_api
+
%files lib
%defattr(644, root, root)
%{_datadir}/rhn/classes/log4j.properties
13 years, 11 months
client/tools
by Joshua Roys
client/tools/rhncfg/config_common/transactions.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit cae64f15933666eca92edaa3dad2d00f22954113
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Thu Apr 29 17:04:21 2010 +0000
587285 - provide a useful error message when lsetfilecon fails
diff --git a/client/tools/rhncfg/config_common/transactions.py b/client/tools/rhncfg/config_common/transactions.py
index 089dd0b..ca5a3f0 100644
--- a/client/tools/rhncfg/config_common/transactions.py
+++ b/client/tools/rhncfg/config_common/transactions.py
@@ -148,8 +148,11 @@ class DeployTransaction:
sectx = file_info.get('selinux_ctx')
if sectx is not None and sectx is not "":
log_debug(1, "selinux context: " + sectx);
- if lsetfilecon(temp_file_path, sectx) < 0:
- raise Exception("failed to set selinux context on %s" % dest_path)
+ try:
+ if lsetfilecon(temp_file_path, sectx) < 0:
+ raise Exception("failed to set selinux context on %s" % dest_path)
+ except OSError, e:
+ raise Exception("failed to set selinux context on %s" % dest_path, e), None, sys.exc_info()[2]
except OSError, e:
if e.errno == errno.EPERM and not strict_ownership:
13 years, 11 months
2 commits - client/tools java/code
by Joshua Roys
client/tools/rhncfg/config_client/rhncfgcli_verify.py | 16 +++++++++++
java/code/src/com/redhat/rhn/manager/audit/AuditManager.java | 5 ---
2 files changed, 17 insertions(+), 4 deletions(-)
New commits:
commit 98385232ab52e6e48383baf695f213d712a6ad93
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Fri Apr 9 13:23:24 2010 +0000
Remove spammy audit types from default search
This removes the hundreds, and possibly thousands, of cron entries
from the default search view.
diff --git a/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java b/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
index 4bef7e3..f109f3f 100644
--- a/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
+++ b/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
@@ -143,12 +143,9 @@ public class AuditManager /* extends BaseManager */ {
types.put("default", new String[]{
"USER",
- "LOGIN",
"USER_AUTH",
- "USER_ACCT",
"USER_MGMT",
- "USER_START",
- "USER_END",
+ "USER_ERR",
"USER_LOGIN",
"USER_LOGOUT",
"ADD_USER",
commit da20ecf89687c4151ab725b84f2725abdcd53b34
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Thu Apr 15 15:35:35 2010 +0000
Add an 'only' mode of operation to rhncfg-client verify
This will only display files that differ.
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_verify.py b/client/tools/rhncfg/config_client/rhncfgcli_verify.py
index ca9e6a1..caa30b5 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_verify.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_verify.py
@@ -36,6 +36,12 @@ class Handler(handler_base.HandlerBase):
action="count",
help="Increase the amount of output detail.",
),
+ handler_base.HandlerBase._option_class(
+ '--only',
+ "-o",
+ action="count",
+ help="Only show files that differ.",
+ ),
]
# Main function to be run
@@ -122,6 +128,14 @@ class Handler(handler_base.HandlerBase):
if len(fdict['selinux']) > 0:
(src_selinux, dst_selinux) = fdict['selinux'].split('|')
+ if self.options.only:
+ sum = 0
+ for key in fdict.keys():
+ if key != 'file':
+ sum += len(fdict[key])
+ if sum == 0:
+ continue
+
print outstring % {
"status" : formatstr % (maxlenarr['status'], fdict['status']),
"owner" : formatstr % (maxlenarr['owner'], fdict['owner']),
@@ -144,6 +158,8 @@ class Handler(handler_base.HandlerBase):
outstring = "%*s %s"
maxlen = max(map(lambda x: len(x['status']), ret)) + 1
for fdict in ret:
+ if self.options.only and len(fdict['status']) == 0:
+ continue
print outstring % (maxlen, fdict['status'], fdict['file'])
def _process_file(self, *args):
13 years, 11 months
client/tools
by Joshua Roys
client/tools/rhncfg/config_client/rhncfgcli_verify.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e47d872af366157d27226301d036b1e66e5ba408
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Thu Apr 15 15:34:52 2010 +0000
Make rhncfg-client verify use lstat
Otherwise it would de-reference symlinks and report on them.
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_verify.py b/client/tools/rhncfg/config_client/rhncfgcli_verify.py
index 3c97102..ca9e6a1 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_verify.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_verify.py
@@ -159,7 +159,7 @@ class Handler(handler_base.HandlerBase):
#Stat the destination file
try:
- dst_stat = os.stat(dst)
+ dst_stat = os.lstat(dst)
except:
stat_err = 1
13 years, 11 months
2 commits - backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/disk_dumper/iss.py | 2 +-
backend/satellite_tools/xmlSource.py | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit cc7e231134009e7a502b3b00e9c6a2dab6f11f93
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 29 17:00:14 2010 +0200
585233 - use log2stderr instead of the (debugging) print.
diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py
index fb2a463..3359358 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -570,7 +570,7 @@ class Dumper(dumper.XML_Dumper):
relative_filename = self.channel_comps[channel['channel_id']]
full_filename = os.path.join(CFG.MOUNT_POINT, self.channel_comps[channel['channel_id']])
target_filename = self.fm.getChannelCompsFile(channel['label'])
- print "Need to copy %s to %s" % ( full_filename, target_filename )
+ log2stderr(3, "Need to copy %s to %s" % ( full_filename, target_filename ))
# the comps.xml file will get gzipped afterwards
# but it's still faster to do hardlink first
commit 5e61058e49e3a24ac5912703af6d31d53a5e0340
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 29 16:57:52 2010 +0200
585233 - fix the logic handling has_comps and missing comps_last_modified.
diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py
index 7064af0..1da46f2 100644
--- a/backend/satellite_tools/xmlSource.py
+++ b/backend/satellite_tools/xmlSource.py
@@ -470,7 +470,8 @@ class ChannelItem(BaseItem):
BaseItem.populateFromElements(self, obj, elements)
if obj['checksum_type'] == 'sha':
obj['checksum_type'] = 'sha1'
- if not obj.has_key('comps_last_modified') and obj.has_key('has_comps'):
+ if (not obj.has_key('comps_last_modified') or obj['comps_last_modified'] == None) \
+ and (obj.has_key('has_comps') and obj['has_comps'] == 'True'):
obj['comps_last_modified'] = obj['last_modified']
addItem(ChannelItem)
13 years, 11 months