client/rhel/rhn-client-tools/man/en/rhnreg_ks.8 | 11 ++---------
client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py | 13 -------------
2 files changed, 2 insertions(+), 22 deletions(-)
New commits:
commit 1720a11c18fb3b8f9ce9549854ce6dfa6f9b66b8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 25 16:28:20 2010 +0100
Since we do not call rhnreg.registerUser anymore, the --email option is no longer
applicable.
diff --git a/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
b/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
index c429335..1d6ef91 100644
--- a/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
+++ b/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
@@ -44,10 +44,6 @@ can be an existing Red Hat Network username, or a new username.
The password associated with the username specified with the \fB--username\fR
option. This is an unencrypted password.
.br
-.IP "\fB--email\fP"
-The email address associated with the username specified with the \fB--username\fR
-option.
-.br
.IP "\fB--activationkey\fP"
Specify/use a serial number to associate with the system. This is
optional, but activation keys can really simplify the registration
@@ -112,7 +108,7 @@ Register a new system to Red Hat Network:
.RS
.nf
-rhnreg_ks --profilename "example_profile_name" --username
"someexampleuser" --email "someexampleuser(a)example.com" --password
"foobar"
+rhnreg_ks --profilename "example_profile_name" --username
"someexampleuser" --password "foobar"
.fi
.RE
@@ -120,7 +116,7 @@ Register a new system to Red Hat Network with contact info:
.RS
.nf
-rhnreg_ks --profilename "example_profile_name" --username
"someexampleuser" --email "someexampleuser(a)example.com" --password
"foobar" --contactinfo < contactinfo
+rhnreg_ks --profilename "example_profile_name" --username
"someexampleuser" --password "foobar" --contactinfo < contactinfo
where the file "contactinfo" contains data in the format:
diff --git a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
index fb43a18..fd168a0 100755
--- a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
@@ -46,8 +46,6 @@ class RegisterKsCli(rhncli.RhnCli):
help=_("Specify a username")),
self.optparser.add_option("--password", action="store",
help=_("Specify a password")),
- self.optparser.add_option("--email", action="store",
- help=_("Specify an email address")),
self.optparser.add_option("--systemorgid", action="store",
help=_("Specify an organizational id for this system")),
self.optparser.add_option("--serverUrl", action="store",
commit b27c6ad4b90a6c4c3f970fc0f8faefae7c134c9c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 25 16:26:53 2010 +0100
No need to rhnreg.reserveUser nor rhnreg.registerUser -- the authentication is handled
by subsequent calls anyway.
diff --git a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
index 1383023..fb43a18 100755
--- a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
@@ -89,13 +89,6 @@ class RegisterKsCli(rhncli.RhnCli):
rhnreg.getCaps()
- if not self.options.activationkey:
- # reserve the username
- ret = rhnreg.reserveUser(self.options.username,
- self.options.password)
- rhnreg.registerUser(self.options.username, self.options.password,
- self.options.email)
-
if not self.options.nopackages:
getArch = 0
if rhnreg.cfg['supportsExtendedPackageProfile']:
commit 164b10843f80814ef621a69dcd74a33295888e21
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Feb 12 13:40:15 2010 +0100
Removing the --subscription option from rhnreg_ks.
diff --git a/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
b/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
index f3aa319..c429335 100644
--- a/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
+++ b/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
@@ -54,9 +54,6 @@ optional, but activation keys can really simplify the registration
process. Learn more about activation keys in the online RHN
documentation.
.br
-.IP "\fB--subscription\fP"
-Specify a subscription number to register the system with.
-.br
.IP "\fB--contactinfo\fP"
This option has been deprecated. Please login to the server
web user interface and update your contactinfo.
diff --git a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
index 0e62135..1383023 100755
--- a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
@@ -56,8 +56,6 @@ class RegisterKsCli(rhncli.RhnCli):
help=_("Specify a file to use as the ssl CA cert")),
self.optparser.add_option("--activationkey", action="store",
help=_("Specify an activation key")),
- self.optparser.add_option("--subscription", action="store",
- help=_("Specify a installation number to use")),
self.optparser.add_option("--use-eus-channel",
action="store_true",
help=_("Subscribe this system to the EUS channel tied to the
system's redhat-release")),
self.optparser.add_option("--contactinfo",
action="store_true",
@@ -115,8 +113,6 @@ class RegisterKsCli(rhncli.RhnCli):
profilename = RegisterKsCli.__generateProfileName(hardwareList)
other = {}
- if self.options.subscription:
- other['registrationNumber'] = self.options.subscription
if self.options.systemorgid:
other['org_id'] = self.options.systemorgid