/[smeserver]/rpms/e-smith-base/sme7/e-smith-base-4.18.0-bootstrap.patch
ViewVC logotype

Contents of /rpms/e-smith-base/sme7/e-smith-base-4.18.0-bootstrap.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.2 - (show annotations) (download)
Wed Mar 26 17:01:37 2008 UTC (16 years, 7 months ago) by slords
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
* Wed Mar 26 2008 Shad L. Lords <slords@mail.com> 4.18.1-2
- Fix gettext strings returned by password checks [SME: 4104]

1 diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.0/root/sbin/e-smith/bootstrap-console mezzanine_patched_e-smith-base-4.18.0/root/sbin/e-smith/bootstrap-console
2 --- e-smith-base-4.18.0/root/sbin/e-smith/bootstrap-console 2007-01-26 20:56:31.000000000 -0500
3 +++ mezzanine_patched_e-smith-base-4.18.0/root/sbin/e-smith/bootstrap-console 2007-06-06 16:00:53.000000000 -0400
4 @@ -43,7 +43,7 @@
5 esmith::console::system_password->new->doit($console, $db);
6
7 use esmith::console::configure;
8 -esmith::console::configure->new->doit($console, $db);
9 +esmith::console::configure->new(bootstrap => 1)->doit($console, $db);
10
11 use esmith::console::save_config;
12 esmith::console::save_config->new->doit($console, $db);
13 diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm
14 --- e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm 2007-06-06 16:01:00.000000000 -0400
15 +++ mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm 2007-06-06 16:00:52.000000000 -0400
16 @@ -18,6 +18,8 @@
17 my $self = {
18 name => "Configure this server",
19 order => 20,
20 + bootstrap => 0,
21 + @_,
22 };
23 bless $self, $class;
24 return $self;
25 @@ -242,6 +244,7 @@
26 my $self = shift;
27 $console = shift;
28 $db = shift;
29 +
30 return if ($db->get_prop('bootstrap-console', 'ForceSave') eq 'yes'); # We can skip the menus
31 my $SystemName = $db->get_value('SystemName');
32 my $DomainName = $db->get_value('DomainName');
33 @@ -275,7 +278,12 @@
34 value => $DomainName
35 );
36
37 - return unless ($rc == 0);
38 + if ($rc != 0)
39 + {
40 + # If user cancelled, either loop or go back to main menu
41 + goto DOMAIN_NAME if $self->{bootstrap};
42 + return;
43 + }
44
45 if ($choice)
46 {

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed