From d9cc095760861d869d2e2ccf05f94454dad32f00 Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Sun, 6 Feb 2011 22:37:08 +0000 Subject: Synthesized commit during git-svn import combining previous Mandriva history with Magiea. This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r431 | dmorgan | 2011-02-06 01:58:02 +0000 (Sun, 06 Feb 2011) | 1 line Add drakx structure on the SVN ------------------------------------------------------------------------ r432 | dmorgan | 2011-02-06 01:59:38 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned advertising ------------------------------------------------------------------------ r446 | dmorgan | 2011-02-06 22:37:08 +0000 (Sun, 06 Feb 2011) | 1 line Import Clean perl-install ------------------------------------------------------------------------ r448 | dmorgan | 2011-02-06 23:02:36 +0000 (Sun, 06 Feb 2011) | 1 line Add cleaned files ------------------------------------------------------------------------ r449 | dmorgan | 2011-02-06 23:03:52 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned kernel ------------------------------------------------------------------------ r450 | dmorgan | 2011-02-06 23:23:30 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned tools ------------------------------------------------------------------------ r451 | dmorgan | 2011-02-07 00:01:56 +0000 (Mon, 07 Feb 2011) | 1 line Import stage1 ------------------------------------------------------------------------ r473 | dmorgan | 2011-02-07 11:20:50 +0000 (Mon, 07 Feb 2011) | 1 line Import images ------------------------------------------------------------------------ r497 | ennael | 2011-02-09 21:02:06 +0000 (Wed, 09 Feb 2011) | 2 lines readd missing file ------------------------------------------------------------------------ r502 | pterjan | 2011-02-09 23:30:32 +0000 (Wed, 09 Feb 2011) | 1 line Import rescue ------------------------------------------------------------------------ r603 | ennael | 2011-02-24 13:32:54 +0000 (Thu, 24 Feb 2011) | 2 lines import cleaned rescue for Mageia ------------------------------------------------------------------------ r2061 | tv | 2011-10-20 20:32:19 +0100 (Thu, 20 Oct 2011) | 1 line import (cleaned) doc ------------------------------------------------------------------------ --- perl-install/partition_table/bsd.pm | 2 +- perl-install/partition_table/dos.pm | 2 +- perl-install/partition_table/empty.pm | 2 +- perl-install/partition_table/gpt.pm | 2 +- perl-install/partition_table/mac.pm | 2 +- perl-install/partition_table/raw.pm | 4 ++-- perl-install/partition_table/sun.pm | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'perl-install/partition_table') diff --git a/perl-install/partition_table/bsd.pm b/perl-install/partition_table/bsd.pm index 9421eae17..f69cae97c 100644 --- a/perl-install/partition_table/bsd.pm +++ b/perl-install/partition_table/bsd.pm @@ -1,4 +1,4 @@ -package partition_table::bsd; # $Id$ +package partition_table::bsd; # $Id: bsd.pm 228416 2007-09-18 10:32:56Z pixel $ use diagnostics; use strict; diff --git a/perl-install/partition_table/dos.pm b/perl-install/partition_table/dos.pm index 7b2736206..2cd6fe311 100644 --- a/perl-install/partition_table/dos.pm +++ b/perl-install/partition_table/dos.pm @@ -1,4 +1,4 @@ -package partition_table::dos; # $Id$ +package partition_table::dos; # $Id: dos.pm 263707 2009-11-26 13:26:41Z pterjan $ use diagnostics; use strict; diff --git a/perl-install/partition_table/empty.pm b/perl-install/partition_table/empty.pm index fe4550f47..5d45143f8 100644 --- a/perl-install/partition_table/empty.pm +++ b/perl-install/partition_table/empty.pm @@ -1,4 +1,4 @@ -package partition_table::empty; # $Id$ +package partition_table::empty; # $Id: empty.pm 228433 2007-09-18 12:30:17Z pixel $ #- this is a mainly dummy partition table. If we find it's empty, we just call - #- ->clear which will take care of bless'ing us to the partition table type best diff --git a/perl-install/partition_table/gpt.pm b/perl-install/partition_table/gpt.pm index 10eab253b..c0f748b06 100644 --- a/perl-install/partition_table/gpt.pm +++ b/perl-install/partition_table/gpt.pm @@ -1,4 +1,4 @@ -package partition_table::gpt; # $Id$ +package partition_table::gpt; # $Id: gpt.pm 252200 2009-01-27 18:08:22Z pterjan $ use diagnostics; use strict; diff --git a/perl-install/partition_table/mac.pm b/perl-install/partition_table/mac.pm index 2922bc7a3..015feaee6 100644 --- a/perl-install/partition_table/mac.pm +++ b/perl-install/partition_table/mac.pm @@ -1,4 +1,4 @@ -package partition_table::mac; # $Id$ +package partition_table::mac; # $Id: mac.pm 228416 2007-09-18 10:32:56Z pixel $ use diagnostics; #use strict; - fixed other PPC code to comply, but program bails on empty partition table - sbenedict diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm index edae9bb65..c2430f703 100644 --- a/perl-install/partition_table/raw.pm +++ b/perl-install/partition_table/raw.pm @@ -1,4 +1,4 @@ -package partition_table::raw; # $Id$ +package partition_table::raw; # $Id: raw.pm 266069 2010-02-09 19:47:35Z pterjan $ use diagnostics; use strict; @@ -20,7 +20,7 @@ if_(arch() =~ /ppc/, [ 'grub', 0, "\xEBH", 0x17e, "stage1 \0" ], [ 'grub', 0, "\xEBH", 0x18a, "stage1 \0" ], sub { my ($F) = @_; - #- standard grub has no good magic (Mandriva's grub is patched to have "GRUB" at offset 6) + #- standard grub has no good magic (Mageia's grub is patched to have "GRUB" at offset 6) #- so scanning a range of possible places where grub can have its string #- 0x176 found on Conectiva 10 my ($min, $max, $magic) = (0x176, 0x181, "GRUB \0"); diff --git a/perl-install/partition_table/sun.pm b/perl-install/partition_table/sun.pm index 1532c04a9..47d702621 100644 --- a/perl-install/partition_table/sun.pm +++ b/perl-install/partition_table/sun.pm @@ -1,4 +1,4 @@ -package partition_table::sun; # $Id$ +package partition_table::sun; # $Id: sun.pm 228416 2007-09-18 10:32:56Z pixel $ use diagnostics; use strict; -- cgit v1.2.1