Apply Mageia branding patch

7 files changed, 14 insertions, 14 deletions

diff --git a/inittab b/inittab
index 291c9cff..3a0d4eeb 100644
--- a/inittab
+++ b/inittab
@@ -6,7 +6,7 @@
 #               Modified for RHS Linux by Marc Ewing and Donnie Barnes
 #
 
-# Default runlevel. The runlevels used by Mandriva Linux are:
+# Default runlevel. The runlevels used by Mageia are:
 #   0 - halt (Do NOT set initdefault to this)
 #   1 - Single user mode
 #   2 - Multiuser, without NFS (The same as 3, if you do not have networking)
diff --git a/mandriva/mandrake_everytime b/mandriva/mandrake_everytime
index 9147416c..1456b9b7 100644
--- a/mandriva/mandrake_everytime
+++ b/mandriva/mandrake_everytime
@@ -73,8 +73,8 @@ if [ $SECURE_LEVEL -lt 4 ]; then
     fi
 fi
 
-SYSTEM=${SYSTEM="Mandriva Linux"}
-R=$(cat /etc/mandriva-release)
+SYSTEM=${SYSTEM="Mageia"}
+R=$(cat /etc/release)
 
 if [ -r /etc/sysconfig/oem ]; then
     . /etc/sysconfig/oem
@@ -87,7 +87,7 @@ fi
 # Source functions
 . /etc/init.d/functions
 
-if [ "$REWRITEISSUE" = "rewrite" -a -f /etc/mandriva-release ]; then
+if [ "$REWRITEISSUE" = "rewrite" -a -f /etc/release ]; then
 
     arch=$(uname -m)
     a="a"
diff --git a/mandriva/po/ms.po b/mandriva/po/ms.po
index 749ba65d..c73cda25 100644
--- a/mandriva/po/ms.po
+++ b/mandriva/po/ms.po
@@ -2555,7 +2555,7 @@ msgstr "Alatan Konfigurasi Pelayan"
 #: /etc/rc.d/init.d/ez-ipupdate:67
 #, fuzzy, c-format
 msgid "last IP update : %s\n"
-msgstr "Mandriva Linux Update"
+msgstr "Mageia Update"
 
 #: /etc/rc.d/init.d/ez-ipupdate:95 /etc/rc.d/init.d/ipsec-setkey:118
 #: /etc/rc.d/init.d/ivman:82 /etc/rc.d/init.d/noip:78
diff --git a/mandriva/supermount.8 b/mandriva/supermount.8
index e1fc24a3..de780425 100644
--- a/mandriva/supermount.8
+++ b/mandriva/supermount.8
@@ -1,4 +1,4 @@
-.TH SUPERMOUNT 8 "Dec 1999" "initscripts" "Mandriva"
+.TH SUPERMOUNT 8 "Dec 1999" "initscripts" "Mageia"
 .SH NAME
 supermount \- Enable or disable supermount feature
 .SH SYNOPSIS
@@ -7,7 +7,7 @@ supermount \- Enable or disable supermount feature
 .SH DESCRIPTION
 .PP
 \fBsupermount\fR allows system administrator to enable or disable the
-\fBsupermount\fR feature offered in recent Mandriva kernels.  This
+\fBsupermount\fR feature offered in recent Mageia kernels.  This
 feature automatically manages mounting and unmounting removable medias
 when needed.  The script simply adds or remove the \fBsupermount\fR
 option from within the entries of the \fI/etc/fstab\fR file.  Without
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index b4779b18..6a626533 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -211,8 +211,8 @@ relabel_selinux() {
 # Print a text banner.
 # C-like escape sequences don't work as 2nd and up parameters of gprintf,
 # so real escap chars were written
-PRODUCT=`sed "s/.*release \([0-9.]*\).*/\1/g" /etc/mandriva-release 2> /dev/null`
-SYSTEM=${SYSTEM="Mandriva Linux"}
+PRODUCT=`sed "s/.*release \([0-9.]*\).*/\1/g" /etc/release 2> /dev/null`
+SYSTEM=${SYSTEM="Mageia"}
 
 if [ -r /etc/sysconfig/oem ]; then
     . /etc/sysconfig/oem
diff --git a/sysconfig.txt b/sysconfig.txt
index 5d49631f..92982258 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -138,7 +138,7 @@ Generic options:
      specify 'remove' and create /etc/security/msec/issue and/or
      /etc/security/msec/issue.net
 
-  Mandriva specific values:
+  Mageia specific values:
 
   BRLTTY=yes|no
        Set to 'no' to disable automatic startup of brltty if it is present
@@ -629,7 +629,7 @@ Files in /etc/sysconfig/network-scripts/
   system) you can specify a timeout of waiting the answer from server,
   the option is called DHCP_TIMEOUT the default is 60 sec.
 
-  Mandriva specific items for DHCP clients:
+  Mageia specific items for DHCP clients:
     DHCP_HOSTNAME=
       This option specifies the hostname to request to the DHCP server.
       The name  may  or  may not  be qualified with the local domain name.
@@ -655,7 +655,7 @@ Files in /etc/sysconfig/network-scripts/
       the DHCP client will try to get an IP address after its initial request
       (specific to dhclient and dhcpcd, default is 60 seconds)
 
-  Mandriva items:
+  Mageia items:
     LINK_DETECTION_DELAY=<time in seconds>
       Delay after which a lack of link beat will be considered to
       result from an unplugged interface, rather than just down
diff --git a/sysconfig/network-scripts/ifup-wireless b/sysconfig/network-scripts/ifup-wireless
index a75699ec..828af727 100755
--- a/sysconfig/network-scripts/ifup-wireless
+++ b/sysconfig/network-scripts/ifup-wireless
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # Configure wireless network device options.  See iwconfig(8) for more info.
-# Mandriva prefixes the following variables with WIRELESS_ prefix.
+# Mageia prefixes the following variables with WIRELESS_ prefix.
 # Valid variables:
 #    MODE: Ad-Hoc, Managed, etc.
 #    ESSID: Name of the wireless network
@@ -47,7 +47,7 @@
 
 # Only meant to be called from ifup.
 
-# unify variables common to RH and Mandriva-style ifcfg
+# unify variables common to RH and Mageia-style ifcfg
 MODE=${MODE:-$WIRELESS_MODE}
 ESSID=${ESSID:-$WIRELESS_ESSID}
 NWID=${NWID:-$WIRELESS_NWID}