From 8061a2db18a0162e9d70cb1448e28f367776fdf1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 19 Apr 2005 13:10:25 +0000
Subject: mandriva switch

---
 rescue/drvinst            |  8 +++++---
 rescue/guessmounts        |  9 ++++++---
 rescue/install_bootloader |  9 ++++++---
 rescue/lsparts            | 15 +++++++++------
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/rescue/drvinst b/rescue/drvinst
index e35038815..8066f0f0a 100755
--- a/rescue/drvinst
+++ b/rescue/drvinst
@@ -1,9 +1,8 @@
 #!/usr/bin/perl
-
 #
-# Guillaume Cottenceau (gc@mandrakesoft.com)
+# Guillaume Cottenceau
 #
-# Copyright 2000 Mandrakesoft
+# Copyright 2000-2005 Mandriva
 #
 # This software may be freely redistributed under the terms of the GNU
 # public license.
@@ -64,6 +63,9 @@ foreach $card (pci_probe()) {
 
 #-------------------------------------------------
 #- $Log$
+#- Revision 1.8  2005/04/19 13:10:25  prigaux
+#- mandriva switch
+#-
 #- Revision 1.7  2004/07/20 02:42:12  prigaux
 #- MandrakeSoft -> Mandrakesoft
 #-
diff --git a/rescue/guessmounts b/rescue/guessmounts
index cce1d5d35..5220d0815 100755
--- a/rescue/guessmounts
+++ b/rescue/guessmounts
@@ -1,8 +1,8 @@
 #!/usr/bin/perl
 #
-# Guillaume Cottenceau (gc@mandrakesoft.com)
+# Guillaume Cottenceau
 #
-# Copyright 2001 Mandrakesoft
+# Copyright 2001-2005 Mandriva
 #
 # This software may be freely redistributed under the terms of the GNU
 # public license.
@@ -42,7 +42,7 @@ M: foreach (@parts) {
 	my $where = $target;
 	if (!system("mount -t $fs $dev $where 2>/dev/null")) {
 	    if (-r "$where/etc/fstab" && -r "$where/etc/mandrake-release") {
-		print "=> found a Mandrake root partition on $dev\n=> type $fs, version `",
+		print "=> found a Mandriva Linux root partition on $dev\n=> type $fs, version `",
 		      chomp_(cat_ "$where/etc/mandrake-release"),
 		      "'\n";
 		@fstab = cat_("$where/etc/fstab");
@@ -82,6 +82,9 @@ if ($root) {
 
 #-------------------------------------------------
 #- $Log$
+#- Revision 1.8  2005/04/19 13:10:25  prigaux
+#- mandriva switch
+#-
 #- Revision 1.7  2004/07/20 02:42:12  prigaux
 #- MandrakeSoft -> Mandrakesoft
 #-
diff --git a/rescue/install_bootloader b/rescue/install_bootloader
index d49a04581..10812d41f 100755
--- a/rescue/install_bootloader
+++ b/rescue/install_bootloader
@@ -1,8 +1,8 @@
 #!/usr/bin/perl
 #
-# Guillaume Cottenceau (gc@mandrakesoft.com)
+# Guillaume Cottenceau
 #
-# Copyright 2001 Mandrakesoft
+# Copyright 2001-2005 Mandriva
 #
 # This software may be freely redistributed under the terms of the GNU
 # public license.
@@ -26,7 +26,7 @@ grep { (split)[1] =~ m|^/mnt$| } @mounts or die "Your root device isn't mounted
 my ($f) = grep { -f $_ } map { "/mnt/etc/$_" } 'mandrakelinux-release', 'mandrake-release';
 $f && cat_($f) =~ /Mandrake/ or die "$f doesn't contain 'Mandrake', exiting.\n";
 
-print "About to re-install Boot Loader of following Mandrake distro:\n\t",
+print "About to re-install Boot Loader of following Mandriva Linux distribution:\n\t",
   chomp_(cat_ "/mnt/etc/mandrake-release"),
   "\n=> ok? <press Enter to continue, 'n' and Enter to cancel> ";
 <STDIN> =~ /^n/i and exit 0;
@@ -38,6 +38,9 @@ die "error: couldn't exec /mnt/sbin/lilo.\n";
 
 #-------------------------------------------------
 #- $Log$
+#- Revision 1.4  2005/04/19 13:10:25  prigaux
+#- mandriva switch
+#-
 #- Revision 1.3  2004/09/28 06:24:30  prigaux
 #- handle /etc/mandrakelinux-release
 #-
diff --git a/rescue/lsparts b/rescue/lsparts
index 7dcc936eb..edbf2900e 100755
--- a/rescue/lsparts
+++ b/rescue/lsparts
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
 #
-# Main author Pascal Rigaux (pixel@mandrakesoft.com)
-# Put together by Guillaume Cottenceau (gc@mandrakesoft.com)
+# Main author Pascal Rigaux (pixel@mandriva.com)
+# Put together by Guillaume Cottenceau
 #
-# Copyright 1999,2000,2001 Mandrakesoft
+# Copyright 1999-2005 Mandriva
 #
 # This software may be freely redistributed under the terms of the GNU
 # public license.
@@ -13,10 +13,10 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 #
-# This code is extracted from DrakX, the Mandrakelinux graphical installer.
-#   http://www.mandrakelinux.com/drakx/
+# This code is extracted from DrakX, the Mandriva Linux graphical installer.
+#   http://www.mandrivalinux.com/drakx/
 # Open development rulz, find CVS here:
-#   http://www.mandrakelinux.com/cgi-bin/cvsweb.cgi/gi/
+#   http://www.mandrivalinux.com/cgi-bin/cvsweb.cgi/gi/
 #
 # Detects partition types using signatures
 #
@@ -115,6 +115,9 @@ P: foreach (@parts) {
 
 #-------------------------------------------------
 #- $Log$
+#- Revision 1.5  2005/04/19 13:10:25  prigaux
+#- mandriva switch
+#-
 #- Revision 1.4  2004/07/20 02:42:12  prigaux
 #- MandrakeSoft -> Mandrakesoft
 #-
-- 
cgit v1.2.1