/[smeserver]/rpms/e-smith-base/sme8/e-smith-base-4.18.0-mediaglob.patch
ViewVC logotype

Contents of /rpms/e-smith-base/sme8/e-smith-base-4.18.0-mediaglob.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:51 2008 UTC (16 years, 7 months ago) by slords
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
Error occurred while calculating annotation data.
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/usr/lib/perl5/site_perl/esmith/console/perform_backup.pm mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_backup.pm
2 --- e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_backup.pm 2007-02-11 13:06:45.000000000 -0700
3 +++ mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_backup.pm 2007-02-11 13:05:45.000000000 -0700
4 @@ -65,7 +65,15 @@
5 );
6 return unless $rc == 0;
7 sleep(3);
8 - my @dirs = map { m:^(/media/usbdisk*):; $1 } glob '/media/usbdisk*';
9 + my @dirs;
10 + open(FSTAB, "</etc/fstab");
11 + while (<FSTAB>)
12 + {
13 + next unless m:^(\S+)\s+(/media/\S+)\s+(\S+)\s+(\S+):;
14 + my ($dev, $mount, $filesys, $options) = ($1, $2, $3, $4);
15 + push @dirs, $mount if ($options =~ /rw/);
16 + }
17 + close FSTAB;
18 unless ($dirs[0])
19 {
20 ($rc, $choice) = $console->message_page
21 diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm
22 --- e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm 2007-02-11 13:06:45.000000000 -0700
23 +++ mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm 2007-02-11 13:06:30.000000000 -0700
24 @@ -35,8 +35,16 @@
25 gettext("Insert memory stick or CDROM containing your backup file, then hit the enter key."),
26 );
27 return unless $rc == 0;
28 - sleep(1);
29 - my @dirs = glob '/media/*';
30 + sleep(3);
31 + my @dirs;
32 + open(FSTAB, "</etc/fstab");
33 + while (<FSTAB>)
34 + {
35 + next unless m:^(\S+)\s+(/media/\S+)\s+(\S+)\s+(\S+):;
36 + my ($dev, $mount, $filesys, $options) = ($1, $2, $3, $4);
37 + push @dirs, $mount if ($options =~ /rw/);
38 + }
39 + close FSTAB;
40 unless ($dirs[0])
41 {
42 ($rc, $choice) = $console->message_page

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