Branch 'VADER' - web/html
by Shannon Hughes
web/html/errors/error.html | 134 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 134 insertions(+)
New commits:
commit 8c0582404a0c8a75419016ffa9ace89a6589a120
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Tue Jun 2 11:33:42 2009 -0400
500709 - static html for non session error pages
diff --git a/web/html/errors/error.html b/web/html/errors/error.html
new file mode 100644
index 0000000..265323c
--- /dev/null
+++ b/web/html/errors/error.html
@@ -0,0 +1,134 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en"><head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+ <title>Error</title>
+ <link rel="shortcut icon" href="/img/favicon.ico">
+ <link rel="stylesheet" href="/css/rhn-base.css" type="text/css">
+ <!--[if IE]>
+ <link rel="stylesheet" type="text/css" href="/css/rhn-iecompat.css" />
+ <![endif]-->
+ <script src="/javascript/prototype-1.js"></script>
+
+
+
+ </head><body><div class="wrap" id="top-wrap">
+
+
+
+
+
+
+<div id="utility">
+ <div id="utilityLinks">
+<p id="linx"><span class="hide"><strong>Shortcuts:</strong> </span><a href="http://kbase.redhat.com/">Knowledgebase</a> <span class="navPipe">|</span> <a href="https://scooby.rdu.redhat.com/help">Documentation</a></p>
+ </div>
+ <div id="utilityAccount">
+
+ </div>
+
+</div>
+
+<div id="header">
+ <a href="/"><img src="/img/logo.png" id="rhnLogo" height="52" width="228"></a>
+ <div id="searchbar">
+ <div id="searchbarinner">
+ <form name="form1" action="/rhn/Search.do" method="get">
+ <select name="search_type">
+
+ <option value="systems">Systems</option>
+
+ <option value="packages">Packages</option>
+ <option value="errata">Errata</option>
+ <option value="docs">Documentation</option>
+ </select><input name="search_string" maxlength="40" size="20" type="text">
+
+ <input name="submitted" value="true" type="hidden">
+ <input class="button" name="image-1" value="Search" type="submit" align="top"></form>
+ </div>
+ </div>
+</div>
+
+<div id="navWrap">
+<div id="mainNavWrap">
+
+
+<ul>
+<li id="mainFirst-active"><a href="/">Sign In</a></li>
+
+<li id="mainLast"><a href="/help/about.pxt" class="mainLastLink">About</a></li>
+</ul>
+</div><!-- end mainNavWrap -->
+</div><!-- end navWrap -->
+
+
+
+
+
+
+
+
+<div id="bar">
+
+<div id="systembar">
+<div id="systembarinner">
+
+
+
+
+
+
+<div>
+
+</div>
+
+
+</div>
+</div>
+
+</div>
+<!-- close bar -->
+
+
+
+
+ </div>
+ <div class="wrap" id="bottom-wrap">
+ <div id="content">
+ <table width="100%" cellspacing="0">
+ <tbody><tr>
+ <td class="sidebar">
+
+
+<div id="sidenavp"><ul></ul>
+</div>
+
+ </td>
+ <td class="page-content" width="100%">
+
+
+ <h1>Page Error</h1>
+ <p>Error requesting page. Some possible causes of this problem:</p>
+
+ <ol>
+ <li>Page no longer exists</li>
+ <li>Page permission issue</li>
+ <li>You are doing something naughty</li>
+ </ol>
+
+ <p>Cookie support required. Note: cookies are <strong>not</strong> used
+ for marketing purposes; we use them strictly to keep track
+ of your login state and other state data absolutely
+ necessary for the proper functioning of your account.</p>
+
+ </td>
+ </tr>
+ </tbody></table>
+
+ <div id="footer">
+ Copyright © 2002-08 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ </div>
+
+ </div> <!-- close content -->
+ </div> <!-- close wrap -->
+
+ </body></html>
14 years, 11 months
Branch 'VADER' - 2 commits - backend/satellite_tools selinux/oracle-selinux
by Milan Zazrivec
backend/satellite_tools/rhn-db-stats | 5 +++--
selinux/oracle-selinux/oracle.te | 3 +++
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 6c3453ae93c066a2100f5d5379b8a047d13ed648
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 2 17:19:56 2009 +0200
allow sqlplus to read shell input redirects
allow shell constructs:
sqlplus $connect << EOS
...
EOS
diff --git a/selinux/oracle-selinux/oracle.te b/selinux/oracle-selinux/oracle.te
index 00148a4..f0c35de 100644
--- a/selinux/oracle-selinux/oracle.te
+++ b/selinux/oracle-selinux/oracle.te
@@ -166,6 +166,9 @@ allow oracle_db_t oracle_tnslsnr_t:fd use;
allow oracle_db_t oracle_tnslsnr_t:fifo_file { rw_file_perms };
allow oracle_db_t oracle_tnslsnr_t:tcp_socket { rw_socket_perms };
+# Allow sqlplus to read shell redirects
+allow oracle_sqlplus_t tmp_t:file { read ioctl getattr };
+
# sqlplus can run sql scripts
oracle_script(oracle_sqlplus_t)
commit 9d1fb8cd12312fe261c64807d2d2ffc81d376ac8
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 2 16:14:33 2009 +0200
allow rhn-db-stats to write to arbitrary location with running selinux
diff --git a/backend/satellite_tools/rhn-db-stats b/backend/satellite_tools/rhn-db-stats
index 61fdfab..da6165b 100755
--- a/backend/satellite_tools/rhn-db-stats
+++ b/backend/satellite_tools/rhn-db-stats
@@ -8,8 +8,9 @@ fi
CONNECT=$(awk '/default_db/ {split($0,a,"="); print a[2]}' /etc/rhn/rhn.conf)
[ -n "$2" ] && CONNECT=$2
-sqlplus $CONNECT >& /dev/null << EOS
-spool $1
+# sqlplus ... | cat > ... is here to fool selinux, since oracle_sqlplus_t
+# cannot write just anywhere
+sqlplus $CONNECT << EOS | cat > $1
set echo on
set serverout on
set pagesize 2000 linesize 145
14 years, 11 months
2 commits - backend/satellite_tools selinux/oracle-selinux
by Milan Zazrivec
backend/satellite_tools/rhn-db-stats | 5 +++--
selinux/oracle-selinux/oracle.te | 3 +++
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 722449b286675e1f169079f6febe1e0071ddf6e0
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 2 17:19:56 2009 +0200
allow sqlplus to read shell input redirects
allow shell constructs:
sqlplus $connect << EOS
...
EOS
diff --git a/selinux/oracle-selinux/oracle.te b/selinux/oracle-selinux/oracle.te
index 00148a4..f0c35de 100644
--- a/selinux/oracle-selinux/oracle.te
+++ b/selinux/oracle-selinux/oracle.te
@@ -166,6 +166,9 @@ allow oracle_db_t oracle_tnslsnr_t:fd use;
allow oracle_db_t oracle_tnslsnr_t:fifo_file { rw_file_perms };
allow oracle_db_t oracle_tnslsnr_t:tcp_socket { rw_socket_perms };
+# Allow sqlplus to read shell redirects
+allow oracle_sqlplus_t tmp_t:file { read ioctl getattr };
+
# sqlplus can run sql scripts
oracle_script(oracle_sqlplus_t)
commit a855f9159258f5664e83a50fad6fa189f2b1e022
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 2 16:14:33 2009 +0200
allow rhn-db-stats to write to arbitrary location with running selinux
diff --git a/backend/satellite_tools/rhn-db-stats b/backend/satellite_tools/rhn-db-stats
index 61fdfab..da6165b 100755
--- a/backend/satellite_tools/rhn-db-stats
+++ b/backend/satellite_tools/rhn-db-stats
@@ -8,8 +8,9 @@ fi
CONNECT=$(awk '/default_db/ {split($0,a,"="); print a[2]}' /etc/rhn/rhn.conf)
[ -n "$2" ] && CONNECT=$2
-sqlplus $CONNECT >& /dev/null << EOS
-spool $1
+# sqlplus ... | cat > ... is here to fool selinux, since oracle_sqlplus_t
+# cannot write just anywhere
+sqlplus $CONNECT << EOS | cat > $1
set echo on
set serverout on
set pagesize 2000 linesize 145
14 years, 11 months
Branch 'VADER' - backend/apache-conf spacewalk/config spacewalk/setup
by Devan Goodwin
backend/apache-conf/zz-spacewalk-server.conf | 6 +++++
spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf | 15 +++++++++++++
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 14 ------------
spacewalk/config/spacewalk-config.spec | 1
spacewalk/setup/share/ssl.conf.6 | 4 +++
spacewalk/setup/spacewalk-setup.spec | 1
6 files changed, 27 insertions(+), 14 deletions(-)
New commits:
commit d80331d696112db4a2bb44ddb505c89ad5cacd73
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Tue Jun 2 11:40:15 2009 -0300
Fixes to support mod_jk >= 2.2.26.
Using a newer version of mod_jk (which we only use on RHEL 4 installs)
resulted in apache not being able to communicate with tomcat. This was
caused by a change in 2.2.26 where mod_jk apache directives must be
defined per vhost, rather than globally. To correct we must specify
JkMountCopy in the vhost definitions in ssl.conf (which we modify during
spacewalk-setup) as well as zz-spacewalk-server.conf.
Because of apache loading order issues, this commit introduces
00-spacewalk-mod_jk.conf to load mod_jk and configure it early.
diff --git a/backend/apache-conf/zz-spacewalk-server.conf b/backend/apache-conf/zz-spacewalk-server.conf
index be1deda..0d45d9d 100644
--- a/backend/apache-conf/zz-spacewalk-server.conf
+++ b/backend/apache-conf/zz-spacewalk-server.conf
@@ -14,6 +14,12 @@
RewriteRule ^(/.*\.(do|jsp)(\?.*)?)$ ajp://localhost:8009/$1 [P]
RewriteRule ^/rpc/api /rhn/rpc/api [P]
</IfModule>
+
+<IfModule mod_jk.c>
+ # Inherit the mod_jk settings defined in zz-spacewalk-www.conf
+ JkMountCopy On
+</IfModule>
+
<Directory "/var/www/html/*">
AllowOverride all
</Directory>
diff --git a/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf b/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf
new file mode 100644
index 0000000..ed802af
--- /dev/null
+++ b/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf
@@ -0,0 +1,15 @@
+<IfVersion < 2.1>
+ LoadModule jk_module modules/mod_jk.so
+</IfVersion>
+
+<IfModule mod_jk.c>
+ JkWorkersFile /etc/rhn/satellite-httpd/conf/workers.properties
+ JkLogLevel info
+ JkLogFile /var/log/httpd/mod_jk.log
+ JkMount /rhn/* ajp13
+ JkMount /rhn ajp13
+ JkMount /*.do ajp13
+ JkMount /*.jsp ajp13
+ JkHTTPSIndicator HTTPS
+</IfModule>
+
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 981b291..3e49b75 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -61,9 +61,6 @@ LoadModule version_module modules/mod_version.so
LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
</IfModule>
</IfVersion>
-<IfVersion < 2.1>
-LoadModule jk_module modules/mod_jk.so
-</IfVersion>
# Turn rewrite engine on so we can use it for
# kickstart requests.
@@ -76,17 +73,6 @@ RewriteRule ^/rhn(.*) ajp://localhost:8009/rhn$1 [P]
RewriteRule ^(/.*\.(do|jsp)(\?.*)?)$ ajp://localhost:8009/$1 [P]
</IfModule>
-<IfModule mod_jk.c>
- JkWorkersFile /etc/rhn/satellite-httpd/conf/workers.properties
- JkLogLevel info
- JkLogFile /var/log/httpd/mod_jk.log
- JkMount /rhn/* ajp13
- JkMount /rhn ajp13
- JkMount /*.do ajp13
- JkMount /*.jsp ajp13
- JkHTTPSIndicator HTTPS
-</IfModule>
-
RedirectMatch ^/renew/.* http://rhn.redhat.com
RedirectMatch ^/index\.html$ /rhn/Login.do
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index d8f136f..cb69c66 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -58,6 +58,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(0755,root,root) %{_sysconfdir}/rhn/satellite-httpd/conf/startup.pl
%config(noreplace) %{_sysconfdir}/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf
%config(noreplace) %{_sysconfdir}/httpd/conf.d/zz-spacewalk-www.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/00-spacewalk-mod_jk.conf
%config(noreplace) %{_sysconfdir}/rhn/satellite-httpd/conf/workers.properties
%config(noreplace) %{_sysconfdir}/webapp-keyring.gpg
%config(noreplace) %{_var}/lib/cobbler/kickstarts/spacewalk-sample.ks
diff --git a/spacewalk/setup/share/ssl.conf.6 b/spacewalk/setup/share/ssl.conf.6
new file mode 100644
index 0000000..76cd3e4
--- /dev/null
+++ b/spacewalk/setup/share/ssl.conf.6
@@ -0,0 +1,4 @@
+[ \t]*<IfModule mod_jk.c>\s*\n\s*JkMountCopy.*\n\s*</IfModule>\s*\n
+<IfModule mod_jk.c>
+ JkMountCopy On
+</IfModule>
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index f75a493..b5abd01 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -61,6 +61,7 @@ install -m 0644 share/ssl.conf.2 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/ssl.conf.3 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/ssl.conf.4 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/ssl.conf.5 %{buildroot}/%{_datadir}/spacewalk/setup/
+install -m 0644 share/ssl.conf.6 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/old-jvm-list %{buildroot}/%{_datadir}/spacewalk/setup/
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/upgrade
14 years, 11 months
backend/apache-conf spacewalk/config spacewalk/setup
by Devan Goodwin
backend/apache-conf/zz-spacewalk-server.conf | 6 +++++
spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf | 15 +++++++++++++
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 14 ------------
spacewalk/config/spacewalk-config.spec | 1
spacewalk/setup/share/ssl.conf.6 | 4 +++
spacewalk/setup/spacewalk-setup.spec | 1
6 files changed, 27 insertions(+), 14 deletions(-)
New commits:
commit 215b6172009d2769f87229da6fd909dbea7aa2d1
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Tue Jun 2 11:40:15 2009 -0300
Fixes to support mod_jk >= 2.2.26.
Using a newer version of mod_jk (which we only use on RHEL 4 installs)
resulted in apache not being able to communicate with tomcat. This was
caused by a change in 2.2.26 where mod_jk apache directives must be
defined per vhost, rather than globally. To correct we must specify
JkMountCopy in the vhost definitions in ssl.conf (which we modify during
spacewalk-setup) as well as zz-spacewalk-server.conf.
Because of apache loading order issues, this commit introduces
00-spacewalk-mod_jk.conf to load mod_jk and configure it early.
diff --git a/backend/apache-conf/zz-spacewalk-server.conf b/backend/apache-conf/zz-spacewalk-server.conf
index be1deda..0d45d9d 100644
--- a/backend/apache-conf/zz-spacewalk-server.conf
+++ b/backend/apache-conf/zz-spacewalk-server.conf
@@ -14,6 +14,12 @@
RewriteRule ^(/.*\.(do|jsp)(\?.*)?)$ ajp://localhost:8009/$1 [P]
RewriteRule ^/rpc/api /rhn/rpc/api [P]
</IfModule>
+
+<IfModule mod_jk.c>
+ # Inherit the mod_jk settings defined in zz-spacewalk-www.conf
+ JkMountCopy On
+</IfModule>
+
<Directory "/var/www/html/*">
AllowOverride all
</Directory>
diff --git a/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf b/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf
new file mode 100644
index 0000000..ed802af
--- /dev/null
+++ b/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf
@@ -0,0 +1,15 @@
+<IfVersion < 2.1>
+ LoadModule jk_module modules/mod_jk.so
+</IfVersion>
+
+<IfModule mod_jk.c>
+ JkWorkersFile /etc/rhn/satellite-httpd/conf/workers.properties
+ JkLogLevel info
+ JkLogFile /var/log/httpd/mod_jk.log
+ JkMount /rhn/* ajp13
+ JkMount /rhn ajp13
+ JkMount /*.do ajp13
+ JkMount /*.jsp ajp13
+ JkHTTPSIndicator HTTPS
+</IfModule>
+
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 981b291..3e49b75 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -61,9 +61,6 @@ LoadModule version_module modules/mod_version.so
LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
</IfModule>
</IfVersion>
-<IfVersion < 2.1>
-LoadModule jk_module modules/mod_jk.so
-</IfVersion>
# Turn rewrite engine on so we can use it for
# kickstart requests.
@@ -76,17 +73,6 @@ RewriteRule ^/rhn(.*) ajp://localhost:8009/rhn$1 [P]
RewriteRule ^(/.*\.(do|jsp)(\?.*)?)$ ajp://localhost:8009/$1 [P]
</IfModule>
-<IfModule mod_jk.c>
- JkWorkersFile /etc/rhn/satellite-httpd/conf/workers.properties
- JkLogLevel info
- JkLogFile /var/log/httpd/mod_jk.log
- JkMount /rhn/* ajp13
- JkMount /rhn ajp13
- JkMount /*.do ajp13
- JkMount /*.jsp ajp13
- JkHTTPSIndicator HTTPS
-</IfModule>
-
RedirectMatch ^/renew/.* http://rhn.redhat.com
RedirectMatch ^/index\.html$ /rhn/Login.do
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 25943b8..50c81ec 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -58,6 +58,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(0755,root,root) %{_sysconfdir}/rhn/satellite-httpd/conf/startup.pl
%config(noreplace) %{_sysconfdir}/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf
%config(noreplace) %{_sysconfdir}/httpd/conf.d/zz-spacewalk-www.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/00-spacewalk-mod_jk.conf
%config(noreplace) %{_sysconfdir}/rhn/satellite-httpd/conf/workers.properties
%config(noreplace) %{_sysconfdir}/webapp-keyring.gpg
%config(noreplace) %{_var}/lib/cobbler/kickstarts/spacewalk-sample.ks
diff --git a/spacewalk/setup/share/ssl.conf.6 b/spacewalk/setup/share/ssl.conf.6
new file mode 100644
index 0000000..76cd3e4
--- /dev/null
+++ b/spacewalk/setup/share/ssl.conf.6
@@ -0,0 +1,4 @@
+[ \t]*<IfModule mod_jk.c>\s*\n\s*JkMountCopy.*\n\s*</IfModule>\s*\n
+<IfModule mod_jk.c>
+ JkMountCopy On
+</IfModule>
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 00e6018..abfec34 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -61,6 +61,7 @@ install -m 0644 share/ssl.conf.2 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/ssl.conf.3 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/ssl.conf.4 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/ssl.conf.5 %{buildroot}/%{_datadir}/spacewalk/setup/
+install -m 0644 share/ssl.conf.6 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/old-jvm-list %{buildroot}/%{_datadir}/spacewalk/setup/
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/upgrade
14 years, 11 months
client/rhel
by Pradeep Kilambi
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 49a9ed5a85dd7af553f74ad2bd30d1dea77c9746
Author: James Bowes <jbowes(a)redhat.com>
Date: Tue Jun 2 10:40:51 2009 -0400
Support infinite available entitlements in TUI registration
getRemainingSubscriptions can return -1 if your account has an unlimited
amount of entitlements for the channel you're trying to subscribe to.
The rhn_register GTK+ gui knew about this, but the TUI did not.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index ff5f271..48cec38 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -1562,7 +1562,8 @@ class Tui:
log.log_debug('subs is %s' % subs)
- if int(subs) > 0:
+ # -1 is infinite
+ if int(subs) != 0:
log.log_debug('we still have subscriptions %s' % str(subs))
# bz442930 : Should allow registration when login and password is changed
14 years, 11 months
Branch 'VADER' - spacewalk/setup
by Milan Zazrivec
spacewalk/setup/lib/Spacewalk/Setup.pm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit b3961014569f439aa088e5a637373815ec0ea083
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 2 12:08:14 2009 +0200
distinguish minor and major version embedded db upgrades
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 247ace1..03f5b50 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -728,9 +728,12 @@ sub oracle_setup_embedded_db {
}
- if ($opts->{'upgrade'} and need_oracle_9i_10g_upgrade()) {
+ if ($opts->{'upgrade'}) {
+ my $upgrade_script = "upgrade-db-10g.sh";
+ need_oracle_9i_10g_upgrade() and $upgrade_script = "upgrade-db.sh";
+
printf loc(<<EOQ, DB_UPGRADE_LOG_FILE);
-** Database: Upgrading the database server to Oracle 10g:
+** Database: Upgrading the database server to latest Oracle 10g:
** Database: This is a long process that is logged in:
** Database: %s
EOQ
@@ -740,7 +743,8 @@ EOQ
-err_message => "Could not upgrade database.\n",
-err_code => 15,
-system_opts => ['/sbin/runuser', 'oracle', '-c',
- "ORACLE_CUSTOM_SID=$answers->{'db-sid'} " . SHARED_DIR . '/oracle/upgrade-db.sh' ]);
+ "ORACLE_CUSTOM_SID=$answers->{'db-sid'} " . SHARED_DIR .
+ '/oracle/' . $upgrade_script ]);
system_or_exit(['service', 'oracle', 'restart'], 41,
'Could not restart oracle service');
14 years, 11 months
spacewalk/setup
by Milan Zazrivec
spacewalk/setup/lib/Spacewalk/Setup.pm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit ea7e063d97f391dffd25b095d1288476fa128499
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 2 12:08:14 2009 +0200
distinguish minor and major version embedded db upgrades
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index f0cda94..f32c249 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -728,9 +728,12 @@ sub oracle_setup_embedded_db {
}
- if ($opts->{'upgrade'} and need_oracle_9i_10g_upgrade()) {
+ if ($opts->{'upgrade'}) {
+ my $upgrade_script = "upgrade-db-10g.sh";
+ need_oracle_9i_10g_upgrade() and $upgrade_script = "upgrade-db.sh";
+
printf loc(<<EOQ, DB_UPGRADE_LOG_FILE);
-** Database: Upgrading the database server to Oracle 10g:
+** Database: Upgrading the database server to latest Oracle 10g:
** Database: This is a long process that is logged in:
** Database: %s
EOQ
@@ -740,7 +743,8 @@ EOQ
-err_message => "Could not upgrade database.\n",
-err_code => 15,
-system_opts => ['/sbin/runuser', 'oracle', '-c',
- "ORACLE_CUSTOM_SID=$answers->{'db-sid'} " . SHARED_DIR . '/oracle/upgrade-db.sh' ]);
+ "ORACLE_CUSTOM_SID=$answers->{'db-sid'} " . SHARED_DIR .
+ '/oracle/' . $upgrade_script ]);
system_or_exit(['service', 'oracle', 'restart'], 41,
'Could not restart oracle service');
14 years, 11 months
Changes to 'refs/tags/oracle-server-scripts-10.2.0-29'
by Milan Zazrivec
Tag 'oracle-server-scripts-10.2.0-29' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2009-06-02 09:18 +0000
Tagging package [oracle-server-scripts] version [10.2.0-29] in directory [projects/oracle-server-scripts/].
Changes since spacewalk-search-0.6.10-1-4:
---
0 files changed
---
14 years, 11 months
projects/oracle-server-scripts rel-eng/packages
by Milan Zazrivec
projects/oracle-server-scripts/oracle-server-scripts.spec | 4 +++-
rel-eng/packages/oracle-server-scripts | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 4a2fbcb7ec9fd5329be15b21a95c0c2da6d7fe66
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 2 11:18:42 2009 +0200
Automatic commit of package [oracle-server-scripts] minor release [10.2.0-29].
diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/projects/oracle-server-scripts/oracle-server-scripts.spec
index 93c042b..d097962 100644
--- a/projects/oracle-server-scripts/oracle-server-scripts.spec
+++ b/projects/oracle-server-scripts/oracle-server-scripts.spec
@@ -9,7 +9,7 @@
Summary: Oracle 10g Database Server Enterprise Edition scripts
Name: oracle-server-scripts
Version: 10.2.0
-Release: 28%{?dist}
+Release: 29%{?dist}
Source0: oracle-home.sh
Source1: init-params.ora
Source2: create-db.sh
@@ -95,6 +95,8 @@ exit 0
%{oracle_scripts}
%changelog
+* Tue Jun 02 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 10.2.0-29
+- script for 10.2.0.3 to 10.2.0.4 10g upgrade
* Thu May 21 2009 jesus m. rodriguez <jesusr(a)redhat.com> 10.2.0-28
- 498192 - fix PL/SQL compilation error during embedded db upgrade (mmraka(a)redhat.com)
- 498192 - fix ORA-10647 during embedded db upgrade (mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/oracle-server-scripts b/rel-eng/packages/oracle-server-scripts
index cf4614c..5d0334a 100644
--- a/rel-eng/packages/oracle-server-scripts
+++ b/rel-eng/packages/oracle-server-scripts
@@ -1 +1 @@
-10.2.0-28 projects/oracle-server-scripts/
+10.2.0-29 projects/oracle-server-scripts/
14 years, 11 months