client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c73ecf42e6ed012924edd3fdd772daa6f073edc4
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Mar 24 14:11:26 2010 +0100
575127 - fix typo in dmidecode key
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index debd114..2a265d6 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -108,7 +108,7 @@ def dmi_vendor():
""" Return Vendor from dmidecode bios information.
If this value could not be fetch, returns empty string.
"""
- return get_dmi_data('/dmidecode/BIOSInfo/Vendor')
+ return get_dmi_data('/dmidecode/BIOSinfo/Vendor')
def dmi_system_uuid():
""" Return UUID from dmidecode system information.
@@ -587,13 +587,13 @@ def read_dmi():
dmidict["board"] = get_dmi_data('/dmidecode/BaseBoardInfo/Manufacturer')
# Bios Information
- vendor = get_dmi_data('/dmidecode/BIOSInfo/Vendor')
+ vendor = get_dmi_data('/dmidecode/BIOSinfo/Vendor')
if vendor:
dmidict["bios_vendor"] = vendor
- version = get_dmi_data('/dmidecode/BIOSInfo/Version')
+ version = get_dmi_data('/dmidecode/BIOSIinfo/Version')
if version:
dmidict["bios_version"] = version
- release = get_dmi_data('/dmidecode/BIOSInfo/ReleaseDate')
+ release = get_dmi_data('/dmidecode/BIOSinfo/ReleaseDate')
if release:
dmidict["bios_release"] = release
14 years, 2 months
Changes to 'refs/tags/spacewalk-setup-0.9.3-1'
by Michael Mraka
Tag 'spacewalk-setup-0.9.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-03-24 12:39 +0000
Tagging package [spacewalk-setup] version [0.9.3-1] in directory [spacewalk/setup/].
Changes since spacewalk-admin-0.9.2-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-setup] release [0.9.3-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
14 years, 2 months
rel-eng/packages spacewalk/setup
by Michael Mraka
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 619796e906dbeb7f927ddbc9ee666ec7986bda8b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 13:39:11 2010 +0100
Automatic commit of package [spacewalk-setup] release [0.9.3-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index dd21eed..51782e3 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-0.9.2-1 spacewalk/setup/
+0.9.3-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index f178741..179eaf8 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 0.9.2
+Version: 0.9.3
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -95,6 +95,9 @@ rm -rf %{buildroot}
%{_datadir}/spacewalk/*
%changelog
+* Wed Mar 24 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.3-1
+- modified spacewalk-setup to use spacewalk-service
+
* Tue Mar 23 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.2-1
- fixed packaging conflicts
14 years, 2 months
Changes to 'refs/tags/spacewalk-admin-0.9.2-1'
by Michael Mraka
Tag 'spacewalk-admin-0.9.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-03-24 12:38 +0000
Tagging package [spacewalk-admin] version [0.9.2-1] in directory [spacewalk/admin/].
Changes since spacewalk-branding-0.9.4-1:
Michael Mraka (10):
added ability to exclude some service
renamed rhn-satellite to spacewalk-service
removed obsoleted comments
modified messages to spacewalk
removed lock - every single service has its own lock
let's pass --level to chkconfig
list services
fixed exclusion of the last service
modified setup to use spacewalk-service
Automatic commit of package [spacewalk-admin] release [0.9.2-1].
---
rel-eng/packages/spacewalk-admin | 2
spacewalk/admin/Makefile.admin | 2
spacewalk/admin/rhn-satellite | 181 ----------------------------
spacewalk/admin/spacewalk-admin.spec | 7 -
spacewalk/admin/spacewalk-service | 208 +++++++++++++++++++++++++++++++++
spacewalk/setup/bin/spacewalk-setup | 14 --
spacewalk/setup/lib/Spacewalk/Setup.pm | 14 --
7 files changed, 226 insertions(+), 202 deletions(-)
---
14 years, 2 months
rel-eng/packages spacewalk/admin
by Michael Mraka
rel-eng/packages/spacewalk-admin | 2 +-
spacewalk/admin/spacewalk-admin.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ae279f214baa6bd1877c34dc4995abf33541d953
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 13:38:36 2010 +0100
Automatic commit of package [spacewalk-admin] release [0.9.2-1].
diff --git a/rel-eng/packages/spacewalk-admin b/rel-eng/packages/spacewalk-admin
index 7dadac8..3c0f0e8 100644
--- a/rel-eng/packages/spacewalk-admin
+++ b/rel-eng/packages/spacewalk-admin
@@ -1 +1 @@
-0.9.1-1 spacewalk/admin/
+0.9.2-1 spacewalk/admin/
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index 2f18fe8..5aa8d6e 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -2,7 +2,7 @@
Summary: Various utility scripts and data files for RHN Satellite installations
Name: spacewalk-admin
URL: https://fedorahosted.org/spacewalk
-Version: 0.9.1
+Version: 0.9.2
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
License: GPLv2
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/validate-sat-cert.3.gz
%changelog
+* Wed Mar 24 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.2-1
+- improved spacewalk-service script
+
* Tue Feb 16 2010 Justin Sherrill <jsherril(a)redhat.com> 0.9.1-1
- changing rhn-satellite service script to support tomcat6
(jsherril(a)redhat.com)
14 years, 2 months
9 commits - spacewalk/admin spacewalk/setup
by Michael Mraka
spacewalk/admin/Makefile.admin | 2
spacewalk/admin/rhn-satellite | 181 ----------------------------
spacewalk/admin/spacewalk-admin.spec | 2
spacewalk/admin/spacewalk-service | 208 +++++++++++++++++++++++++++++++++
spacewalk/setup/bin/spacewalk-setup | 14 --
spacewalk/setup/lib/Spacewalk/Setup.pm | 14 --
6 files changed, 221 insertions(+), 200 deletions(-)
New commits:
commit 50b2096c790ff09b1650892bb9deadfe12b17e07
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 13:36:30 2010 +0100
modified setup to use spacewalk-service
this also fixed switching between tomcat5 and tomca6 services and
removed duplicated list of spacewalk services
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 2891d80..957ee66 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -142,8 +142,8 @@ print Spacewalk::Setup::loc("* Setting up Cobbler..\n");
setup_cobbler(\%opts, \%answers);
print Spacewalk::Setup::loc("* Restarting services.\n");
-Spacewalk::Setup::system_or_exit(['/usr/sbin/rhn-satellite', 'restart'], 40,
- 'Could not restart the rhn-satellite service.');
+Spacewalk::Setup::system_or_exit(['/usr/sbin/spacewalk-service', 'restart'], 40,
+ 'Could not restart spacewalk services.');
wait_for_tomcat($answers{hostname});
@@ -1298,13 +1298,7 @@ sub setup_gpg {
# Satellite services are handled by chkconfig now.
sub setup_services {
- my @services = qw/jabberd osa-dispatcher taskomatic tomcat5 httpd Monitoring MonitoringScout rhn-search/;
-
- foreach my $service (@services) {
- if (-e "/etc/init.d/$service") {
- Spacewalk::Setup::system_or_exit(["/sbin/chkconfig", "--level", "345", $service, "on"], 11, 'Could not turn the %s service on.', $service);
- }
- }
+ Spacewalk::Setup::system_or_exit(["/usr/sbin/spacewalk-service", "--level", "345", "enable"], 11, 'Could not turn spacewalk services on.');
return 1;
}
@@ -1363,7 +1357,7 @@ sub wait_for_tomcat {
return;
}
}
- print "Tomcat failed to start properly or the installer ran out of tries. Please check /var/log/tomcat5/catalina.out for errors.\n";
+ print "Tomcat failed to start properly or the installer ran out of tries. Please check /var/log/tomcat*/catalina.out for errors.\n";
return;
}
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 8a1e731..7485e52 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -283,7 +283,10 @@ sub upgrade_stop_services {
my $opts = shift;
if ($opts->{'upgrade'} && not $opts->{'skip-services-check'}) {
print "* Upgrade flag passed. Stopping necessary services.\n";
- if (-e "/usr/sbin/rhn-satellite") {
+ if (-e "/usr/sbin/spacewalk-service") {
+ system_or_exit(['/usr/sbin/spacewalk-service', 'stop'], 16,
+ 'Could not stop the rhn-satellite service.');
+ } elsif (-e "/usr/sbin/rhn-satellite") {
system_or_exit(['/usr/sbin/rhn-satellite', 'stop'], 16,
'Could not stop the rhn-satellite service.');
} elsif (-e "/etc/init.d/rhn-satellite") {
@@ -425,14 +428,9 @@ sub clear_db {
my $dbh = get_dbh($answers);
- print loc("** Database: Shutting down services that may be using DB: [tomcat5, taskomatic, httpd, jabberd, osa-dispatcher, tsdb_local_queue].\n");
+ print loc("** Database: Shutting down spacewalk services that may be using DB.\n");
- system_debug('/sbin/service tomcat5 stop');
- system_debug('/sbin/service taskomatic stop');
- system_debug('/sbin/service httpd stop');
- system_debug('/sbin/service jabberd stop');
- system_debug('/sbin/service osa-dispatcher stop');
- system_debug('/sbin/service tsdb_local_queue stop');
+ system_debug('/usr/sbin/spacewalk-service --exclude=oracle* --exclude=postgresql stop');
print loc("** Database: Services stopped. Clearing DB.\n");
commit befc72630befab71c6caf7ae49c8257994ee4882
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 10:38:44 2010 +0100
fixed exclusion of the last service
diff --git a/spacewalk/admin/spacewalk-service b/spacewalk/admin/spacewalk-service
index 8a834fc..90335db 100755
--- a/spacewalk/admin/spacewalk-service
+++ b/spacewalk/admin/spacewalk-service
@@ -154,7 +154,8 @@ while true ; do
-e|--exclude)
EXCLUDE=$2
shift
- SERVICES=$(while read -d " " service ; do echo ${service/$EXCLUDE}; done <<<$SERVICES)
+ # the space in "$SERVICE " is intentional, don't remove it
+ SERVICES=$(while read -d " " service ; do echo ${service/$EXCLUDE}; done <<<"$SERVICES ")
;;
-l|--level)
LEVEL="--level $2"
commit 57edffce3fab62b417e837050c1a7d57d4f2ec78
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 10:29:03 2010 +0100
list services
diff --git a/spacewalk/admin/spacewalk-service b/spacewalk/admin/spacewalk-service
index 17e1539..8a834fc 100755
--- a/spacewalk/admin/spacewalk-service
+++ b/spacewalk/admin/spacewalk-service
@@ -99,6 +99,12 @@ turn_off() {
return 0
}
+list() {
+ echo "Listing spacewalk services..."
+ chkconfig --list
+ echo "Done"
+ return 0
+}
start() {
echo "Starting spacewalk services..."
@@ -179,6 +185,9 @@ case "$1" in
disable)
turn_off $LEVEL
;;
+ list)
+ list
+ ;;
status)
status
;;
commit e85042747889222b5febf2bd2fc0a93dbfcec167
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 13:35:32 2010 +0100
let's pass --level to chkconfig
diff --git a/spacewalk/admin/spacewalk-service b/spacewalk/admin/spacewalk-service
index 2431a51..17e1539 100755
--- a/spacewalk/admin/spacewalk-service
+++ b/spacewalk/admin/spacewalk-service
@@ -71,12 +71,11 @@ reverse_services() {
}
chkconfig() {
- ACTION="$1"
RET=0
E_STAT=0
for service in $SERVICES; do
if [ -e /etc/init.d/$service ]; then
- /sbin/chkconfig $service $ACTION
+ /sbin/chkconfig $service "$@"
E_STAT=$?
fi
if [ $E_STAT -ne 0 ]; then
@@ -88,14 +87,14 @@ chkconfig() {
turn_on() {
echo "Enabling spacewalk services..."
- chkconfig on
+ chkconfig on "$@"
echo "Done"
return 0
}
turn_off() {
echo "Disabling spacewalk services..."
- chkconfig off
+ chkconfig off "$@"
echo "Done"
return 0
}
@@ -138,7 +137,7 @@ ensure_httpd_down() {
return 0
}
-OPTS=$(getopt --longoptions=exclude: -n ${0##*/} -- e: "$@")
+OPTS=$(getopt --longoptions=exclude:,level: -n ${0##*/} -- e:l: "$@")
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
@@ -151,6 +150,10 @@ while true ; do
shift
SERVICES=$(while read -d " " service ; do echo ${service/$EXCLUDE}; done <<<$SERVICES)
;;
+ -l|--level)
+ LEVEL="--level $2"
+ shift
+ ;;
--)
shift
break
@@ -171,10 +174,10 @@ case "$1" in
stop
;;
enable)
- turn_on
+ turn_on $LEVEL
;;
disable)
- turn_off
+ turn_off $LEVEL
;;
status)
status
commit 1de497cc034fd0290ca4d58a548c66ab6a4fc858
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 13:33:42 2010 +0100
removed lock - every single service has its own lock
diff --git a/spacewalk/admin/spacewalk-service b/spacewalk/admin/spacewalk-service
index d14aeee..2431a51 100755
--- a/spacewalk/admin/spacewalk-service
+++ b/spacewalk/admin/spacewalk-service
@@ -105,8 +105,6 @@ start() {
echo "Starting spacewalk services..."
forward_services start
echo "Done."
-
- touch /var/lock/subsys/rhn-satellite
return 0
}
@@ -114,8 +112,6 @@ stop() {
echo "Shutting down spacewalk services..."
reverse_services stop
echo "Done."
-
- rm -f /var/lock/subsys/rhn-satellite
return 0
}
commit 8309dbe2b85599a0cf6ec2c45f7def17eeea00f5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 10:15:16 2010 +0100
modified messages to spacewalk
diff --git a/spacewalk/admin/spacewalk-service b/spacewalk/admin/spacewalk-service
index 1430d9e..d14aeee 100755
--- a/spacewalk/admin/spacewalk-service
+++ b/spacewalk/admin/spacewalk-service
@@ -87,14 +87,14 @@ chkconfig() {
}
turn_on() {
- echo "Enabling rhn-satellite services..."
+ echo "Enabling spacewalk services..."
chkconfig on
echo "Done"
return 0
}
turn_off() {
- echo "Disabling rhn-satellite services..."
+ echo "Disabling spacewalk services..."
chkconfig off
echo "Done"
return 0
@@ -102,7 +102,7 @@ turn_off() {
start() {
- echo "Starting rhn-satellite..."
+ echo "Starting spacewalk services..."
forward_services start
echo "Done."
@@ -111,7 +111,7 @@ start() {
}
stop() {
- echo "Shutting down rhn-satellite..."
+ echo "Shutting down spacewalk services..."
reverse_services stop
echo "Done."
@@ -192,7 +192,7 @@ case "$1" in
start
;;
*)
- echo "Usage: rhn-satellite {start|stop|status|reload|restart|enable|disable}"
+ echo "Usage: $(basename $0) {start|stop|status|reload|restart|enable|disable}"
exit 1
;;
esac
commit 9a1caf0b04eaec4b24016e8434d4a2c45067682e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 10:11:55 2010 +0100
removed obsoleted comments
diff --git a/spacewalk/admin/spacewalk-service b/spacewalk/admin/spacewalk-service
index 66dfd2d..1430d9e 100755
--- a/spacewalk/admin/spacewalk-service
+++ b/spacewalk/admin/spacewalk-service
@@ -13,13 +13,6 @@
# granted to use or replicate Red Hat trademarks that are incorporated
# in this software or its documentation.
#
-#
-# $Id$
-
-# /etc/rc.d/init.d/rhn-satellite
-# chkconfig: - 74 26
-# description: start and stop the RHN Satellite Service
-
if [ -x /etc/init.d/oracle ]; then
commit c11d3196414dec0e51f3cc732068b39cdba6e74e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Mar 23 15:34:18 2010 +0100
renamed rhn-satellite to spacewalk-service
and added symlink for backward compatibility
diff --git a/spacewalk/admin/Makefile.admin b/spacewalk/admin/Makefile.admin
index ff02224..2ee6b85 100644
--- a/spacewalk/admin/Makefile.admin
+++ b/spacewalk/admin/Makefile.admin
@@ -40,7 +40,7 @@ PERL_SCRIPTS = rhn-config-satellite.pl \
rhn-sudo-load-ssl-cert \
validate-sat-cert.pl
-SBIN_SCRIPTS = rhn-sat-restart-silent rhn-satellite
+SBIN_SCRIPTS = rhn-sat-restart-silent spacewalk-service
GPGKEY_FILES = RHN-GPG-KEY
diff --git a/spacewalk/admin/rhn-satellite b/spacewalk/admin/rhn-satellite
deleted file mode 100755
index e6f43dc..0000000
--- a/spacewalk/admin/rhn-satellite
+++ /dev/null
@@ -1,206 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-#
-# $Id$
-
-# /etc/rc.d/init.d/rhn-satellite
-# chkconfig: - 74 26
-# description: start and stop the RHN Satellite Service
-
-
-
-if [ -x /etc/init.d/oracle ]; then
- DB_SERVICE="oracle"
-fi
-
-if [ -x /etc/init.d/oracle-xe ]; then
- DB_SERVICE="oracle-xe"
-fi
-
-if [ -x /etc/init.d/tomcat5 ]; then
- TOMCAT="tomcat5"
-fi
-
-if [ -x /etc/init.d/tomcat6 ]; then
- TOMCAT="tomcat6"
-fi
-
-
-SERVICES="jabberd $DB_SERVICE osa-dispatcher $TOMCAT httpd Monitoring MonitoringScout rhn-search cobblerd taskomatic"
-
-. /etc/init.d/functions
-
-forward_services() {
- ACTION="$1"
-
- RET=0
- E_STAT=0
- for service in $SERVICES; do
- if [ -e /etc/init.d/$service ]; then
- /sbin/service $service $ACTION
- E_STAT=$?
- fi
- if [ $E_STAT -ne 0 ]; then
- RET=$E_STAT
- fi
- done
- return $RET
-}
-
-reverse_services() {
- ACTION="$1"
-
- RET=0
- E_STAT=0
- for service in $(echo $SERVICES | tac -s" "); do
- if [ -e /etc/init.d/$service ]; then
- /sbin/service $service $ACTION
- E_STAT=$?
- fi
- if [ $E_STAT -ne 0 ]; then
- RET=$E_STAT
- fi
- done
- return $RET
-}
-
-chkconfig() {
- ACTION="$1"
- RET=0
- E_STAT=0
- for service in $SERVICES; do
- if [ -e /etc/init.d/$service ]; then
- /sbin/chkconfig $service $ACTION
- E_STAT=$?
- fi
- if [ $E_STAT -ne 0 ]; then
- RET=$E_STAT
- fi
- done
- return $RET
-}
-
-turn_on() {
- echo "Enabling rhn-satellite services..."
- chkconfig on
- echo "Done"
- return 0
-}
-
-turn_off() {
- echo "Disabling rhn-satellite services..."
- chkconfig off
- echo "Done"
- return 0
-}
-
-
-start() {
- echo "Starting rhn-satellite..."
- forward_services start
- echo "Done."
-
- touch /var/lock/subsys/rhn-satellite
- return 0
-}
-
-stop() {
- echo "Shutting down rhn-satellite..."
- reverse_services stop
- echo "Done."
-
- rm -f /var/lock/subsys/rhn-satellite
- return 0
-}
-
-status() {
- forward_services status
- return $?
-}
-
-ensure_httpd_down() {
- COUNT=0
- LIMIT=10
-
- while [ "$(pidof httpd | wc -w)" -gt 0 ] && [ "$COUNT" -lt "$LIMIT" ]
- do
- sleep 1
- ((COUNT++))
- done
-
- if [ "$COUNT" -eq "$LIMIT" ]; then
- killall -9 httpd
- sleep 4
- fi
-
- return 0
-}
-
-OPTS=$(getopt --longoptions=exclude: -n ${0##*/} -- e: "$@")
-
-if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
-
-eval set -- "$OPTS"
-
-while true ; do
- case "$1" in
- -e|--exclude)
- EXCLUDE=$2
- shift
- SERVICES=$(while read -d " " service ; do echo ${service/$EXCLUDE}; done <<<$SERVICES)
- ;;
- --)
- shift
- break
- ;;
- *)
- echo "Internal error!" >&2
- exit 1
- ;;
- esac
- shift
-done
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- enable)
- turn_on
- ;;
- disable)
- turn_off
- ;;
- status)
- status
- ;;
- restart|reload)
- stop
- sleep 4
-
- ensure_httpd_down
-
- start
- ;;
- *)
- echo "Usage: rhn-satellite {start|stop|status|reload|restart|enable|disable}"
- exit 1
- ;;
-esac
-exit $?
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index 6120028..2f18fe8 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -33,6 +33,7 @@ make -f Makefile.admin install PREFIX=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3/
%{_bindir}/pod2man validate-sat-cert.pod | gzip -c - > $RPM_BUILD_ROOT%{_mandir}/man3/validate-sat-cert.3.gz
chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man3/validate-sat-cert.3.gz
+ln -s spacewalk-service $RPM_BUILD_ROOT%{_sbindir}/rhn-satellite
%clean
rm -rf $RPM_BUILD_ROOT
@@ -40,6 +41,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%dir %{rhnroot}
+%{_sbindir}/spacewalk-service
%{_sbindir}/rhn-satellite
%{_initrddir}/rhn-satellite
%{_bindir}/validate-sat-cert.pl
diff --git a/spacewalk/admin/spacewalk-service b/spacewalk/admin/spacewalk-service
new file mode 100755
index 0000000..66dfd2d
--- /dev/null
+++ b/spacewalk/admin/spacewalk-service
@@ -0,0 +1,206 @@
+#!/bin/sh
+#
+# 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.
+#
+#
+# $Id$
+
+# /etc/rc.d/init.d/rhn-satellite
+# chkconfig: - 74 26
+# description: start and stop the RHN Satellite Service
+
+
+
+if [ -x /etc/init.d/oracle ]; then
+ DB_SERVICE="oracle"
+fi
+
+if [ -x /etc/init.d/oracle-xe ]; then
+ DB_SERVICE="oracle-xe"
+fi
+
+if [ -x /etc/init.d/tomcat5 ]; then
+ TOMCAT="tomcat5"
+fi
+
+if [ -x /etc/init.d/tomcat6 ]; then
+ TOMCAT="tomcat6"
+fi
+
+
+SERVICES="jabberd $DB_SERVICE osa-dispatcher $TOMCAT httpd Monitoring MonitoringScout rhn-search cobblerd taskomatic"
+
+. /etc/init.d/functions
+
+forward_services() {
+ ACTION="$1"
+
+ RET=0
+ E_STAT=0
+ for service in $SERVICES; do
+ if [ -e /etc/init.d/$service ]; then
+ /sbin/service $service $ACTION
+ E_STAT=$?
+ fi
+ if [ $E_STAT -ne 0 ]; then
+ RET=$E_STAT
+ fi
+ done
+ return $RET
+}
+
+reverse_services() {
+ ACTION="$1"
+
+ RET=0
+ E_STAT=0
+ for service in $(echo $SERVICES | tac -s" "); do
+ if [ -e /etc/init.d/$service ]; then
+ /sbin/service $service $ACTION
+ E_STAT=$?
+ fi
+ if [ $E_STAT -ne 0 ]; then
+ RET=$E_STAT
+ fi
+ done
+ return $RET
+}
+
+chkconfig() {
+ ACTION="$1"
+ RET=0
+ E_STAT=0
+ for service in $SERVICES; do
+ if [ -e /etc/init.d/$service ]; then
+ /sbin/chkconfig $service $ACTION
+ E_STAT=$?
+ fi
+ if [ $E_STAT -ne 0 ]; then
+ RET=$E_STAT
+ fi
+ done
+ return $RET
+}
+
+turn_on() {
+ echo "Enabling rhn-satellite services..."
+ chkconfig on
+ echo "Done"
+ return 0
+}
+
+turn_off() {
+ echo "Disabling rhn-satellite services..."
+ chkconfig off
+ echo "Done"
+ return 0
+}
+
+
+start() {
+ echo "Starting rhn-satellite..."
+ forward_services start
+ echo "Done."
+
+ touch /var/lock/subsys/rhn-satellite
+ return 0
+}
+
+stop() {
+ echo "Shutting down rhn-satellite..."
+ reverse_services stop
+ echo "Done."
+
+ rm -f /var/lock/subsys/rhn-satellite
+ return 0
+}
+
+status() {
+ forward_services status
+ return $?
+}
+
+ensure_httpd_down() {
+ COUNT=0
+ LIMIT=10
+
+ while [ "$(pidof httpd | wc -w)" -gt 0 ] && [ "$COUNT" -lt "$LIMIT" ]
+ do
+ sleep 1
+ ((COUNT++))
+ done
+
+ if [ "$COUNT" -eq "$LIMIT" ]; then
+ killall -9 httpd
+ sleep 4
+ fi
+
+ return 0
+}
+
+OPTS=$(getopt --longoptions=exclude: -n ${0##*/} -- e: "$@")
+
+if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+
+eval set -- "$OPTS"
+
+while true ; do
+ case "$1" in
+ -e|--exclude)
+ EXCLUDE=$2
+ shift
+ SERVICES=$(while read -d " " service ; do echo ${service/$EXCLUDE}; done <<<$SERVICES)
+ ;;
+ --)
+ shift
+ break
+ ;;
+ *)
+ echo "Internal error!" >&2
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ enable)
+ turn_on
+ ;;
+ disable)
+ turn_off
+ ;;
+ status)
+ status
+ ;;
+ restart|reload)
+ stop
+ sleep 4
+
+ ensure_httpd_down
+
+ start
+ ;;
+ *)
+ echo "Usage: rhn-satellite {start|stop|status|reload|restart|enable|disable}"
+ exit 1
+ ;;
+esac
+exit $?
commit 1296f3e4e20d9f953593b2ff282a0187877849a1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Mar 23 15:15:01 2010 +0100
added ability to exclude some service
diff --git a/spacewalk/admin/rhn-satellite b/spacewalk/admin/rhn-satellite
index 090984a..e6f43dc 100755
--- a/spacewalk/admin/rhn-satellite
+++ b/spacewalk/admin/rhn-satellite
@@ -149,6 +149,31 @@ ensure_httpd_down() {
return 0
}
+OPTS=$(getopt --longoptions=exclude: -n ${0##*/} -- e: "$@")
+
+if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+
+eval set -- "$OPTS"
+
+while true ; do
+ case "$1" in
+ -e|--exclude)
+ EXCLUDE=$2
+ shift
+ SERVICES=$(while read -d " " service ; do echo ${service/$EXCLUDE}; done <<<$SERVICES)
+ ;;
+ --)
+ shift
+ break
+ ;;
+ *)
+ echo "Internal error!" >&2
+ exit 1
+ ;;
+ esac
+ shift
+done
+
case "$1" in
start)
start
14 years, 2 months
Changes to 'refs/tags/spacewalk-branding-0.9.4-1'
by Michael Mraka
Tag 'spacewalk-branding-0.9.4-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-03-24 08:34 +0000
Tagging package [spacewalk-branding] version [0.9.4-1] in directory [branding/].
Changes since rhn-client-tools-0.9.6-1:
Jan Pazdziora (6):
Remove constants that are not used in our client code.
The attribute is called hasMultipleOrgs so we shall use the same name in the debug output as well.
The PrivacyWindow is not used in TUI.
Reuse the WHY_REGISTER_TIP text.
Reuse the "Why register" texts in the quitting dialog as well.
Changing the default networkRetries from 5 to 1 (so no retries).
Justin Sherrill (2):
updating README
Revert "updating README"
Michael Mraka (1):
Automatic commit of package [spacewalk-branding] release [0.9.4-1].
Miroslav Suchý (3):
group test on subsystem together, to create more readable code
remove dead code
do not use reserved word type
---
branding/spacewalk-branding.spec | 6
client/rhel/rhn-client-tools/etc-conf/up2date.config | 2
client/rhel/rhn-client-tools/src/up2date_client/config.py | 2
client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py | 28 ++--
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 65 ----------
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 52 +-------
rel-eng/packages/spacewalk-branding | 2
7 files changed, 37 insertions(+), 120 deletions(-)
---
14 years, 2 months
branding/spacewalk-branding.spec rel-eng/packages
by Michael Mraka
branding/spacewalk-branding.spec | 6 +++++-
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 9c5b821305b0b01317fa2650202aaf7008f5c009
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 09:34:00 2010 +0100
Automatic commit of package [spacewalk-branding] release [0.9.4-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index 0ba5e72..2ac64da 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -1,5 +1,5 @@
Name: spacewalk-branding
-Version: 0.9.3
+Version: 0.9.4
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -80,6 +80,10 @@ rm -rf %{buildroot}
%changelog
+* Wed Mar 24 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.4-1
+- resigning spacewalk cert
+- 516048 - syncing java stack with perl stack on channel naming convention
+
* Mon Mar 08 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.3-1
- 486430 - changed organization name in default cert
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index 26924d3..94dbcb8 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-0.9.3-1 branding/
+0.9.4-1 branding/
14 years, 2 months
3 commits - client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/etc-conf/up2date.config | 2
client/rhel/rhn-client-tools/src/up2date_client/config.py | 2
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 21 +---------
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 12 +++++
4 files changed, 17 insertions(+), 20 deletions(-)
New commits:
commit 351fb160a77bd5abc1348a01ab40a5769b4d20bc
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Mar 19 11:48:00 2010 +0100
Changing the default networkRetries from 5 to 1 (so no retries).
diff --git a/client/rhel/rhn-client-tools/etc-conf/up2date.config b/client/rhel/rhn-client-tools/etc-conf/up2date.config
index 00954e0..9f2e878 100644
--- a/client/rhel/rhn-client-tools/etc-conf/up2date.config
+++ b/client/rhel/rhn-client-tools/etc-conf/up2date.config
@@ -27,7 +27,7 @@ noReboot[comment]=Disable the reboot actions
noReboot=0
networkRetries[comment]=Number of attempts to make at network connections before giving up
-networkRetries=5
+networkRetries=1
disallowConfChanges[comment]=Config options that can not be overwritten by a config update action
disallowConfChanges=noReboot;sslCACert;useNoSSLForPackages;noSSLServerURL;serverURL;disallowConfChanges;
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/config.py b/client/rhel/rhn-client-tools/src/up2date_client/config.py
index 0fff0df..fc80394 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/config.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/config.py
@@ -42,7 +42,7 @@ Defaults = {
0),
'networkRetries' : ("Number of attempts to make at network "\
"connections before giving up",
- 5),
+ 1),
'sslCACert' : ("The CA cert used to verify the ssl server",
"/usr/share/rhn/RHNS-CA-CERT"),
'noReboot' : ("Disable the reboot action",
commit 69cdffcec9b500c4108e01c4282f4895fa0615d5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 18 16:55:07 2010 +0100
Reuse the "Why register" texts in the quitting dialog as well.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index fc45b66..adf06e9 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -60,21 +60,9 @@ TERMS_AND_CONDS_WINDOW = _("Review the Red Hat Network Terms And Conditions")
# Confirm Quit Window
CONFIRM_QUIT = _("Software update setup unsuccessful")
-CONFIRM_QUIT_TXT = _("Are you sure you don't want to connect your system to Red Hat Network? "
- "You'll miss out on the benefits of a Red Hat Enterprise Linux subscription:\n\n"
- "Security & Updates:\n"
- "Receive the latest software updates, including security updates, keeping this Red Hat "
- "Enterprise Linux system updated and secure.\n\n"
- "Downloads & Upgrades:\n"
- "Download installation images for Red Hat Enterprise Linux releases, including "
- "new releases.\n\n"
- "Support:\n"
- "Access to the technical support experts at Red Hat or Red Hat's partners for help "
- "with any issues you might encounter with this system.\n\n"
- "Compliance:\n"
- "Stay in compliance with your subscription agreement and manage subscriptions for systems "
- "connected to your account at http://rhn.redhat.com/.\n\n"
- "You will not be able to take advantage of these subscription privileges without connecting "
+CONFIRM_QUIT_SURE = _("Are you sure you don't want to connect your system to Red Hat Network? "
+ "You'll miss out on the benefits of a Red Hat Enterprise Linux subscription:\n")
+CONFIRM_QUIT_WILLNOT = _("You will not be able to take advantage of these subscription privileges without connecting "
"your system to Red Hat Network.\n")
CONTINUE_REGISTERING = _("Take me back to the setup process.")
REGISTER_LATER2 = _("I'll register later.")
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 69766a7..0f03a35 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -57,7 +57,17 @@ def WarningWindow(screen, errmsg):
def ConfirmQuitWindow(screen):
button = snack.ButtonChoiceWindow(screen, CONFIRM_QUIT,
- CONFIRM_QUIT_TXT + "\n" + WHY_REGISTER_TIP,
+ CONFIRM_QUIT_SURE + "\n" + \
+ WHY_REGISTER_SEC + "\n" + \
+ WHY_REGISTER_SEC_TXT + "\n\n" + \
+ WHY_REGISTER_DLD + "\n" + \
+ WHY_REGISTER_DLD_TXT + "\n\n" + \
+ WHY_REGISTER_SUPP + "\n" + \
+ WHY_REGISTER_SUPP_TXT + "\n\n" + \
+ WHY_REGISTER_COMP + "\n" + \
+ WHY_REGISTER_COMP_TXT + "\n\n" + \
+ CONFIRM_QUIT_WILLNOT + "\n" + \
+ WHY_REGISTER_TIP,
[CONTINUE_REGISTERING, REGISTER_LATER2],
width = 70)
commit baf55e9d72ff09d91e5d364dd9bd19830ff2c2b8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 18 16:42:10 2010 +0100
Reuse the WHY_REGISTER_TIP text.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index 09856ce..fc45b66 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -75,8 +75,7 @@ CONFIRM_QUIT_TXT = _("Are you sure you don't want to connect your system t
"Stay in compliance with your subscription agreement and manage subscriptions for systems "
"connected to your account at http://rhn.redhat.com/.\n\n"
"You will not be able to take advantage of these subscription privileges without connecting "
- "your system to Red Hat Network.\n\n"
- "Tip: Red Hat values your privacy: http://www.redhat.com/legal/privacy_statement.html")
+ "your system to Red Hat Network.\n")
CONTINUE_REGISTERING = _("Take me back to the setup process.")
REGISTER_LATER2 = _("I'll register later.")
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 3799753..69766a7 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -57,7 +57,7 @@ def WarningWindow(screen, errmsg):
def ConfirmQuitWindow(screen):
button = snack.ButtonChoiceWindow(screen, CONFIRM_QUIT,
- CONFIRM_QUIT_TXT,
+ CONFIRM_QUIT_TXT + "\n" + WHY_REGISTER_TIP,
[CONTINUE_REGISTERING, REGISTER_LATER2],
width = 70)
14 years, 2 months
3 commits - client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 44 ----------
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 40 ---------
2 files changed, 1 insertion(+), 83 deletions(-)
New commits:
commit 46451aea15f57c7677965d6a74631db2e5c076cb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 18 16:28:53 2010 +0100
The PrivacyWindow is not used in TUI.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index 09c3e03..09856ce 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -56,7 +56,6 @@ WHY_REGISTER_TIP = _("Tip: Red Hat values your privacy: "
BACK_REGISTER = _("Take me back to the setup process.")
# Privacy Window
-PRIVACY_WINDOW = _("Step 1: Review the Red Hat Privacy Statement")
TERMS_AND_CONDS_WINDOW = _("Review the Red Hat Network Terms And Conditions")
# Confirm Quit Window
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 81f1f5a..3799753 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -234,44 +234,6 @@ class WhyRegisterWindow:
return button
-class PrivacyWindow:
-
- def __init__(self, screen, tui):
- self.name = "PrivacyWindow"
- self.screen = screen
- self.tui = tui
- size = snack._snack.size()
- toplevel = snack.GridForm(screen, PRIVACY_WINDOW,
- 1, 2)
-
- try:
- tb = snack.Textbox(size[0]-10, size[1]-14, rhnreg.privacyText(), 1)
- except up2dateErrors.CommunicationError, e:
- FatalErrorWindow(screen, e.errmsg)
-
- toplevel.add(tb, 0, 0, padding = (0, 0, 0, 1))
-
- self.bb = snack.ButtonBar(screen,
- [(NEXT, "next"),
- (BACK, "back"),
- (CANCEL, "cancel")])
- toplevel.add(self.bb, 0, 1, growx = 1)
- self.g = toplevel
-
-
- def saveResults(self):
- pass
-
- def run(self):
- log.log_debug("Running %s" % self.__class__.__name__)
- self.screen.refresh()
- result = self.g.runOnce()
- button = self.bb.buttonPressed(result)
-
- if result == "F12":
- return "next"
- return button
-
class TermsAndConditionsWindow:
def __init__(self, screen, tui):
self.name = "TermsAndConditionsWindow"
commit bcea1bb1a9c0eb2c0263bc8ef8ddaecd28aa1c5c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Mar 17 15:33:13 2010 +0100
The attribute is called hasMultipleOrgs so we shall use the same name in the debug output as well.
To avoid confusion.
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 106008a..81f1f5a 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -1458,7 +1458,7 @@ class Tui:
# Don't offer group selection screen if the user is not
# a member of multiple groups.
log.log_debug("index is %s" % index)
- log.log_debug("win.name is %s, hasMutlipleGroups is %s" % \
+ log.log_debug("win.name is %s, hasMultipleOrgs is %s" % \
(win.name, self.hasMultipleOrgs))
if win.name == 'OrgGroupWindow':
commit fec98c3e7961443daf02c58e476834f7e9fa6616
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Mar 17 11:51:05 2010 +0100
Remove constants that are not used in our client code.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index fc60024..09c3e03 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -31,8 +31,6 @@ START_REGISTER_TEXT = _("This assistant will guide you through "
" * Your Red Hat Login & password\n"
" * The location of a Red Hat Network Satellite "
"or Proxy (optional)\n\n")
-START_REGISTER_TEXT_H = _("If you do not have a Red Hat Login, this "
- "assistant will allow you to create one.")
# Why Register Window
WHY_REGISTER = _("Why Should I Connect to RHN? ...")
@@ -81,14 +79,12 @@ CONFIRM_QUIT_TXT = _("Are you sure you don't want to connect your system t
"your system to Red Hat Network.\n\n"
"Tip: Red Hat values your privacy: http://www.redhat.com/legal/privacy_statement.html")
CONTINUE_REGISTERING = _("Take me back to the setup process.")
-REGISTER_LATER = _("No thanks. I'll connect later.")
REGISTER_LATER2 = _("I'll register later.")
# Info Window
REGISTER_WINDOW = _("Setting up software updates")
LOGIN_PROMPT = _("Please enter your login information for the %s Red "
"Hat Network Satellite:\n\n")
-NEW_LOGIN = _("Create a New Login ...")
HOSTED_LOGIN = _("Red Hat Login:")
LOGIN = _("Login:")
PASSWORD = _("Password:")
@@ -96,37 +92,13 @@ LOGIN_TIP = _("Tip: Forgot your login or password? Contact your "
"Satellite's Organization Administrator.")
USER_REQUIRED = _("Please enter a desired login.")
PASSWORD_REQUIRED = _("Please enter and verify a password.")
-PASSWORD_MISMATCH = _("The two passwords you entered don't match. "
- "Please re-type your passwords.")
# Product Window
-PRODUCT_WINDOW = _("Create a new Red Hat login")
-PRODUCT_WINDOW_PROMPT = _("Fill in the form below to create a new Red Hat "
- "login for use with Red Hat Network (http://rhn.redhat.com/). "
- "Required information is marked with a '*':")
HOSTED_LOGIN_PROMPT = _("Please enter your login information for Red "
"Hat Network (http://rhn.redhat.com/):\n\n")
HOSTED_LOGIN_TIP = _("Tip: Forgot your login or password? "
"Visit: https://rhn.redhat.com/rhn/sales/LoginInfo.do")
-HOSTED_LOGIN_ENTRY = _("*Desired Login:")
-HOSTED_LOGIN_ENTRY_TIP = _("Examples: user(a)domain.com")
-HOSTED_PASSWORD_ENTRY = _("*Desired Password:")
-PASSWORD_VERIFY = _("*Confirm Password:")
EMAIL = _("*Email Address:")
-COMPANY_TIP = _("Tip: Leave blank if not with a company.")
-PRIVACY_TIP = _("Tip: Red Hat values your privacy. "
- "View our privacy policy at: "
- "http://")
-
-FIRST_NAME_REQD = _("Please enter your first name.")
-LAST_NAME_REQD = _("Please enter your last name.")
-EMAIL_ADDR_REQD = _("Please enter your email address.")
-EMAIL_ADDR_VERIFY = _("Please enter a valid email address.")
-COUNTRY_REQD = _("Please enter your country.")
-LOGIN_TOO_SHORT = _("Please enter a longer login.")
-PASSWORD_TOO_SHORT = _("Please enter a longer password.")
-PASSWORD_TOO_LONG = _("Please enter a shorter password.")
-
SYSTEM_ALREADY_REGISTERED = _("It appears this system has already been set up for software updates:")
SYSTEM_ALREADY_REGISTERED_CONT = _("Are you sure you would like to continue?")
@@ -137,7 +109,6 @@ ORG_SELECT_PROMPT = _("Your login, %s, is associated with multiple "
"organizations. You will need to select an organization to connect this "
"system to.")
ORG_PROMPT = _("Organization:")
-ORG_REQUIRED = _("You must select an organization.")
# Subscription window.
SUBSCRIPTION_WINDOW = _("Access a subscription")
@@ -166,14 +137,6 @@ SEND_WINDOW = _("We are finished collecting information for the Syst
# Finish Window
FINISH_WINDOW = _("Finish setting up software updates")
-FINISH_WINDOW_TEXT = _("Congratulations, you have successfully completed software updates "
- "set up for this system.\n\n"
- "Your system is now ready to receive the software updates that will keep "
- "it secure and supported.\n\n"
- "You'll know when software updates are available when a package icon appears "
- "in the notification area of you desktop (usually in the upper-right corner.) "
- "Clicking on this icon, when available, will guide you through applying any "
- "updates that are available.")
FINISH_WINDOW_TEXT_TUI = _("You may now run 'yum update' from this system's "
"command line to get the latest "
"software updates from Red Hat Network. You will need to run this "
@@ -309,12 +272,6 @@ HOSTED_CONNECTION_ERROR = _("We can't contact the Red Hat Network Server.\n\n
"This system will not be able to successfully receive software updates "
"from Red Hat without connecting to a Red Hat Network server")
-SATELLITE_CONNECTION_ERROR = _("We can't contact the Red Hat Network Server.\n\n"
- "Double check the location provided - is '%s' correct?\n"
- "If not, you can correct it and try again.\n\n"
- "Make sure that the network connection on this system is operational.\n\n"
- "This system will not be able to successfully receive software updates "
- "from Red Hat without connecting to a Red Hat Network server")
BASECHANNELERROR = _("Architecture: %s, OS Release: %s, OS "
"Version: %s")
SERVER_TOO_OLD = _("This server doesn't support functionality "
14 years, 2 months