diff options
| author | Mageia SVN-Git Migration <svn-git-migration@mageia.org> | 2011-02-06 22:37:08 +0000 |
|---|---|---|
| committer | Mageia SVN-Git Migration <svn-git-migration@mageia.org> | 2011-02-06 22:37:08 +0000 |
| commit | fd8bbba2f02b8bccd69e67c326fd320c0827941d (patch) | |
| tree | ade69986b2f99e113c95009736399966d4a3d511 | |
| parent | 368f416649ed34557702a946ec8c0cec2fd45294 (diff) | |
| download | drakx-fd8bbba2f02b8bccd69e67c326fd320c0827941d.tar drakx-fd8bbba2f02b8bccd69e67c326fd320c0827941d.tar.gz drakx-fd8bbba2f02b8bccd69e67c326fd320c0827941d.tar.bz2 drakx-fd8bbba2f02b8bccd69e67c326fd320c0827941d.tar.xz drakx-fd8bbba2f02b8bccd69e67c326fd320c0827941d.zip | |
Synthesized commit during git-svn import combining previous Mandriva history with Mageia.
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
------------------------------------------------------------------------
770 files changed, 11767 insertions, 19016 deletions
diff --git a/advertising/IM_flash.pl b/advertising/IM_flash.pl deleted file mode 100644 index 57f146bb6..000000000 --- a/advertising/IM_flash.pl +++ /dev/null @@ -1 +0,0 @@ -$title = N("Your desktop on a USB key"); diff --git a/advertising/IM_flash.png b/advertising/IM_flash.png Binary files differdeleted file mode 100644 index eb94494b8..000000000 --- a/advertising/IM_flash.png +++ /dev/null diff --git a/advertising/IM_free.pl b/advertising/IM_free.pl deleted file mode 100644 index da447e629..000000000 --- a/advertising/IM_free.pl +++ /dev/null @@ -1 +0,0 @@ -$title = N("The 100%% open source Mandriva Linux distribution"); diff --git a/advertising/IM_free.png b/advertising/IM_free.png Binary files differdeleted file mode 100644 index 9d994d6cb..000000000 --- a/advertising/IM_free.png +++ /dev/null diff --git a/advertising/IM_mageia.pl b/advertising/IM_mageia.pl new file mode 100644 index 000000000..74bb44afa --- /dev/null +++ b/advertising/IM_mageia.pl @@ -0,0 +1 @@ +$title = N("Mageia Alpha distribution"); diff --git a/advertising/IM_mageia.png b/advertising/IM_mageia.png Binary files differnew file mode 100644 index 000000000..f3fc768c6 --- /dev/null +++ b/advertising/IM_mageia.png diff --git a/advertising/IM_one.pl b/advertising/IM_one.pl deleted file mode 100644 index d2cc11ed0..000000000 --- a/advertising/IM_one.pl +++ /dev/null @@ -1 +0,0 @@ -$title = N("Explore Linux easily with Mandriva One"); diff --git a/advertising/IM_one.png b/advertising/IM_one.png Binary files differdeleted file mode 100644 index 483b62573..000000000 --- a/advertising/IM_one.png +++ /dev/null diff --git a/advertising/IM_pwp.pl b/advertising/IM_pwp.pl deleted file mode 100644 index 21c698e9f..000000000 --- a/advertising/IM_pwp.pl +++ /dev/null @@ -1 +0,0 @@ -$title = N("A full Mandriva Linux desktop, with support"); diff --git a/advertising/IM_pwp.png b/advertising/IM_pwp.png Binary files differdeleted file mode 100644 index 09e40d9aa..000000000 --- a/advertising/IM_pwp.png +++ /dev/null diff --git a/advertising/IM_range.pl b/advertising/IM_range.pl deleted file mode 100644 index fde1186af..000000000 --- a/advertising/IM_range.pl +++ /dev/null @@ -1 +0,0 @@ -$title = N("Mandriva: distributions for everybody's needs"); diff --git a/advertising/IM_range.png b/advertising/IM_range.png Binary files differdeleted file mode 100644 index e26a3cac1..000000000 --- a/advertising/IM_range.png +++ /dev/null diff --git a/advertising/Makefile b/advertising/Makefile index 022cee4b4..a710284cc 100644 --- a/advertising/Makefile +++ b/advertising/Makefile @@ -1,4 +1,4 @@ -VERSION = 2010.1 +VERSION = 2011.0 PRODUCT = drakx-installer-advertising THEME = pwp diff --git a/advertising/NEWS b/advertising/NEWS index 3163c1237..924adf1cd 100644 --- a/advertising/NEWS +++ b/advertising/NEWS @@ -1,3 +1,7 @@ +Version 2011.0 - 13 Oct 2010 + +- bump version + Version 2010.1 - 02 May 2010 - 2010.1 images diff --git a/advertising/list-dis b/advertising/list-dis deleted file mode 100644 index 3ca560e8d..000000000 --- a/advertising/list-dis +++ /dev/null @@ -1,14 +0,0 @@ -LinDVD.png -TRANSGAMING-CEDEGA.png -FLATOUT.png -Kaspersky.png -Skype.png -IM_ONE.png -IM_3D.png -IM_THEME.png -IM-GWENVIEW.png -IM_RPMDRAKE.png -IM_web2.png -IM_SERVICES.png -IM_GAMME.png -IM_REGISTER.png diff --git a/advertising/list-dwd b/advertising/list-dwd deleted file mode 100644 index d6d6cbc9d..000000000 --- a/advertising/list-dwd +++ /dev/null @@ -1,14 +0,0 @@ -LinDVD.png -TRANSGAMING-CEDEGA.png -FLATOUT.png -Kaspersky.png -Skype.png -ARKEIA_EN.png -IM_3D.png -IM_THEME.png -VPN.png -IM_RPMDRAKE.png -IM_web2.png -IM_SERVICES.png -IM_GAMME.png -IM_REGISTER.png diff --git a/advertising/list-ppp b/advertising/list-ppp deleted file mode 100644 index 862cd4833..000000000 --- a/advertising/list-ppp +++ /dev/null @@ -1,13 +0,0 @@ -bitdefender.png -ARKEIA_EN.png -VPN.png -IM_INVICTUS.png -IM_RPMDRAKE.png -IM_CRM.png -IM_CMSJOOMLA.png -IM_web2.png -IM_THEME.png -IM_3D.png -IM_SERVICES.png -IM_GAMME.png -IM_REGISTER.png diff --git a/advertising/list-pwp b/advertising/list-pwp index 75a525574..badf546ec 100644 --- a/advertising/list-pwp +++ b/advertising/list-pwp @@ -1,5 +1 @@ -IM_flash.png -IM_free.png -IM_one.png -IM_pwp.png -IM_range.png +IM_mageia.png diff --git a/docs/README b/docs/README index 54320919f..6c7e3cb6c 100644 --- a/docs/README +++ b/docs/README @@ -5,14 +5,14 @@ Well here is a little description of what DrakX needs to work ******************************************************************************** Like all good free software, DrakX is in SVN :) -You can access it at http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/drakx/trunk/ +You can access it at http://svnweb.mageia.org/soft/drakx/trunk/ or via -svn co http://svn.mandriva.com/svn/soft/drakx/trunk drakx +svn co svn+ssh://svn.mageia.org/svn/soft/drakx/trunk -This is only read-only access. If you want more, tell me (pixel@mandriva.com) +This is only read-only access. If you want more, tell me (pixel) ******************************************************************************** * Making your custom install *************************************************** diff --git a/docs/ka_method/doc-duplication.xml b/docs/ka_method/doc-duplication.xml index 1ddb431e4..8196835fb 100644 --- a/docs/ka_method/doc-duplication.xml +++ b/docs/ka_method/doc-duplication.xml @@ -27,7 +27,7 @@ <listitem><para>you must re-create same partition table as the golden node (even if size can differ)</para></listitem> <listitem><para>even if it has been tested, it's still an experimental method</para></listitem> <listitem><para>cloning script are old, and need a full rewrite</para></listitem> - <listitem><para>now it's only works with the Mandriva installer (need to patch it to support a KA method)</para></listitem> + <listitem><para>now it's only works with the Mageia installer (need to patch it to support a KA method)</para></listitem> <listitem><para>if a node crash while doing a duplication, the duplication process stop (or became very unstable)</para></listitem> <listitem><para>using fdisk to erase and re-format the HDD is not a good way to proceed</para></listitem> <listitem><para>UUID support is not really done (fstab use old /dec/sdX)</para></listitem> @@ -52,7 +52,7 @@ <sect3> <title>Needed files</title> <para> - All needed files are available in Mandriva Linux cooker. + All needed files are available in Mageia cooker. </para> <para> <itemizedlist> @@ -71,7 +71,7 @@ <sect3> <title>PXE parameters on server</title> <para> - Mandriva Linux installer supports various methods to install a computer. With PXE configuration file you can specify wich method you want to use to install your node, or add a specific option at boot prompt. Edit your default PXE configuration file to add your custom entry (<emphasis role="bold">/var/lib/tftpboot/X86PC/linux/pxelinux.cfg/default</emphasis>). + Mageia installer supports various methods to install a computer. With PXE configuration file you can specify wich method you want to use to install your node, or add a specific option at boot prompt. Edit your default PXE configuration file to add your custom entry (<emphasis role="bold">/var/lib/tftpboot/X86PC/linux/pxelinux.cfg/default</emphasis>). </para> <para> <screen> @@ -154,8 +154,8 @@ prompt_timeout=2 # what services to provide, priority in ordering # CSA = Client System Architecture # service=<CSA>,<min layer>,<max layer>,<basename>,<menu entry> -service=X86PC,0,2,linux,Mandriva Linux x86 -service=IA64PC,0,2,linux,Mandriva Linux IA64 +service=X86PC,0,2,linux,Mageia x86 +service=IA64PC,0,2,linux,Mageia IA64 service=X86PC,0,0,local,Local boot # tftpd base dir @@ -358,12 +358,12 @@ bin/ dev/ etc/ ka/ lib/ modules/ proc/ sbin/ squashfs-root/ tmp/ usr/ <sect3> <title>make_initrd_grub</title> <para> - Restore and reload the Grub bootloader in the <emphasis role="bold">/mnt/disk</emphasis> directory. It's a very basic script, and perhaps use the <emphasis role="bold">restore_bootloader</emphasis> of the Mandriva Linux Rescue should be a better idea.</para> + Restore and reload the Grub bootloader in the <emphasis role="bold">/mnt/disk</emphasis> directory. It's a very basic script, and perhaps use the <emphasis role="bold">restore_bootloader</emphasis> of the Mageia Rescue should be a better idea.</para> </sect3> <sect3> <title>make_initrd_lilo</title> <para> - Restore and reload the lilo bootloader in the <emphasis role="bold">/mnt/disk</emphasis> directory. Again it's a very basic script, perhaps we should use the <emphasis role="bold">restore_bootloader</emphasis> of the Mandriva Linux Rescue. + Restore and reload the lilo bootloader in the <emphasis role="bold">/mnt/disk</emphasis> directory. Again it's a very basic script, perhaps we should use the <emphasis role="bold">restore_bootloader</emphasis> of the Mageia Rescue. </para> </sect3> <sect3> @@ -562,8 +562,8 @@ Preparing... ############################################### <para> <programlisting><![CDATA[ [root@localhost ~]# mkdir /mnt/ka -lftp ftp.proxad.net:~> cd pub/Distributions_Linux/MandrivaLinux/devel/cooker/i586/install/stage2/ -lftp ftp.proxad.net:/pub/Distributions_Linux/MandrivaLinux/devel/cooker/i586/install/stage2> pget rescue.sqfs +lftp distrib-coffee.ipsl.jussieu.fr:~> cd pub/linux/Mageia/distrib/cauldron/i586/install/stage2/ +lftp distrib-coffee.ipsl.jussieu.fr:/pub/linux/Mageia/distrib/cauldron/i586/install/stage2> pget rescue.sqfs 19132416 bytes transferred in 78 seconds (241.1K/s) [root@localhost ~]# urpmi squashfs-tools @@ -672,8 +672,8 @@ prompt_timeout=2 # what services to provide, priority in ordering # CSA = Client System Architecture # service=<CSA>,<min layer>,<max layer>,<basename>,<menu entry> -service=X86PC,0,2,linux,Mandriva Linux x86 -service=IA64PC,0,2,linux,Mandriva Linux IA64 +service=X86PC,0,2,linux,Mageia x86 +service=IA64PC,0,2,linux,Mageia IA64 service=X86PC,0,0,local,Local boot # tftpd base dir @@ -937,13 +937,13 @@ label kamethod help.txt linux.0 memdisk messages pxelinux.cfg/ [root@node42 linux]# mkdir images -lftp ftp.proxad.net:/pub/Distributions_Linux/MandrivaLinux/devel/cooker/i586/isolinux/alt0> ls +lftp distrib-coffee.ipsl.jussieu.fr:/pub/linux/Mageia/distrib/cauldron/i586/isolinux/alt0> ls -rw-r--r-- 1 ftp ftp 15613654 Apr 23 17:26 all.rdz -rw-r--r-- 1 ftp ftp 2279584 Apr 23 17:26 vmlinuz -lftp ftp.proxad.net:/pub/Distributions_Linux/MandrivaLinux/devel/cooker/i586/isolinux/alt0> mget * +lftp distrib-coffee.ipsl.jussieu.fr:/pub/linux/Mageia/distrib/cauldron/i586/isolinux/alt0> mget * 17893238 bytes transferred in 77 seconds (227.9K/s) Total 2 files transferred -lftp ftp.proxad.net:/pub/Distributions_Linux/MandrivaLinux/devel/cooker/i586/isolinux/alt0> +lftp distrib-coffee.ipsl.jussieu.fr:/pub/linux/Mageia/distrib/cauldron/i586/isolinux/alt0> [root@node42 images]# pwd /var/lib/tftpboot/X86PC/linux/images diff --git a/docs/ka_method/duplication.pdf b/docs/ka_method/duplication.pdf Binary files differdeleted file mode 100644 index e05e94490..000000000 --- a/docs/ka_method/duplication.pdf +++ /dev/null diff --git a/docs/ka_method/duplication.xml b/docs/ka_method/duplication.xml index 71c0c4622..410c37d40 100644 --- a/docs/ka_method/duplication.xml +++ b/docs/ka_method/duplication.xml @@ -5,7 +5,7 @@ ]> <!-- juste un commentaire --> <book lang="en"> - <title>Mandriva Linux: HOWTO Clone a system using KA method</title> + <title>Mageia: HOWTO Clone a system using KA method</title> <bookinfo> <authorgroup> <author> diff --git a/docs/ka_method/html/duplication.html b/docs/ka_method/html/duplication.html deleted file mode 100644 index e0efa1dfe..000000000 --- a/docs/ka_method/html/duplication.html +++ /dev/null @@ -1,1257 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><title>Clone a node/computer using KA method</title><link rel="stylesheet" href="styleguibo.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.75.2" /><link rel="home" href="#id2251469" title="Clone a node/computer using KA method" /><link rel="next" href="#id2514268" title="1. CLONING WILL ERASE ALL CLIENT NODES DATA !" /></head><body><div xml:lang="en" class="article" title="Clone a node/computer using KA method" lang="en"><div class="titlepage"><div><div><h2 class="title"><a id="id2251469"></a>Clone a node/computer using KA method</h2></div></div><hr /></div><div class="toc"><dl><dt><span class="sect1"><a href="#id2514268">1. CLONING WILL ERASE ALL CLIENT NODES DATA !</a></span></dt><dt><span class="sect1"><a href="#id2514275">2. Clone a computer over the network</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2514297">2.1. KA method</a></span></dt><dt><span class="sect2"><a href="#id2514686">2.2. HOW it works</a></span></dt><dd><dl><dt><span class="sect3"><a href="#id2514692">2.2.1. Steps</a></span></dt><dt><span class="sect3"><a href="#id2514762">2.2.2. Needed files</a></span></dt></dl></dd><dt><span class="sect2"><a href="#id2514817">2.3. Step 1: PXE, TFTP, DHCPD services</a></span></dt><dd><dl><dt><span class="sect3"><a href="#id2514853">2.3.1. PXE parameters on server</a></span></dt><dt><span class="sect3"><a href="#id2514934">2.3.2. TFTP server</a></span></dt><dt><span class="sect3"><a href="#id2514965">2.3.3. PXE configuration</a></span></dt><dt><span class="sect3"><a href="#id2514977">2.3.4. DHCPD configuration</a></span></dt></dl></dd></dl></dd><dt><span class="sect1"><a href="#id2515083">3. Setup a node as a golden node</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2515089">3.1. The rescue.sqfs file</a></span></dt><dd><dl><dt><span class="sect3"><a href="#id2515145">3.1.1. ka-d.sh</a></span></dt><dt><span class="sect3"><a href="#id2515179">3.1.2. replication.conf</a></span></dt><dt><span class="sect3"><a href="#id2515190">3.1.3. fdisk_to_desc</a></span></dt><dt><span class="sect3"><a href="#id2515219">3.1.4. gen_modprobe_conf.pl</a></span></dt><dt><span class="sect3"><a href="#id2515242">3.1.5. ka-d-client</a></span></dt><dt><span class="sect3"><a href="#id2515277">3.1.6. ka-d-server</a></span></dt><dt><span class="sect3"><a href="#id2515326">3.1.7. ka_replication.sh</a></span></dt><dt><span class="sect3"><a href="#id2515350">3.1.8. store_log.sh</a></span></dt><dt><span class="sect3"><a href="#id2515378">3.1.9. bootable_flag.sh</a></span></dt><dt><span class="sect3"><a href="#id2515390">3.1.10. make_initrd_grub</a></span></dt><dt><span class="sect3"><a href="#id2515413">3.1.11. make_initrd_lilo</a></span></dt><dt><span class="sect3"><a href="#id2515436">3.1.12. prepare_node.sh</a></span></dt><dt><span class="sect3"><a href="#id2515461">3.1.13. send_status.pl</a></span></dt><dt><span class="sect3"><a href="#id2515484">3.1.14. status_node.pl</a></span></dt></dl></dd></dl></dd><dt><span class="sect1"><a href="#id2515504">4. The golden node, KA server</a></span></dt><dt><span class="sect1"><a href="#id2515652">5. KA client node</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2515657">5.1. PXE server (kamethod)</a></span></dt><dt><span class="sect2"><a href="#id2515694">5.2. Stage1 KA method, node waiting stage2 </a></span></dt><dt><span class="sect2"><a href="#id2515741">5.3. Stage2, the duplication process</a></span></dt><dt><span class="sect2"><a href="#id2515811">5.4. Prepare the node</a></span></dt><dt><span class="sect2"><a href="#id2515837">5.5. PXE server to local boot</a></span></dt></dl></dd><dt><span class="sect1"><a href="#id2515854">6. Step by step from scratch KA duplication</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2515889">6.1. Golden node side</a></span></dt><dt><span class="sect2"><a href="#id2516032">6.2. KA client side</a></span></dt><dt><span class="sect2"><a href="#id2516818">6.3. Post duplication process</a></span></dt></dl></dd></dl></div><div class="sect1" title="1. CLONING WILL ERASE ALL CLIENT NODES DATA !"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2514268"></a>1. CLONING WILL ERASE ALL CLIENT NODES DATA !</h2></div></div></div><p>!! USE WITH CARE !! </p></div><div class="sect1" title="2. Clone a computer over the network"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2514275"></a>2. Clone a computer over the network</h2></div></div></div><p> - Goal of duplication is to easily deploy a computer over network without taking care of numbers of computer. In this documentation, we call golden node the node we want to clone. We can duplicate SCSI or IDE hard drive, and duplication support multiple filesystem (reiserfs, ext2, ext3, ext4, xfs, jfs). - This method came from a very old project called CLIC, and was used under IGGI project, all Mandrake Clustering products, and now it is used under XtreemOS project. Now it should be available in 2010 spring, and all futur product. - </p><p>WARNING: all data on client nodes will be ERASED ! We duplicate partitions of HDD's golden node, and the process will do an fdisk command on the client node, so ALL YOUR DATA will be erased on client nodes.</p><div class="sect2" title="2.1. KA method"><div class="titlepage"><div><div><h3 class="title"><a id="id2514297"></a>2.1. KA method</h3></div></div></div><p> - With KA method you can quickly duplicate a node using a <span class="bold"><strong>desc</strong></span> - file describing partitions. KA method only duplicate data on partitions, so if you have 80go HDD disk, and - only 10go on it, KA only duplicates 10go, and not the whole disk. KA method doesn't not support RAID software. - </p><p> - Drawbacks: - </p><p> - </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>KA method doesn't support RAID software (use dolly to do that)</p></li><li class="listitem"><p>all data on client nodes are erased</p></li><li class="listitem"><p>you need a PXE, DHDCP and TFTP server</p></li><li class="listitem"><p>you must re-create same partition table as the golden node (even if size can differ)</p></li><li class="listitem"><p>even if it has been tested, it's still an experimental method</p></li><li class="listitem"><p>cloning script are old, and need a full rewrite</p></li><li class="listitem"><p>now it's only works with the Mandriva installer (need to patch it to support a KA method)</p></li><li class="listitem"><p>if a node crash while doing a duplication, the duplication process stop (or became very unstable)</p></li><li class="listitem"><p>using fdisk to erase and re-format the HDD is not a good way to proceed</p></li><li class="listitem"><p>UUID support is not really done (fstab use old /dec/sdX)</p></li><li class="listitem"><p>you can only clone Linux filesystems (if you want to duplicate another kinf of FS, it's up to you to modify the scripts)</p></li><li class="listitem"><p>of course various other things !</p></li></ul></div><p> - </p></div><div class="sect2" title="2.2. HOW it works"><div class="titlepage"><div><div><h3 class="title"><a id="id2514686"></a>2.2. HOW it works</h3></div></div></div><div class="sect3" title="2.2.1. Steps"><div class="titlepage"><div><div><h4 class="title"><a id="id2514692"></a>2.2.1. Steps</h4></div></div></div><p> - The clone process works in three steps - </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p><span class="bold"><strong>PXE boot to retrieve stage1</strong></span>: the computer boot on PXE mode, retrieve <span class="bold"><strong>vmlinuz</strong></span> and an <span class="bold"><strong>initrd</strong></span> image. The computer is in <span class="bold"><strong>stage1</strong></span> mode, and is able to get the stage2 throug KA. Network is up.</p></li><li class="listitem"><p><span class="bold"><strong>get stage2</strong></span>: the computer gets the stage2 with the KA method. The <span class="bold"><strong>stage2</strong></span> contains all necessary tools to recognize your hardware (the most important things is to detect your HDD and your network card), and all necessary tools/scripts to finalize the cloning process.</p></li><li class="listitem"><p><span class="bold"><strong>Duplication process</strong></span>: the computer auto-probes needed modules to be able to access the HDD. A basic log server is launched on the client node to be able to run command and get status of the KA duplication process. The computer reconfigure the modprobe.conf and restore the booloader (grub or lilo)</p></li></ul></div></div><div class="sect3" title="2.2.2. Needed files"><div class="titlepage"><div><div><h4 class="title"><a id="id2514762"></a>2.2.2. Needed files</h4></div></div></div><p> - All needed files are available in Mandriva Linux cooker. - </p><p> - </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p><span class="bold"><strong>install/stage2/rescue.sqfs</strong></span>: this is the stage2 file with all needed files to detect and probe modules, and launch the third step of the duplication process. This file will be used on the golden node.</p></li><li class="listitem"><p><span class="bold"><strong>isolinux/alt0/vmlinuz</strong></span>: linux kernel, needed in the <span class="bold"><strong>/var/lib/tftpboot/X86PC/linux/images/</strong></span> directory of the PXE server</p></li><li class="listitem"><p><span class="bold"><strong>isolinux/alt0/all.rdz</strong></span>: stage1 and all needed modules and tools.</p></li></ul></div><p> - </p></div></div><div class="sect2" title="2.3. Step 1: PXE, TFTP, DHCPD services"><div class="titlepage"><div><div><h3 class="title"><a id="id2514817"></a>2.3. Step 1: PXE, TFTP, DHCPD services</h3></div></div></div><p> - To easily clone a computer node, we use PXE technology to boot a <span class="bold"><strong>kernel</strong></span>, and an <span class="bold"><strong>initrd</strong></span> image wich contains all needed modules for network and media storage. Documentation about PXE can be found here: <a class="ulink" href="http://people.mandriva.com/~aginies/doc/pxe/" target="_top">PXE doc</a>. Please, keep in mind setting such services can <span class="bold"><strong>DISTURB</strong></span> your current network architecture. - </p><div class="sect3" title="2.3.1. PXE parameters on server"><div class="titlepage"><div><div><h4 class="title"><a id="id2514853"></a>2.3.1. PXE parameters on server</h4></div></div></div><p> - Mandriva Linux installer supports various methods to install a computer. With PXE configuration file you can specify wich method you want to use to install your node, or add a specific option at boot prompt. Edit your default PXE configuration file to add your custom entry (<span class="bold"><strong>/var/lib/tftpboot/X86PC/linux/pxelinux.cfg/default</strong></span>). - </p><p> - </p><pre class="screen"> -PROMPT 1 -DEFAULT local -DISPLAY messages -TIMEOUT 50 -F1 help.txt - -label local - LOCALBOOT 0 - -label kamethod - KERNEL images/vmlinuz - APPEND initrd=images/all.rdz ramdisk_size=64000 vga=788 \ - automatic=method:ka,interface:eth0,network:dhcp root=/dev/ram3 rw kamethod</pre><p> - </p><p> - At boot prompt no you can boot: - </p><p> - </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p><span class="bold"><strong>DEFAULT local</strong></span>: default boot will be local one, change it with the name of a <span class="bold"><strong>LABEL</strong></span></p></li><li class="listitem"><p><span class="bold"><strong>local</strong></span>: boot local</p></li><li class="listitem"><p><span class="bold"><strong>kamethod</strong></span>: automatic mode, get stage2 through <span class="bold"><strong>KA</strong></span>. Network interface is set to eth0. Auto setup the network with DHCP, and use the KA technology to launch the replication method.</p></li></ul></div><p> - </p></div><div class="sect3" title="2.3.2. TFTP server"><div class="titlepage"><div><div><h4 class="title"><a id="id2514934"></a>2.3.2. TFTP server</h4></div></div></div><p> - TFTP server should be activated in <span class="bold"><strong>/etc/xinetd.d/tftp</strong></span> file, and the <span class="bold"><strong>xinetd</strong></span> service started. - </p><p> - </p><pre class="screen"> -service tftp -{ - disable= no - socket_type= dgram - protocol= udp - wait= yes - user= root - server= /usr/sbin/in.tftpd - server_args = -s /var/lib/tftpboot - per_source= 11 - cps= 100 2 - flags= IPv4 -}</pre><p> - </p></div><div class="sect3" title="2.3.3. PXE configuration"><div class="titlepage"><div><div><h4 class="title"><a id="id2514965"></a>2.3.3. PXE configuration</h4></div></div></div><p> -</p><pre class="programlisting"> -# which interface to use -interface=eth0 -default_address=IPADDR_PXE - -# the multicast ip address to listen on -multicast_address=224.0.1.2 - -# mtftp info -mtftp_address=IPADDR_TFTP -mtftp_client_port=1758 -mtftp_server_port=1759 - -# the port to listen on -listen_port=4011 - -# enable multicast? -use_multicast=1 - -# enable broadcast? -use_broadcast=0 - -# user prompt -prompt=Press F8 to view menu ... -prompt_timeout=2 - -# what services to provide, priority in ordering -# CSA = Client System Architecture -# service=<CSA>,<min layer>,<max layer>,<basename>,<menu entry> -service=X86PC,0,2,linux,Mandriva Linux x86 -service=IA64PC,0,2,linux,Mandriva Linux IA64 -service=X86PC,0,0,local,Local boot - -# tftpd base dir -tftpdbase=/ - -# domain=guibland.com -domain= -</pre><p> - </p></div><div class="sect3" title="2.3.4. DHCPD configuration"><div class="titlepage"><div><div><h4 class="title"><a id="id2514977"></a>2.3.4. DHCPD configuration</h4></div></div></div><p> - IE of an <span class="bold"><strong>/etc/dhcpd.conf</strong></span> configuration file. Change <span class="bold"><strong>IPADDR_TFTP</strong></span> with the IP address of the TFTP serrver, and the <span class="bold"><strong>NET</strong></span> value. Don't forget to adjust the <span class="bold"><strong>domain-name</strong></span> and the <span class="bold"><strong>domain-name-servers</strong></span>. - </p><p> - </p><pre class="screen"> -ddns-update-style none; -allow booting; -allow bootp; - -authoritative; - -# Definition of PXE-specific options -# Code 1: Multicast IP address of bootfile -# Code 2: UDP port that client should monitor for MTFTP responses -# Code 3: UDP port that MTFTP servers are using to listen for MTFTP requests -# Code 4: Number of secondes a client must listen for activity before trying -# to start a new MTFTP transfer -# Code 5: Number of secondes a client must listen before trying to restart -# a MTFTP transfer - -# define Option for the PXE class -option space PXE; -option PXE.mtftp-ip code 1 = ip-address; -option PXE.mtftp-cport code 2 = unsigned integer 16; -option PXE.mtftp-sport code 3 = unsigned integer 16; -option PXE.mtftp-tmout code 4 = unsigned integer 8; -option PXE.mtftp-delay code 5 = unsigned integer 8; -option PXE.discovery-control code 6 = unsigned integer 8; -option PXE.discovery-mcast-addr code 7 = ip-address; - -#Define options for pxelinux -option space pxelinux; -option pxelinux.magic code 208 = string; -option pxelinux.configfile code 209 = text; -option pxelinux.pathprefix code 210 = text; -option pxelinux.reboottime code 211 = unsigned integer 32; -site-option-space "pxelinux"; - -option pxelinux.magic f1:00:74:7e; -option pxelinux.reboottime 30; - -#Class that determine the options for Etherboot 5.x requests -class "Etherboot" { -#if The vendor-class-identifier equal Etherboot-5.0 -match if substring (option vendor-class-identifier, 0, 13) = "Etherboot-5.0"; -# filename define the file retrieve by the client, there nbgrub -# our tftp is chrooted so is just the path to the file -filename "/etherboot/nbgrub"; -#Used by etherboot to detect a valid pxe dhcp server -option vendor-encapsulated-options 3c:09:45:74:68:65:72:62:6f:6f:74:ff; -# Set the "vendor-class-identifier" field to "PXEClient" in dhcp answer -# if this field is not set the pxe client will ignore the answer ! -option vendor-class-identifier "Etherboot-5.0"; -vendor-option-space PXE; -option PXE.mtftp-ip 0.0.0.0; -# IP of you TFTP server -next-server IPADDR_TFTP; -} - -# create the Class PXE -class "PXE" { -# if the "vendor-class-identifier" is set to "PXEClient" in the client dhcp request -match if substring(option vendor-class-identifier, 0, 9) = "PXEClient"; -filename "/X86PC/linux/linux.0"; -option vendor-class-identifier "PXEClient"; -vendor-option-space PXE; -option PXE.mtftp-ip 0.0.0.0; -next-server IPADDR_TFTP; -} - -#host node20 { -# hardware ethernet 00:40:CA:8C:B6:E9; -# fixed-address node20; -#} - -subnet NET.0 netmask 255.255.255.0 { - option subnet-mask 255.255.255.0; - option routers IPADDR_GW; - default-lease-time 288000; - max-lease-time 864000; - option domain-name "guibland.com"; - option domain-name-servers IPADDR_DNS; - next-server IPADDR_TFTP; - pool { - range NET.30 NET.40; - } -}</pre><p> - </p></div></div></div><div class="sect1" title="3. Setup a node as a golden node"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2515083"></a>3. Setup a node as a golden node</h2></div></div></div><div class="sect2" title="3.1. The rescue.sqfs file"><div class="titlepage"><div><div><h3 class="title"><a id="id2515089"></a>3.1. The rescue.sqfs file</h3></div></div></div><p> - You need the rescue disk (wich contains the <span class="bold"><strong>/ka</strong></span> directory), - Just extract this file, and copy all directory in <span class="bold"><strong>/mnt/ka</strong></span>. - </p><p> - </p><pre class="screen"> -[root@guibpiv ~]# mkdir /mnt/ka -[root@guibpiv ~]# cd /mnt/ka/ -[root@guibpiv ka]# unsquashfs rescue.sqfs -[root@guibpiv ka]# mv squashfs-root/* . -[root@guibpiv ka]# ls -bin/ dev/ etc/ ka/ lib/ modules/ proc/ sbin/ squashfs-root/ tmp/ usr/ var/ -</pre><p> - </p><p> - Go in the <span class="bold"><strong>/mnt/ka/ka</strong></span> directory, and see all new files available. All those files are needed to do a <span class="bold"><strong>KA</strong></span> duplication process. We will explain now the rule of each of them. You can modify all them, those files will be copied in the directory <span class="bold"><strong>/tmp/stage2</strong></span> of the client node of the duplication process (second step). - </p><div class="sect3" title="3.1.1. ka-d.sh"><div class="titlepage"><div><div><h4 class="title"><a id="id2515145"></a>3.1.1. ka-d.sh</h4></div></div></div><p> - This is the master script to declare a node as a golden node. This script takes a lot of arguments. This script should be run - on the host wich have the <span class="bold"><strong>/mnt/ka</strong></span> directory. -</p><pre class="screen"> - -h, --help : display this message - -n num : specify the number of (destination) nodes - -x dir : exclude directory - -X sdb|sdc : exclude sdb for the replication - -m drive : copy the master boot record (for windows) of this drive (not really tested yet) - -M drive file : use 'file' as master boot record (must be 446 bytes long) for the specified drive - -D partition : also copy partition 'partition' - -p drive pdesc : use 'pdesc' file as partition scheme (see doc) for the specified drive - -d delay : delay beteween the release of 2 clients (1/10 second) - -r 'grub|lilo' : choose the bootloader (you can add mkinitrd options) - - ie: ka-d.sh -n 3 -p sda /tmp/desc -X 'sdb|sdc' -r 'grub --with=ata_piix --with=piix'</pre><p> - </p></div><div class="sect3" title="3.1.2. replication.conf"><div class="titlepage"><div><div><h4 class="title"><a id="id2515179"></a>3.1.2. replication.conf</h4></div></div></div><p> - This file contains all variables needed by other scripts. It also tries to get information like IP address. - </p></div><div class="sect3" title="3.1.3. fdisk_to_desc"><div class="titlepage"><div><div><h4 class="title"><a id="id2515190"></a>3.1.3. fdisk_to_desc</h4></div></div></div><p> - This script generate the description table of the hard drive disk in the <span class="bold"><strong>/tmp/desc</strong></span> file. - This file must follow some rules: one line per partition, with two fields : type of partition and size in megabytes. - The type can be linux, swap, extended. Other types can be obtained by appending their hexadecimal number to 'type'. - For example linux is the same as type83. The size is either a number of megabytes, or the keyword fill (to take all - available space). The logical partitions must have the logical keyword. Do a <span class="bold"><strong>man ka-d</strong></span> for more help. - </p></div><div class="sect3" title="3.1.4. gen_modprobe_conf.pl"><div class="titlepage"><div><div><h4 class="title"><a id="id2515219"></a>3.1.4. gen_modprobe_conf.pl</h4></div></div></div><p> - This script creates a basic output like the content of the<span class="bold"><strong>/etc/modprobe.conf</strong></span> file. Drawbacks - this file must be updated for each new modules available in the kernel (based on the <span class="bold"><strong>kernel/list_modules.pm</strong></span> file). - </p></div><div class="sect3" title="3.1.5. ka-d-client"><div class="titlepage"><div><div><h4 class="title"><a id="id2515242"></a>3.1.5. ka-d-client</h4></div></div></div><p> - The <span class="bold"><strong>ka-d-client</strong></span> binary file is used to get stage2 with the <span class="bold"><strong>KA</strong></span> method, and after get the whole system. The important argument is the <span class="bold"><strong>-s</strong></span> session name. A <span class="bold"><strong>KA</strong></span> can only connect to a specific session (getstage2, kainstall ...). The code source is available in the ka-deploy SRPM. - </p></div><div class="sect3" title="3.1.6. ka-d-server"><div class="titlepage"><div><div><h4 class="title"><a id="id2515277"></a>3.1.6. ka-d-server</h4></div></div></div><p> - The <span class="bold"><strong>ka-d-server</strong></span> binary file is used to be a <span class="bold"><strong>KA</strong></span> golden node server. Like the <span class="bold"><strong>ka-d-client</strong></span> the session arguments is an important parameter (<span class="bold"><strong>-s session_name</strong></span>). The session name will be <span class="bold"><strong>getstage2</strong></span> to retrieve the stage2 (after the PXE boot) and will be <span class="bold"><strong>kainstall1</strong></span> at duplication process step. If you want to do more than one duplication process of nodes at the same time, you should synchronize the ka_sesion name between the server and the client. The code source is available in the ka-deploy SRPM. - </p></div><div class="sect3" title="3.1.7. ka_replication.sh"><div class="titlepage"><div><div><h4 class="title"><a id="id2515326"></a>3.1.7. ka_replication.sh</h4></div></div></div><p> - Script launched on the <span class="bold"><strong>KA</strong></span> client (after getting stage2 and probing modules), to do the full process of the <span class="bold"><strong>Ka</strong></span> duplication. - This script call other scripts to prepare the node (prepare_node.sh), configure the bootloader (make_initrd_grub or make_initrd_lilo). - </p></div><div class="sect3" title="3.1.8. store_log.sh"><div class="titlepage"><div><div><h4 class="title"><a id="id2515350"></a>3.1.8. store_log.sh</h4></div></div></div><p> - Basic script to store the log of the <span class="bold"><strong>KA</strong></span> duplication process on an FTP server. Adjust to feet your need, and uncomment the line <span class="bold"><strong>#store_log.sh</strong></span> in the <span class="bold"><strong>/mnt/ka/ka/ka_replication.sh</strong></span> file. - </p></div><div class="sect3" title="3.1.9. bootable_flag.sh"><div class="titlepage"><div><div><h4 class="title"><a id="id2515378"></a>3.1.9. bootable_flag.sh</h4></div></div></div><p> - Script to set bootable an HDD using fdisk. First arg must be the HDD device. - </p></div><div class="sect3" title="3.1.10. make_initrd_grub"><div class="titlepage"><div><div><h4 class="title"><a id="id2515390"></a>3.1.10. make_initrd_grub</h4></div></div></div><p> - Restore and reload the Grub bootloader in the <span class="bold"><strong>/mnt/disk</strong></span> directory. It's a very basic script, and perhaps use the <span class="bold"><strong>restore_bootloader</strong></span> of the Mandriva Linux Rescue should be a better idea.</p></div><div class="sect3" title="3.1.11. make_initrd_lilo"><div class="titlepage"><div><div><h4 class="title"><a id="id2515413"></a>3.1.11. make_initrd_lilo</h4></div></div></div><p> - Restore and reload the lilo bootloader in the <span class="bold"><strong>/mnt/disk</strong></span> directory. Again it's a very basic script, perhaps we should use the <span class="bold"><strong>restore_bootloader</strong></span> of the Mandriva Linux Rescue. - </p></div><div class="sect3" title="3.1.12. prepare_node.sh"><div class="titlepage"><div><div><h4 class="title"><a id="id2515436"></a>3.1.12. prepare_node.sh</h4></div></div></div><p> - This script remove in the futur system the old network's udev rules, old dhcp cache files, launch the script <span class="bold"><strong>gen_modprobe_conf.pl</strong></span> to regenerate an up to date <span class="bold"><strong>/etc/modprobe.conf</strong></span> in the new system, and launch the script to restore the bootloader. If you want to do more action on the installed, system, you can modify this script. - </p></div><div class="sect3" title="3.1.13. send_status.pl"><div class="titlepage"><div><div><h4 class="title"><a id="id2515461"></a>3.1.13. send_status.pl</h4></div></div></div><p> - Very basic perl script to open the port 12345, and paste the content of the <span class="bold"><strong>/tmp/ka*</strong></span> file. It also permit the execution of commands on node, if user send a message from the golden node with the <span class="bold"><strong>exec</strong></span> prefix. - </p></div><div class="sect3" title="3.1.14. status_node.pl"><div class="titlepage"><div><div><h4 class="title"><a id="id2515484"></a>3.1.14. status_node.pl</h4></div></div></div><p> - Script to connect to a client node, first arg must be the IP address of the node. You can run command on the node with the <span class="bold"><strong>exec</strong></span> prefix. - </p></div></div></div><div class="sect1" title="4. The golden node, KA server"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2515504"></a>4. The golden node, KA server</h2></div></div></div><p> - Now, it is time to build a description of the node partitions. You can use the script <span class="bold"><strong>/mnt/ka/ka/fdisk_to_desc</strong></span> as root user, or your favorite text editor, - you can write a file like this one: - </p><p> - </p><pre class="screen"> -linux 3500 -extended fill -logical swap 500 -logical linux fill</pre><p> - </p><p> - This file describes your partition table and the sample above can be considered as a default one for a recommended - installation. There is a 3.5GB <span class="bold"><strong>/</strong></span> partition, a 500 MB swap - partition, and <span class="bold"><strong>/var</strong></span> fills the rest, of course you can adjust - sizes accoding to your system. - </p><p> - Type the following to start the ka replication server as root user on the golden node: - </p><p> -</p><pre class="programlisting"> -[root@node40 ka]# ./ka-d.sh -n 1 -p sda /root/desc -X sdb -r "grub --with=jfs --with=ata_piix" -takembr = -desc = sda /root/desc -+ Mount points : - /dev/sda5 / ext3 - /dev/sda1 swap swap -+ Hard drives : - sda -+ Reading partition table description for sda - Added partition 1 : type 82 - Added partition 5 : type 83 -+ Included mount points : / -+ Bootloader is: grub --with=jfs --with=ata_piix -+++ Sending Stage2 +++ -Compiled : Aug 23 2007 12:58:29 -ARGS=+ka-d-server+-s+getstage2+-n+1+-e+(cd /mnt/ka; tar --create --one-file-system --sparse . )+ -Server IP = 10.0.1.40 -command = (cd /mnt/ka; tar --create --one-file-system --sparse . ) -I want 1 clients -Socket 4 on port 30765 on node40.guibland.com ready. -Socket 5 on port 30764 on node40.guibland.com ready. -</pre><p> - </p><p> - </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p><span class="bold"><strong>-r "grub --with=jfs --with=ata_piix"</strong></span>: use grub bootloader and <span class="bold"><strong>--with=jfs --with=piix</strong></span> mkinitrd option in the chrooted system after the <span class="bold"><strong>KA</strong></span> deploiement</p></li><li class="listitem"><p><span class="bold"><strong>-n nb_nodes</strong></span>: specify how many nodes are clients</p></li><li class="listitem"><p><span class="bold"><strong>-p sda desc</strong></span>: specify the name of the hdd</p></li><li class="listitem"><p><span class="bold"><strong>-x /tmp</strong></span>: exclude <span class="bold"><strong>/tmp</strong></span> directory</p></li><li class="listitem"><p><span class="bold"><strong>-X sdb</strong></span>: exclude <span class="bold"><strong>sdb</strong></span> hdd for the duplication</p></li></ul></div><p> - </p><p> - Now the golden node is waiting for clients nodes to start replication. - </p></div><div class="sect1" title="5. KA client node"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2515652"></a>5. KA client node</h2></div></div></div><div class="sect2" title="5.1. PXE server (kamethod)"><div class="titlepage"><div><div><h3 class="title"><a id="id2515657"></a>5.1. PXE server (kamethod)</h3></div></div></div><p> - We have to configure the PXE to boot by default on <span class="bold"><strong>kamethod</strong></span>. - To do this just edit <span class="bold"><strong>/var/lib/tftpboot/X86PC/linux/pxelinux.cfg/default</strong></span> and set - <span class="bold"><strong>DEFAULT</strong></span> to kamethod: - </p><pre class="screen">DEFAULT kamethod</pre><p> - So, next time a node boots, the PXE server will force the node to boot using the kamethod entry. - </p></div><div class="sect2" title="5.2. Stage1 KA method, node waiting stage2"><div class="titlepage"><div><div><h3 class="title"><a id="id2515694"></a>5.2. Stage1 KA method, node waiting stage2 </h3></div></div></div><p> - Now, you boot all remaining nodes. The replication process - will start once all nodes are up and waiting on the <span class="bold"><strong>KA</strong></span> - screen. - </p><p> - If the nodes can't reach the golden node, running the <span class="bold"><strong>KA</strong></span> - server the message <span class="bold"><strong>Can't reach a valid KA server</strong></span> will appear. - Each node will try five times to reach the <span class="bold"><strong>KA</strong></span> server, after that the node will reboot. - As the node boots on <span class="bold"><strong>kamethod</strong></span>, it will retry until it finds it. - </p></div><div class="sect2" title="5.3. Stage2, the duplication process"><div class="titlepage"><div><div><h3 class="title"><a id="id2515741"></a>5.3. Stage2, the duplication process</h3></div></div></div><p> - Once all the nodes have found the <span class="bold"><strong>KA</strong></span> server, the first - duplication process will start. This step duplicates the - <span class="bold"><strong>stage2</strong></span> from the <span class="bold"><strong>/mnt/ka</strong></span> directory - of the golden node, in the client's nodes memory (<span class="bold"><strong>/dev/ram3</strong></span> formated as ext2). Then, nodes chroot their memories (the <span class="bold"><strong>/tmp/stage2</strong></span> directory), and launch the <span class="bold"><strong>drvinst</strong></span> command from the stage2, to probe all needed their modules (drivers). Then, the second step of the duplication starts. - </p><p> - The duplication process will clone your drives following - the description you have made (<span class="bold"><strong>/tmp/desc</strong></span> of the golden node). - Nodes will rewrite their partition table, then format their filesystems (ReiserFs, XFS, - ext2/3/4, JFS). All new partitions will be mounted in the <span class="bold"><strong>/mnt/disk</strong></span> directory. - Then, the drive duplication process will begin. On a fast Ethernet switch you can reach speeds of 10MBytes/sec. - </p></div><div class="sect2" title="5.4. Prepare the node"><div class="titlepage"><div><div><h3 class="title"><a id="id2515811"></a>5.4. Prepare the node</h3></div></div></div><p> - At the end of the duplication process, each node will - chroot its partitions and rebuild its <span class="bold"><strong>/boot/initrd.img</strong></span>, - and <span class="bold"><strong>/etc/modprobe.conf</strong></span> files. - This step ensures that your node will reboot using its potential - SCSI drives and adjusting its network card driver. Before - rebooting, each node reinstalls lilo/grub. All your node are - now ready, and are clone of master node. - </p></div><div class="sect2" title="5.5. PXE server to local boot"><div class="titlepage"><div><div><h3 class="title"><a id="id2515837"></a>5.5. PXE server to local boot</h3></div></div></div><p> - Don't forget to change the default PXE boot to <span class="bold"><strong>local</strong></span> - so node after replication will boot localy. - </p></div></div><div class="sect1" title="6. Step by step from scratch KA duplication"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2515854"></a>6. Step by step from scratch KA duplication</h2></div></div></div><p>We will use a PIV 3gz box as golden node, with a SATA hard drive, and an Intel 82540EM Gigabit Ethernet Controller card. This golden box will be the: PXE, DHCPD, TFTP server. Client nodes are</p><p> - </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>basic PIV 2.8gz, with a Realtek Semiconductor 8139 network card, and a IDE hard drive disk</p></li><li class="listitem"><p>PE2650 dual XEON 2.4gz, SCSI Hard Drive disk, and NetXtreme BCM5701 Gigabit Ethernet cards</p></li></ul></div><p> - </p><p>Both nodes are configured to boot on their network card.</p><div class="sect2" title="6.1. Golden node side"><div class="titlepage"><div><div><h3 class="title"><a id="id2515889"></a>6.1. Golden node side</h3></div></div></div><p> - Prepapre the golden node, install all needed tools. - </p><p> -</p><pre class="programlisting"> -[root@localhost ~]# urpmi ka-deploy-source-node - http://192.168.1.253/cooker/i586/media/main/release/ka-deploy-source-node-0.94.1-1mdv2010.1.i586.rpm -installing ka-deploy-source-node-0.94.1-1mdv2010.1.i586.rpm from /var/cache/urpmi/rpms -Preparing... ############################################################################### - 1/1: ka-deploy-source-node ############################################################################### - -[root@localhost ~]# rpm -ql ka-deploy-source-node -/etc/ka -/etc/ka/replication.conf -/usr/bin/bootable_flag.sh -/usr/bin/fdisk_to_desc -/usr/bin/gen_modprobe_conf.pl -/usr/bin/ka-d-client -/usr/bin/ka-d-server -/usr/bin/ka-d.sh -/usr/bin/ka_replication.sh -/usr/bin/make_initrd_grub -/usr/bin/make_initrd_lilo -/usr/bin/prepare_node.sh -/usr/bin/send_status.pl -/usr/bin/status_node.pl -/usr/bin/store_log.sh -/usr/bin/udev_creation.sh -/usr/share/ka-deploy-0.94.1 -/usr/share/man/man1/ka-d-client.1.lzma -/usr/share/man/man1/ka-d-server.1.lzma -/usr/share/man/man1/ka-d.1.lzma -/usr/share/man/man1/ka-d.sh.1.lzma -/usr/share/man/man1/ka-deploy.1.lzma -</pre><p> - </p><p>Create the /mnt/ka directory, and put all stuff in it (this directory will be sent to all client nodes and use to finish - the duplication process)</p><p> -</p><pre class="programlisting"> -[root@localhost ~]# mkdir /mnt/ka -lftp ftp.proxad.net:~> cd pub/Distributions_Linux/MandrivaLinux/devel/cooker/i586/install/stage2/ -lftp ftp.proxad.net:/pub/Distributions_Linux/MandrivaLinux/devel/cooker/i586/install/stage2> pget rescue.sqfs -19132416 bytes transferred in 78 seconds (241.1K/s) - -[root@localhost ~]# urpmi squashfs-tools - http://192.168.1.253/cooker/i586/media/main/release/squashfs-tools-4.0-3.20091221.1mdv2010.1.i586.rpm -installing squashfs-tools-4.0-3.20091221.1mdv2010.1.i586.rpm from /var/cache/urpmi/rpms -Preparing... ############################################################################ - 1/1: squashfs-tools ############################################################################ - -[root@localhost ~]# unsquashfs rescue.sqfs -Parallel unsquashfs: Using 2 processors -988 inodes (1222 blocks) to write -[============================================================================================-] 1222/1222 100% -created 550 files -created 93 directories -created 60 symlinks -created 371 devices -created 1 fifos - -[root@localhost ~]# cd squashfs-root/ -[root@localhost squashfs-root]# ls -bin/ dev/ etc/ ka/ lib/ modules/ proc/ sbin/ tmp/ usr/ var/ -[root@localhost squashfs-root]# mv * /mnt/ka/ -</pre><p> - </p><p>Install all needed packages to be able to be a PXE, DHCPD and TFTP server</p><p> -</p><pre class="programlisting"> -[root@localhost ka]# ka-d.sh -h -/usr/bin/ka-d.sh : clone this machine -Usage: - -h, --help : display this message - -n num : specify the number of (destination) nodes - -x 'dir|dir2' : exclude directory - -X 'sdb|sdc' : exclude sdb for the replication - -m drive : copy the master boot record (for windows) of this drive - -M drive file : use 'file' as master boot record (must be 446 bytes long) for the specified drive - -D partition : also copy partition 'partition' - -p drive pdesc : use 'pdesc' file as partition scheme (see doc) for the specified drive - -d delay : delay beteween the release of 2 clients (1/10 second) - -r 'grub|lilo' : choose the bootloader (you can add mkinitrd options) - - ie: ka-d.sh -n 3 -p sda /tmp/desc -X sdb -r 'grub --with=ata_piix --with=piix' - -[root@localhost ka]# urpmi ka-deploy-server -To satisfy dependencies, the following packages are going to be installed: - Package Version Release Arch -(medium "Main") - bind-utils 9.7.0 4mdv2010.1 i586 - clusterscripts-common 3.5 1mdv2010.1 noarch - clusterscripts-server-conf 3.5 1mdv2010.1 noarch - clusterscripts-server-pxe 3.5 1mdv2010.1 noarch - dhcp-server 4.1.1 5mdv2010.1 i586 - ka-deploy-server 0.94.1 1mdv2010.1 i586 - perl-Crypt-PasswdMD5 1.300.0 1mdv2010.1 noarch - pxe 1.4.2 19mdv2010.1 i586 - pxelinux 3.83 1mdv2010.1 i586 - syslinux 3.83 1mdv2010.1 i586 - tftp-server 5.0 4mdv2010.1 i586 - xinetd 2.3.14 11mdv2010.1 i586 -12MB of additional disk space will be used. -2.5MB of packages will be retrieved. -Proceed with the installation of the 12 packages? (Y/n) -</pre><p> - </p><p>Configure all services</p><p> -</p><pre class="programlisting"> -[root@localhost ~]# hostname -node42.guibland.com -[root@localhost ~]# domainname -guibland.com - -[root@localhost ~]# ip addr show eth0 -2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP qlen 100 - link/ether 00:17:31:19:a0:78 brd ff:ff:ff:ff:ff:ff - inet 10.0.1.42/24 brd 10.0.1.255 scope global eth0 - inet6 fe80::217:31ff:fe19:a078/64 scope link - valid_lft forever preferred_lft forever - -[root@localhost ~]# vi /etc/pxe.conf -# which interface to use -interface=eth0 -default_address=10.0.1.42 - -# the multicast ip address to listen on -multicast_address=224.0.1.2 - -# mtftp info -mtftp_address=10.0.1.42 -mtftp_client_port=1758 -mtftp_server_port=1759 - -# the port to listen on -listen_port=4011 - -# enable multicast? -use_multicast=1 - -# enable broadcast? -use_broadcast=0 - -# user prompt -prompt=Press F8 to view menu ... -prompt_timeout=2 - -# what services to provide, priority in ordering -# CSA = Client System Architecture -# service=<CSA>,<min layer>,<max layer>,<basename>,<menu entry> -service=X86PC,0,2,linux,Mandriva Linux x86 -service=IA64PC,0,2,linux,Mandriva Linux IA64 -service=X86PC,0,0,local,Local boot - -# tftpd base dir -tftpdbase=/ - -# domain name -domain=guibland.com - -[root@localhost ~]# vi /etc/xinetd.d/tftp -service tftp -{ - disable = no - socket_type = dgram - protocol = udp - wait = yes - user = root - server = /usr/sbin/in.tftpd - server_args = -s /var/lib/tftpboot - per_source = 11 - cps = 100 2 - flags = IPv4 -} - - -[root@localhost ~]# cp /etc/dhcpd.conf.pxe.single /etc/dhcpd.conf -cp: overwrite `/etc/dhcpd.conf'? y - -[root@localhost ~]# cat /etc/resolv.conf -nameserver 10.0.1.253 -search guibland.com - -[root@localhost ~]# cat /etc/dhcpd.conf -# for explanation in french go to : http://www.delafond.org/traducmanfr/man/man5/dhcpd.conf.5.html -ddns-update-style none; -allow booting; -allow bootp; - -# Your dhcp server is not master on your network ! -#not authoritative; -# Your dhcpd server is master on your network ! -#authoritative; -authoritative; - -#Interface where dhcpd is active -#DHCPD_INTERFACE = "eth0"; - -# Definition of PXE-specific options -# Code 1: Multicast IP address of bootfile -# Code 2: UDP port that client should monitor for MTFTP responses -# Code 3: UDP port that MTFTP servers are using to listen for MTFTP requests -# Code 4: Number of secondes a client must listen for activity before trying -# to start a new MTFTP transfer -# Code 5: Number of secondes a client must listen before trying to restart -# a MTFTP transfer - -# define Option for the PXE class -option space PXE; -option PXE.mtftp-ip code 1 = ip-address; -option PXE.mtftp-cport code 2 = unsigned integer 16; -option PXE.mtftp-sport code 3 = unsigned integer 16; -option PXE.mtftp-tmout code 4 = unsigned integer 8; -option PXE.mtftp-delay code 5 = unsigned integer 8; -option PXE.discovery-control code 6 = unsigned integer 8; -option PXE.discovery-mcast-addr code 7 = ip-address; - -#Define options for pxelinux -option space pxelinux; -option pxelinux.magic code 208 = string; -option pxelinux.configfile code 209 = text; -option pxelinux.pathprefix code 210 = text; -option pxelinux.reboottime code 211 = unsigned integer 32; -site-option-space "pxelinux"; -# These lines should be customized to your setup -#option pxelinux.configfile "configs/common"; -#option pxelinux.pathprefix "/pxelinux/files/"; -#filename "/pxelinux/pxelinux.bin"; - -option pxelinux.magic f1:00:74:7e; -option pxelinux.reboottime 30; -#if exists dhcp-parameter-request-list { -# Always send the PXELINUX options -# append dhcp-parameter-request-list 208, 209, 210, 211; -# append dhcp-parameter-request-list 208,211; -# } - -#Class that determine the options for Etherboot 5.x requests -class "Etherboot" { - -#if The vendor-class-identifier equal Etherboot-5.0 -match if substring (option vendor-class-identifier, 0, 13) = "Etherboot-5.0"; - -# filename define the file retrieve by the client, there nbgrub -# our tftp is chrooted so is just the path to the file -filename "/etherboot/nbgrub"; - -#Used by etherboot to detect a valid pxe dhcp server -option vendor-encapsulated-options 3c:09:45:74:68:65:72:62:6f:6f:74:ff; - -# Set the "vendor-class-identifier" field to "PXEClient" in dhcp answer -# if this field is not set the pxe client will ignore the answer ! -option vendor-class-identifier "Etherboot-5.0"; - -vendor-option-space PXE; -option PXE.mtftp-ip 0.0.0.0; - -# IP of you TFTP server -next-server 10.0.1.42; -} - - -# create the Class PXE -class "PXE" { -# if the "vendor-class-identifier" is set to "PXEClient" in the client dhcp request -match if substring(option vendor-class-identifier, 0, 9) = "PXEClient"; - -# filename define the file retrieve by the client, there pxelinux.0 -# our tftp is chrooted so is just the path to the file -# If you prefer use grub, use pxegrub compiled for your ethernet card. -#filename "/PXEClient/pxegrub"; -filename "/X86PC/linux/linux.0"; - -# Set the "vendor-class-identifier" field to "PXEClient" in dhcp answer -# if this field is not set the pxe client will ignore the answer ! -option vendor-class-identifier "PXEClient"; - - -vendor-option-space PXE; -option PXE.mtftp-ip 0.0.0.0; - -# IP of you TFTP server -next-server 10.0.1.42; -} - -# Tags uses by dhcpnode and setup_add_nodes_to_dhcp -# TAG: NODE_LIST_ADMIN_BEGIN - -# TAG: NODE_LIST_ADMIN_END - -# TAG: MY_ADMIN_BEGIN -subnet 10.0.1.0 netmask 255.255.255.0 { - option subnet-mask 255.255.255.0; - option routers 10.0.1.253; - default-lease-time 288000; - max-lease-time 864000; - option domain-name "guibland.com"; - option domain-name-servers 10.0.1.253; - next-server 10.0.1.42; - - pool { - range 10.0.1.110 10.0.1.120; - } -} - -# TAG: MY_ADMIN_END - - -[root@localhost ~]# service xinetd restart -Stopping xinetd [FAILED] -Starting xinetd [ OK ] -[root@localhost ~]# service pxe restart -Stopping PXE server [FAILED] -Dhcp server is not running on this machine ! -Be sure that a valid PXE Dhcp server is running on your network -Starting PXE server [ OK ] -[root@localhost ~]# service dhcpd restart -Shutting down dhcpd: [ OK ] -Starting dhcpd: [ OK ] -</pre><p> - </p><p>KA listen only listen on eth0, and need a FQDN. So if it is not the case, ka-d-server will try to open - a port on 0.0.0.0 IP address, wich cause an error. You can fix it easely setting an valid hostname in /etc/hosts file. - Don't forget to kill ka-d-server with crtl+C key, after testing it will open a port on a valid IP address.</p><p> -</p><pre class="programlisting"> -[root@node42 ~]# ka-d-server -Compiled : May 4 2010 20:33:07 -ARGS=+ka-d-server+ -Server IP = 0.0.0.0 -command = (cd /; tar --create --one-file-system --sparse /) -I want 1 clients -ka-d-server: server.c:1987: main: Assertion `socket_server >=0' failed. -Aborted - - -[root@node42 ~]# cat /etc/hosts -127.0.0.1 localhost.localdomain localhost -10.0.1.42 node42.guibland.com - -[root@node42 ~]# ka-d-server -Compiled : May 4 2010 20:33:07 -ARGS=+ka-d-server+ -Server IP = 10.0.1.42 -command = (cd /; tar --create --one-file-system --sparse /) -I want 1 clients -Socket 3 on port 30765 on node42.guibland.com ready. -Socket 4 on port 30764 on node42.guibland.com ready. -[root@node42 ~]# ^C -</pre><p> - </p><p>We need to describe the partition table of our golden node, to send it to client nodes.</p><p> -</p><pre class="programlisting"> -[root@node42 ~]# fdisk -l - -Disk /dev/sda: 80.0 GB, 80026361856 bytes -255 heads, 63 sectors/track, 9729 cylinders -Units = cylinders of 16065 * 512 = 8225280 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes -Disk identifier: 0xd9b576f2 - - Device Boot Start End Blocks Id System -/dev/sda1 * 1 1019 8185086 82 Linux swap / Solaris -/dev/sda2 1020 4843 30716280 83 Linux -/dev/sda3 4844 9729 39246795 5 Extended -/dev/sda5 4844 9729 39246763+ 83 Linux - - -[root@node42 ~]# fdisk_to_desc - -devices: sda1 -size en Mo: 7993 -filesystem: Linux -Use of uninitialized value $e in concatenation (.) or string at /usr/bin/fdisk_to_desc line 50. - -devices: sda2 -size en Mo: 29996 -filesystem: Linux -Use of uninitialized value $e in concatenation (.) or string at /usr/bin/fdisk_to_desc line 55. - -devices: sda3 -size en Mo: 38326 -filesystem: Extended - -devices: sda5 -size en Mo: 38326 -filesystem: Linux -Desc file is /tmp/desc -[root@node42 ~]# cat /tmp/d -ddebug.log desc -[root@node42 ~]# cat /tmp/desc -swap 7993 -linux 29996 -extended 38326 -logical linux 38326 - -[root@node42 ~]# cat /tmp/desc -swap 7993 -linux 29996 -extended fill -logical linux fill -</pre><p> - </p><p>Set default PXE boot to kamethod</p><p> -</p><pre class="programlisting"> -[root@node42 ~]# cat /var/lib/tftpboot/X86PC/linux/pxelinux.cfg/default -PROMPT 1 -DEFAULT kamethod -DISPLAY messages -TIMEOUT 50 - -label local - LOCALBOOT 0 - -label kamethod - KERNEL images/vmlinuz - APPEND initrd=images/all.rdz ramdisk_size=64000 vga=788 automatic=method:ka,interface:eth0,network:dhcp root=/dev/ram3 rw kamethod - - -[root@node42 ~]# cd /var/lib/tftpboot/X86PC/linux/ -[root@node42 linux]# ls -help.txt linux.0 memdisk messages pxelinux.cfg/ -[root@node42 linux]# mkdir images - -lftp ftp.proxad.net:/pub/Distributions_Linux/MandrivaLinux/devel/cooker/i586/isolinux/alt0> ls --rw-r--r-- 1 ftp ftp 15613654 Apr 23 17:26 all.rdz --rw-r--r-- 1 ftp ftp 2279584 Apr 23 17:26 vmlinuz -lftp ftp.proxad.net:/pub/Distributions_Linux/MandrivaLinux/devel/cooker/i586/isolinux/alt0> mget * -17893238 bytes transferred in 77 seconds (227.9K/s) -Total 2 files transferred -lftp ftp.proxad.net:/pub/Distributions_Linux/MandrivaLinux/devel/cooker/i586/isolinux/alt0> - -[root@node42 images]# pwd -/var/lib/tftpboot/X86PC/linux/images -[root@node42 images]# ls -all.rdz vmlinuz -</pre><p> - </p><p>Now it's time to launch the duplication process</p><p> -</p><pre class="programlisting"> -[root@node42 ka]# ka-d.sh -n 2 -p sda /tmp/desc -r grub -takembr = -desc = sda /tmp/desc -`/etc/fstab' -> `/tmp/ka-d3156/pfstab.tmp' -+ Mount points : - /dev/sda2 / ext3 relatime 1 1 - /dev/sda5 /home ext4 relatime 1 2 - /dev/sda1 swap swap defaults 0 0 -+ Hard drives : - sda -+ Reading partition table description for sda - Added partition 1 : type 82 - Added partition 2 : type 83 - Added partition 5 : type 83 -+ Included mount points : / /home -+ Bootloader is: grub -+++ Sending Stage2 +++ -Compiled : May 4 2010 20:33:07 -ARGS=+ka-d-server+-s+getstage2+-n+2+-e+(cd /mnt/ka; tar --create --one-file-system --sparse . )+ -Server IP = 10.0.1.42 -command = (cd /mnt/ka; tar --create --one-file-system --sparse . ) -I want 2 clients -Socket 4 on port 30765 on node42.guibland.com ready. -Socket 5 on port 30764 on node42.guibland.com ready. -got UDP packet from 10.0.1.111 -Session name matches -Sending UDP reply to 10.0.1.111 -Accepting connection from 10.0.1.111 -Clients : want_data 0 / connected 0 -client says hello ! -Client sends options -Client accepts data -got UDP packet from 10.0.1.110 -Session name matches -Sending UDP reply to 10.0.1.110 -Accepting connection from 10.0.1.110 -Clients : want_data 1 / connected 0 -client says hello ! -Client sends options -Client accepts data -Added client 10.0.1.110, daddy = 10.0.1.42 -Added client 10.0.1.111, daddy = 10.0.1.110 -Accepting connection from 10.0.1.110 -checking connection auth10.0.1.42 reports 10.0.1.110 has opened data connection -Client 10.0.1.110 reports data position : 0 -10.0.1.42 reports 10.0.1.110 has been accepted -Welcome son, you are number 1 (MAX 4) -Client got client -10.0.1.110 reports 10.0.1.111 has opened data connection -Client 10.0.1.111 reports data position : 0 -sending auth for 10.0.1.111 to 10.0.1.110 -Client got client -10.0.1.110 reports 10.0.1.111 has been accepted -Let's go! -Total data read = 43 Megs, BUF: 34M FREE = 0M startpos = 8MM -End of data flow -Dropping children -Dropping child 10.0.1.110 -All children dropped -Client says dad disconnected -Client says he has finished -Client has finished transfer -Busy clients: 1 -- connected : 2 -Client says dad disconnected -Client says he has finished -Client has finished transfer -Busy clients: 0 -- connected : 2 -Peer closed connection on socket 7 -close_connection(7) -Busy clients: 0 -- connected : 1 -Peer closed connection on socket 6 -close_connection(6) -Busy clients: 0 -- connected : 0 -All clients left, I quit -Total data sent = 44 Megs, in 1543 packets -Transfer time = 0.858 seconds, throughput = 51.307 Mbytes/second -The pipeline was emptied in 3.250 seconds - - Sending partition/filesystem/mount points informations... - +++ Running ka-deploy +++ -Compiled : May 4 2010 20:33:07 -ARGS=+ka-d-server+-s+kainstall1+-n+2+-e+(cd /tmp/ka-d3156 && tar c *)+ -Server IP = 10.0.1.42 -command = (cd /tmp/ka-d3156 && tar c *) -I want 2 clients -Socket 4 on port 30765 on node42.guibland.com ready. -Socket 5 on port 30764 on node42.guibland.com ready. -got UDP packet from 10.0.1.110 -Session name matches -Sending UDP reply to 10.0.1.110 -Accepting connection from 10.0.1.110 -Clients : want_data 0 / connected 0 -client says hello ! -Client sends options -Client accepts data -got UDP packet from 10.0.1.111 -Session name matches -Sending UDP reply to 10.0.1.111 -Accepting connection from 10.0.1.111 -Clients : want_data 1 / connected 0 -client says hello ! -Client sends options -Client accepts data -Added client 10.0.1.110, daddy = 10.0.1.42 -Added client 10.0.1.111, daddy = 10.0.1.110 -Accepting connection from 10.0.1.110 -checking connection auth10.0.1.42 reports 10.0.1.110 has opened data connection -Client 10.0.1.110 reports data position : 0 -10.0.1.42 reports 10.0.1.110 has been accepted -Welcome son, you are number 1 (MAX 4) -Client got client -10.0.1.110 reports 10.0.1.111 has opened data connection -Client 10.0.1.111 reports data position : 0 -sending auth for 10.0.1.111 to 10.0.1.110 -Client got client -10.0.1.110 reports 10.0.1.111 has been accepted -Let's go! -Total data read = 0 Megs, BUF: 0M FREE = 34M startpos = 0M -End of data flow -Dropping children -Dropping child 10.0.1.110 -All children dropped -Client says dad disconnected -Client says he has finished -Client has finished transfer -Busy clients: 1 -- connected : 2 -Client says dad disconnected -Client says he has finished -Client has finished transfer -Busy clients: 0 -- connected : 2 -Peer closed connection on socket 6 -close_connection(6) -Busy clients: 0 -- connected : 1 -Peer closed connection on socket 7 -close_connection(7) -Busy clients: 0 -- connected : 0 -All clients left, I quit -Total data sent = 0 Megs, in 1 packets -Transfer time = 0.006 seconds, throughput = 1.698 Mbytes/second -The pipeline was emptied in 0.038 seconds - WAITING node (partition/format) - - Sending Linux filesystem... - +++ Running ka-deploy +++ -Compiled : May 4 2010 20:33:07 -ARGS=+ka-d-server+-s+kainstall2+-n+2+-e+(cd /; tar --create --one-file-system --sparse / /home)+ -Server IP = 10.0.1.42 -command = (cd /; tar --create --one-file-system --sparse / /home) -I want 2 clients -Socket 4 on port 30765 on node42.guibland.com ready. -Socket 5 on port 30764 on node42.guibland.com ready. -got UDP packet from 10.0.1.110 -Session name matches -Sending UDP reply to 10.0.1.110 -Accepting connection from 10.0.1.110 -Clients : want_data 0 / connected 0 -client says hello ! -Client sends options -Client accepts data -got UDP packet from 10.0.1.111 -Session name matches -Sending UDP reply to 10.0.1.111 -Accepting connection from 10.0.1.111 -Clients : want_data 1 / connected 0 -client says hello ! -Client sends options -Client accepts data -Added client 10.0.1.110, daddy = 10.0.1.42 -Added client 10.0.1.111, daddy = 10.0.1.110 -Accepting connection from 10.0.1.110 -checking connection auth10.0.1.42 reports 10.0.1.110 has opened data connection -Client got client -10.0.1.110 reports 10.0.1.111 has opened data connection -Client 10.0.1.110 reports data position : 0 -10.0.1.42 reports 10.0.1.110 has been accepted -Welcome son, you are number 1 (MAX 4) -Client 10.0.1.111 reports data position : 0 -sending auth for 10.0.1.111 to 10.0.1.110 -Client got client -10.0.1.110 reports 10.0.1.111 has been accepted -Let's go! -Total data read = 789 Megs, BUF: 34M FREE = 0M startpos = 754M -End of data flow -Dropping children -Dropping child 10.0.1.110 -All children dropped -Client says dad disconnected -Client says he has finished -Client has finished transfer -Busy clients: 1 -- connected : 2 -Client says dad disconnected -Client says he has finished -Client has finished transfer -Busy clients: 0 -- connected : 2 -Peer closed connection on socket 7 -close_connection(7) -Busy clients: 0 -- connected : 1 -Peer closed connection on socket 6 -close_connection(6) -Busy clients: 0 -- connected : 0 -All clients left, I quit -Total data sent = 792 Megs, in 25445 packets -Transfer time = 69.904 seconds, throughput = 11.343 Mbytes/second -The pipeline was emptied in 4.002 seconds -</pre><p> - </p></div><div class="sect2" title="6.2. KA client side"><div class="titlepage"><div><div><h3 class="title"><a id="id2516032"></a>6.2. KA client side</h3></div></div></div><p> - To get the log of the client node, launch <span class="bold"><strong>/mnt/ka/ka/status_node.pl IPADD</strong></span> on the golden node. - </p><pre class="programlisting"> -[root@node42 ka]# status_node.pl 10.0.1.111 - - Get the status of the Ka duplication process - If you want to execute a command on node, just use the 'exec' prefix -10.0.1.111> ------| Ka |---- Install starting... -10.0.1.111> Current session is -s kainstall1 -10.0.1.111> Receiving partitions information...OK -10.0.1.111> Cleaning hard drive... -10.0.1.111> ==> /tmp/kacmd <== -10.0.1.111> Starting log server.. -10.0.1.111> -10.0.1.111> ==> /tmp/ka_log-10.0.1.111-20100507-10h32 <== -10.0.1.111> OK -10.0.1.111> Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel -10.0.1.111> Building a new DOS disklabel with disk identifier 0x59be1427. -10.0.1.111> Changes will remain in memory only, until you decide to write them. -10.0.1.111> After that, of course, the previous content won't be recoverable. -10.0.1.111> -10.0.1.111> -10.0.1.111> The number of cylinders for this disk is set to 1116. -10.0.1.111> There is nothing wrong with that, but this is larger than 1024, -10.0.1.111> and could in certain setups cause problems with: -10.0.1.111> 1) software that runs at boot time (e.g., old versions of LILO) -10.0.1.111> 2) booting and partitioning software from other OSs -10.0.1.111> (e.g., DOS FDISK, OS/2 FDISK) -10.0.1.111> Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite) -10.0.1.111> -10.0.1.111> Command (m for help): The partition table has been altered! -10.0.1.111> -10.0.1.111> Calling ioctl() to re-read partition table. -10.0.1.111> Syncing disks. -10.0.1.111> Writing partition table for sda using fdisk...OK -10.0.1.111> Formatting /dev/sda2 as ext3...OK -10.0.1.111> Formatting /dev/sda5 as ext4...OK -10.0.1.111> Formatting /dev/sda1 as swap...OK -10.0.1.111> - Mounting /dev/sda2 as /mnt/disk/ ......OK -10.0.1.111> - Mounting /dev/sda5 as /mnt/disk/home ......OK -10.0.1.111> ++++++++++++++++++++++++++ -10.0.1.111> none on /sys type sysfs (rw,relatime) -10.0.1.111> none on /proc/bus/usb type usbfs (rw,relatime) -10.0.1.111> /dev/ram3 on /tmp/stage2 type ext2 (rw,relatime,errors=continue) -10.0.1.111> /dev/sda2 on /mnt/disk type ext3 (rw,relatime,errors=continue,data=ordered) -10.0.1.111> /dev/sda5 on /mnt/disk/home type ext4 (rw,relatime,barrier=1,data=ordered) -10.0.1.111> ++++++++++++++++++++++++++ -10.0.1.111> Linux copy is about to start -10.0.1.111> Server IP is 10.0.1.42 -10.0.1.111> Buffers names :pipe -Total data received = 21 Megs (10.830 Mbytes/sec); BUF :0M -10.0.1.111> ==> /tmp/kacmd <== -10.0.1.111> Starting log server.. -10.0.1.111> -10.0.1.111> ==> /tmp/ka_log-localhost-20100507-11h17 <== -Total data received = 788 Megs (10.796 Mbytes/sec); BUF :0M End of data flow -10.0.1.111> Flushing buffers -10.0.1.111> Total data received = 792 Megs, in 574479 packets -10.0.1.111> Elapsed time = 73.413 seconds, throughput = 10.801 Mbytes/second -10.0.1.111> Syncing disks...OK -10.0.1.111> Linux copy done. -10.0.1.111> Creating excluded directories -10.0.1.111> - bootloader is grub (user choice) -10.0.1.111> `/tmp/partfiles/pfstab' -> `/mnt/disk/etc/fstab' -10.0.1.111> - Removing duplicated dhcp cache -10.0.1.111> - Writing modprobe.conf -10.0.1.111> ******************** -10.0.1.111> install scsi_hostadapter /sbin/modprobe aic7xxx; /bin/true -10.0.1.111> install scsi_hostadapter /sbin/modprobe pata_serverworks; /bin/true -10.0.1.111> alias eth0 tg3 -10.0.1.111> alias eth1 tg3 -10.0.1.111> ******************** -10.0.1.111> - Remove persistent udev rules -10.0.1.111> removed `/mnt/disk/etc/udev/rules.d/70-persistent-net.rules' -10.0.1.111> - Fix /dev in /mnt/disk -10.0.1.111> `/ka2/udev_creation.sh' -> `/mnt/disk/sbin/udev_creation.sh' -10.0.1.111> Starting udev: [ OK ] -10.0.1.111> umount: /mnt/disk/dev: device is busy. -10.0.1.111> (In some cases useful info about processes that use -10.0.1.111> the device is found by lsof(8) or fuser(1)) -10.0.1.111> - Running mkinitrd -10.0.1.111> - Looking for default grub menu -10.0.1.111> - erase old initrd.img link -10.0.1.111> removed `/mnt/disk/boot/initrd.img' -10.0.1.111> initrd will be : /boot/initrd-2.6.33.3-desktop-1mnb.img -10.0.1.111> running: chroot /mnt/disk /sbin/mkinitrd -v -f /boot/initrd-2.6.33.3-desktop-1mnb.img 2.6.33.3-desktop-1mnb -10.0.1.111> Creating initramfs -10.0.1.111> Looking for driver for /dev/sda2 in /sys/block/sda/sda2 -10.0.1.111> Looking for deps of module scsi:t-0x00: crc-t10dif scsi_mod sd_mod -10.0.1.111> Looking for deps of module pci:v00009005d000000CFsv00001028sd00000121bc01sc00i00: scsi_mod scsi_transport_spi aic7xxx -10.0.1.111> Looking for deps of module pci:v00008086d00000309sv00000000sd00000000bc06sc04i00: pci_hotplug shpchp -10.0.1.111> Looking for driver for /dev/sda1 in /sys/block/sda/sda1 -10.0.1.111> Using modules: usbhid ehci-hcd ohci-hcd uhci-hcd ext3 crc-t10dif scsi_mod sd_mod scsi_transport_spi aic7xxx pci_hotplug shpchp pata_serverworks -10.0.1.111> Building initrd in /tmp/initrd.uuIIkZ -10.0.1.111> /sbin/nash -> /tmp/initrd.uuIIkZ/bin/nash -10.0.1.111> /usr/lib/libnash.so.6.0.93 -> /tmp/initrd.uuIIkZ/usr/lib/libnash.so.6.0.93 -10.0.1.111> /lib/libdevmapper.so.1.02 -> /tmp/initrd.uuIIkZ/lib/libdevmapper.so.1.02 -10.0.1.111> /lib/libreadline.so.6 -> /tmp/initrd.uuIIkZ/lib/libreadline.so.6 -10.0.1.111> /lib/libreadline.so.6.1 -> /tmp/initrd.uuIIkZ/lib/libreadline.so.6.1 -10.0.1.111> /lib/libncurses.so.5 -> /tmp/initrd.uuIIkZ/lib/libncurses.so.5 -10.0.1.111> /lib/libncurses.so.5.7 -> /tmp/initrd.uuIIkZ/lib/libncurses.so.5.7 -10.0.1.111> /lib/libc.so.6 -> /tmp/initrd.uuIIkZ/lib/libc.so.6 -10.0.1.111> /lib/libc-2.11.1.so -> /tmp/initrd.uuIIkZ/lib/libc-2.11.1.so -10.0.1.111> /lib/ld-linux.so.2 -> /tmp/initrd.uuIIkZ/lib/ld-linux.so.2 -10.0.1.111> /lib/ld-2.11.1.so -> /tmp/initrd.uuIIkZ/lib/ld-2.11.1.so -10.0.1.111> /lib/libdl.so.2 -> /tmp/initrd.uuIIkZ/lib/libdl.so.2 -10.0.1.111> /lib/libdl-2.11.1.so -> /tmp/initrd.uuIIkZ/lib/libdl-2.11.1.so -10.0.1.111> /lib/libudev.so.0 -> /tmp/initrd.uuIIkZ/lib/libudev.so.0 -10.0.1.111> /lib/libudev.so.0.7.0 -> /tmp/initrd.uuIIkZ/lib/libudev.so.0.7.0 -10.0.1.111> /usr/lib/libparted.so.0 -> /tmp/initrd.uuIIkZ/usr/lib/libparted.so.0 -10.0.1.111> /usr/lib/libparted.so.0.0.1 -> /tmp/initrd.uuIIkZ/usr/lib/libparted.so.0.0.1 -10.0.1.111> /lib/libuuid.so.1 -> /tmp/initrd.uuIIkZ/lib/libuuid.so.1 -10.0.1.111> /lib/libuuid.so.1.3.0 -> /tmp/initrd.uuIIkZ/lib/libuuid.so.1.3.0 -10.0.1.111> /lib/libblkid.so.1 -> /tmp/initrd.uuIIkZ/lib/libblkid.so.1 -10.0.1.111> /lib/libblkid.so.1.1.0 -> /tmp/initrd.uuIIkZ/lib/libblkid.so.1.1.0 -10.0.1.111> /lib/libpopt.so.0 -> /tmp/initrd.uuIIkZ/lib/libpopt.so.0 -10.0.1.111> /lib/libpopt.so.0.0.0 -> /tmp/initrd.uuIIkZ/lib/libpopt.so.0.0.0 -10.0.1.111> /lib/libresolv.so.2 -> /tmp/initrd.uuIIkZ/lib/libresolv.so.2 -10.0.1.111> /lib/libresolv-2.11.1.so -> /tmp/initrd.uuIIkZ/lib/libresolv-2.11.1.so -10.0.1.111> /usr/lib/libelf.so.1 -> /tmp/initrd.uuIIkZ/usr/lib/libelf.so.1 -10.0.1.111> /usr/lib/libelf-0.146.so -> /tmp/initrd.uuIIkZ/usr/lib/libelf-0.146.so -10.0.1.111> /lib/libm.so.6 -> /tmp/initrd.uuIIkZ/lib/libm.so.6 -10.0.1.111> /lib/libm-2.11.1.so -> /tmp/initrd.uuIIkZ/lib/libm-2.11.1.so -10.0.1.111> /lib/libgcc_s.so.1 -> /tmp/initrd.uuIIkZ/lib/libgcc_s.so.1 -10.0.1.111> /lib/libgcc_s-4.4.3.so.1 -> /tmp/initrd.uuIIkZ/lib/libgcc_s-4.4.3.so.1 -10.0.1.111> /usr/lib/libbdevid.so.6.0.93 -> /tmp/initrd.uuIIkZ/usr/lib/libbdevid.so.6.0.93 -10.0.1.111> /sbin/modprobe -> /tmp/initrd.uuIIkZ/bin/modprobe -10.0.1.111> /lib/libmodprobe.so.0 -> /tmp/initrd.uuIIkZ/lib/libmodprobe.so.0 -10.0.1.111> /lib/libmodprobe.so.0.0.0 -> /tmp/initrd.uuIIkZ/lib/libmodprobe.so.0.0.0 -10.0.1.111> /lib/libz.so.1 -> /tmp/initrd.uuIIkZ/lib/libz.so.1 -10.0.1.111> /lib/libz.so.1.2.3 -> /tmp/initrd.uuIIkZ/lib/libz.so.1.2.3 -10.0.1.111> /sbin/rmmod -> /tmp/initrd.uuIIkZ/bin/rmmod -10.0.1.111> /bin/ln -> /tmp/initrd.uuIIkZ/bin/ln -10.0.1.111> resolving for MODULES -10.0.1.111> and that has items of usbhid ehci-hcd ohci-hcd uhci-hcd ext3 crc-t10dif scsi_mod sd_mod scsi_transport_spi aic7xxx pci_hotplug shpchp pata_serverworks -10.0.1.111> Looking for deps of module usbhid: usbcore hid -10.0.1.111> Looking for deps of module ehci-hcd: usbcore -10.0.1.111> Looking for deps of module ohci-hcd: usbcore -10.0.1.111> Looking for deps of module uhci-hcd: usbcore -10.0.1.111> Looking for deps of module ext3: jbd -10.0.1.111> Looking for deps of module crc-t10dif -10.0.1.111> Looking for deps of module scsi_mod -10.0.1.111> Looking for deps of module sd_mod: crc-t10dif scsi_mod -10.0.1.111> Looking for deps of module scsi_transport_spi: scsi_mod -10.0.1.111> Looking for deps of module aic7xxx: scsi_mod scsi_transport_spi -10.0.1.111> Looking for deps of module pci_hotplug -10.0.1.111> Looking for deps of module shpchp: pci_hotplug -10.0.1.111> Looking for deps of module pata_serverworks: scsi_mod libata -10.0.1.111> Looking for deps of module aic7xxx: scsi_mod scsi_transport_spi -10.0.1.111> Looking for deps of module crc-t10dif -10.0.1.111> Looking for deps of module ehci-hcd: usbcore -10.0.1.111> Looking for deps of module ext3: jbd -10.0.1.111> Looking for deps of module hid -10.0.1.111> Looking for deps of module jbd -10.0.1.111> Looking for deps of module libata: scsi_mod -10.0.1.111> Looking for deps of module ohci-hcd: usbcore -10.0.1.111> Looking for deps of module pata_serverworks: scsi_mod libata -10.0.1.111> Looking for deps of module pci_hotplug -10.0.1.111> Looking for deps of module scsi_mod -10.0.1.111> Looking for deps of module scsi_transport_spi: scsi_mod -10.0.1.111> Looking for deps of module sd_mod: crc-t10dif scsi_mod -10.0.1.111> Looking for deps of module shpchp: pci_hotplug -10.0.1.111> Looking for deps of module uhci-hcd: usbcore -10.0.1.111> Looking for deps of module usbcore -10.0.1.111> Looking for deps of module usbhid: usbcore hid -10.0.1.111> resolving for availmodules -10.0.1.111> and that has items of -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/drivers/scsi/aic7xxx/aic7xxx.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/aic7xxx.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/lib/crc-t10dif.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/crc-t10dif.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/drivers/usb/host/ehci-hcd.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/ehci-hcd.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/fs/ext3/ext3.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/ext3.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/drivers/hid/hid.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/hid.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/fs/jbd/jbd.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/jbd.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/drivers/ata/libata.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/libata.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/drivers/usb/host/ohci-hcd.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/ohci-hcd.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/drivers/ata/pata_serverworks.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/pata_serverworks.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/drivers/pci/hotplug/pci_hotplug.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/pci_hotplug.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/drivers/scsi/scsi_mod.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/scsi_mod.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/drivers/scsi/scsi_transport_spi.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/scsi_transport_spi.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/drivers/scsi/sd_mod.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/sd_mod.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/drivers/pci/hotplug/shpchp.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/shpchp.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/drivers/usb/host/uhci-hcd.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/uhci-hcd.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/drivers/usb/core/usbcore.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/usbcore.ko.gz -10.0.1.111> /lib/modules/2.6.33.3-desktop-1mnb/kernel/drivers/hid/usbhid/usbhid.ko.gz -> /tmp/initrd.uuIIkZ/lib/modules/2.6.33.3-desktop-1mnb/usbhid.ko.gz -10.0.1.111> /etc/sysconfig/keyboard -> /tmp/initrd.uuIIkZ/etc/sysconfig/keyboard -10.0.1.111> /bin/loadkeys -> /tmp/initrd.uuIIkZ/bin/loadkeys -10.0.1.111> /etc/sysconfig/console/default.kmap -> /tmp/initrd.uuIIkZ/etc/sysconfig/console/default.kmap -10.0.1.111> /etc/sysconfig/i18n -> /tmp/initrd.uuIIkZ/etc/sysconfig/i18n -10.0.1.111> /bin/setfont -> /tmp/initrd.uuIIkZ/bin/setfont -10.0.1.111> /usr/lib/kbd/consolefonts/lat0-16.psfu.gz -> /tmp/initrd.uuIIkZ/usr/lib/kbd/consolefonts/lat0-16.psfu.gz -10.0.1.111> /lib/udev/console_init -> /tmp/initrd.uuIIkZ/lib/udev/console_init -10.0.1.111> probing for drm modules for pci device /sys/bus/pci/devices/0000:00:0e.0 -10.0.1.111> Adding graphics device /sys/bus/pci/devices/0000:00:0e.0 -10.0.1.111> Looking for deps of module pci:v00001002d00004752sv00001028sd00000121bc03sc00i00 -10.0.1.111> resolving for GRAPHICSMODS -10.0.1.111> and that has items of -10.0.1.111> Adding module usbhid -10.0.1.111> Adding module ehci-hcd -10.0.1.111> Adding module ohci-hcd -10.0.1.111> Adding module uhci-hcd -10.0.1.111> Adding module ext3 -10.0.1.111> Adding module crc-t10dif -10.0.1.111> Adding module scsi_mod -10.0.1.111> Adding module sd_mod -10.0.1.111> Adding module scsi_transport_spi -10.0.1.111> Adding module aic7xxx -10.0.1.111> Adding module pci_hotplug -10.0.1.111> Adding module shpchp -10.0.1.111> Adding module pata_serverworks -10.0.1.111> /usr/sbin/resume -> /tmp/initrd.uuIIkZ/bin/resume -10.0.1.111> /usr/lib/suspend/resume -> /tmp/initrd.uuIIkZ/usr/lib/suspend/resume -10.0.1.111> /usr/lib/liblzo2.so.2 -> /tmp/initrd.uuIIkZ/usr/lib/liblzo2.so.2 -10.0.1.111> /usr/lib/liblzo2.so.2.0.0 -> /tmp/initrd.uuIIkZ/usr/lib/liblzo2.so.2.0.0 -10.0.1.111> /lib/libpthread.so.0 -> /tmp/initrd.uuIIkZ/lib/libpthread.so.0 -10.0.1.111> /lib/libpthread-2.11.1.so -> /tmp/initrd.uuIIkZ/lib/libpthread-2.11.1.so -10.0.1.111> /lib/libply.so.2 -> /tmp/initrd.uuIIkZ/lib/libply.so.2 -10.0.1.111> /lib/libply.so.2.0.0 -> /tmp/initrd.uuIIkZ/lib/libply.so.2.0.0 -10.0.1.111> /lib/librt.so.1 -> /tmp/initrd.uuIIkZ/lib/librt.so.1 -10.0.1.111> /lib/librt-2.11.1.so -> /tmp/initrd.uuIIkZ/lib/librt-2.11.1.so -10.0.1.111> /lib/libply-splash-core.so.2 -> /tmp/initrd.uuIIkZ/lib/libply-splash-core.so.2 -10.0.1.111> /lib/libply-splash-core.so.2.0.0 -> /tmp/initrd.uuIIkZ/lib/libply-splash-core.so.2.0.0 -10.0.1.111> /etc/suspend.conf -> /tmp/initrd.uuIIkZ/etc/suspend.conf -10.0.1.111> This initrd uses dynamic shared objects. -10.0.1.111> Adding dynamic linker configuration files. -10.0.1.111> /etc/ld.so.conf -> /tmp/initrd.uuIIkZ/etc/ld.so.conf -10.0.1.111> Running ldconfig -10.0.1.111> Installation finished. No error reported. -10.0.1.111> This is the contents of the device map /boot/grub/device.map. -10.0.1.111> Check if this is correct or not. If any of the lines is incorrect, -10.0.1.111> fix it and re-run the script `grub-install'. -10.0.1.111> -10.0.1.111> (hd0) /dev/sda -10.0.1.111> Umounting /dev/sda5...OK -10.0.1.111> Umounting /dev/sda2...OK -10.0.1.111> ftp: connect: Connection refused -10.0.1.111> Local directory now /tmp -10.0.1.111> Not connected. -</pre></div><div class="sect2" title="6.3. Post duplication process"><div class="titlepage"><div><div><h3 class="title"><a id="id2516818"></a>6.3. Post duplication process</h3></div></div></div><p>Now client nodes reboots, so we have to switch PXE to a local boot.</p><p> -</p><pre class="programlisting"> -[root@node42 ka]# vi /var/lib/tftpboot/X86PC/linux/pxelinux.cfg/default -DEFAULT local -</pre><p> - </p><p>Nodes hsould be up, we can to see their hardware.</p><p> - </p><pre class="programlisting"> -[root@node42 ka]# ssh render@10.0.1.110 -[render@linux ~]$ lspcidrake -8139too : Realtek Semiconductor Co., Ltd.|RTL-8139/8139C/8139C+ [NETWORK_ETHERNET] (rev: 10) -snd_intel8x0 : Intel Corporation|82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller [MULTIMEDIA_AUDIO] (rev: 02) -i2c_i801 : Intel Corporation|82801EB/ER (ICH5/ICH5R) SMBus Controller [SERIAL_SMBUS] (rev: 02) -ata_piix : Intel Corporation|82801EB/ER (ICH5/ICH5R) IDE Controller [STORAGE_IDE] (rev: 02) -iTCO_wdt : Intel Corporation|82801EB/ER (ICH5/ICH5R) LPC Interface Bridge [BRIDGE_ISA] (rev: 02) -shpchp : Intel Corporation|82801 PCI Bridge [BRIDGE_PCI] (rev: c2) -ehci_hcd : Intel Corporation|82801EB/ER (ICH5/ICH5R) USB2 EHCI Controller [SERIAL_USB] (rev: 02) -uhci_hcd : Intel Corporation|82801EB/ER (ICH5/ICH5R) USB UHCI Controller #4 [SERIAL_USB] (rev: 02) -uhci_hcd : Intel Corporation|82801EB/ER (ICH5/ICH5R) USB UHCI Controller #3 [SERIAL_USB] (rev: 02) -uhci_hcd : Intel Corporation|82801EB/ER (ICH5/ICH5R) USB UHCI Controller #2 [SERIAL_USB] (rev: 02) -uhci_hcd : Intel Corporation|82801EB/ER (ICH5/ICH5R) USB UHCI Controller #1 [SERIAL_USB] (rev: 02) -unknown : Intel Corporation|82865G/PE/P Processor to I/O Memory Interface [SYSTEM_OTHER] (rev: 02) -Card:Intel 810 and later: Intel Corporation|82865G Integrated Graphics Controller [DISPLAY_VGA] (rev: 02) -unknown : Intel Corporation|82865G/PE/P DRAM Controller/Host-Hub Interface [BRIDGE_HOST] (rev: 02) -hub : Linux 2.6.33.3-desktop-1mnb uhci_hcd|UHCI Host Controller [Hub|Unused|Full speed (or root) hub] -hub : Linux 2.6.33.3-desktop-1mnb uhci_hcd|UHCI Host Controller [Hub|Unused|Full speed (or root) hub] -hub : Linux 2.6.33.3-desktop-1mnb uhci_hcd|UHCI Host Controller [Hub|Unused|Full speed (or root) hub] -usbhid : |SCISSORS Keyboard [Human Interface Device|Boot Interface Subclass|Keyboard] -hub : Linux 2.6.33.3-desktop-1mnb uhci_hcd|UHCI Host Controller [Hub|Unused|Full speed (or root) hub] -hub : Linux 2.6.33.3-desktop-1mnb ehci_hcd|EHCI Host Controller [Hub|Unused|Full speed (or root) hub] -[render@linux ~]$ cat /etc/modprobe.conf -install scsi_hostadapter /sbin/modprobe ata_piix; /sbin/modprobe ahci; /bin/true -alias eth0 8139too -install usb-interface /sbin/modprobe ehci_hcd; /sbin/modprobe uhci_hcd; /bin/true -alias sound-slot-0 snd_intel8x0 - -[root@node42 ka]# ssh render@10.0.1.111 -[render@localhost ~]$ lspcidrake -ath5k : Atheros Communications Inc.|AR2413 802.11bg NIC [NETWORK_ETHERNET] (rev: 01) -tg3 : Broadcom Corporation|NetXtreme BCM5701 Gigabit Ethernet [NETWORK_ETHERNET] (rev: 15) -tg3 : Broadcom Corporation|NetXtreme BCM5701 Gigabit Ethernet [NETWORK_ETHERNET] (rev: 15) -aic7xxx : Adaptec|AIC-7899P U160/m [STORAGE_SCSI] (rev: 01) -aic7xxx : Adaptec|AIC-7899P U160/m [STORAGE_SCSI] (rev: 01) -shpchp : Intel Corporation|80303 I/O Processor PCI-to-PCI Bridge [BRIDGE_PCI] (rev: 01) -unknown : Broadcom|CIOB-X2 PCI-X I/O Bridge [BRIDGE_HOST] (rev: 03) -unknown : Broadcom|CIOB-X2 PCI-X I/O Bridge [BRIDGE_HOST] (rev: 03) -unknown : Broadcom|CIOB-X2 PCI-X I/O Bridge [BRIDGE_HOST] (rev: 03) -unknown : Broadcom|CIOB-X2 PCI-X I/O Bridge [BRIDGE_HOST] (rev: 03) -unknown : Broadcom|CSB5 LPC bridge [BRIDGE_ISA] -ohci_hcd : Broadcom|OSB4/CSB5 OHCI USB Controller [SERIAL_USB] (rev: 05) -pata_serverworks: Broadcom|CSB5 IDE Controller [STORAGE_IDE] (rev: 93) -i2c_piix4 : Broadcom|CSB5 South Bridge [BRIDGE_HOST] (rev: 93) -Card:ATI Mach 64-based cards (no 3D acceleration): ATI Technologies Inc|Rage XL [DISPLAY_VGA] (rev: 27) -unknown : Dell|Embedded Remote Access: BMC/SMIC device -unknown : Dell|Remote Access Card III -unknown : Dell|Embedded Remote Access or ERA/O -unknown : Broadcom|CMIC-LE [BRIDGE_HOST] -unknown : Broadcom|CMIC-WS Host Bridge (GC-LE chipset) [BRIDGE_HOST] -unknown : Broadcom|CMIC-WS Host Bridge (GC-LE chipset) [BRIDGE_HOST] (rev: 13) -hub : Linux 2.6.33.3-desktop-1mnb ohci_hcd|OHCI Host Controller [Hub|Unused|Full speed (or root) hub] - - -[render@localhost ~]$ cat /etc/modprobe.conf -install scsi_hostadapter /sbin/modprobe pata_serverworks; /sbin/modprobe aic7xxx; /bin/true -alias eth0 tg3 -alias eth1 tg3 -install ide-controller /sbin/modprobe ide_generic; /bin/true -install usb-interface /sbin/modprobe ohci_hcd; /bin/true -alias wlan0 ath5k -</pre><p> - </p></div></div></div></body></html> diff --git a/docs/ka_method/html/styleguibo.css b/docs/ka_method/html/styleguibo.css deleted file mode 100644 index 9d088cc93..000000000 --- a/docs/ka_method/html/styleguibo.css +++ /dev/null @@ -1,296 +0,0 @@ -/* Documentation specific changes */ - -span.guilabel { - padding: 0px, 1px, 0px, 1px; - margin: 1px; - background: #e6e6e6; - border-style: none; -} - -span.guimenu, span.guimenuitem, .guibutton { - padding: 0px, 1px, 0px, 1px; - margin: 1px; - border-top: 1px solid #eeeeee; - border-right: 2px solid #cccccc; - border-bottom: 2px solid #cccccc; - border-left: 1px solid #eeeeee; - background: #f5f5f5; -} - -span.accel { - text-decoration: underline; -} - -pre.screen { background-color: #E0E0E0; } -pre.programlisting { background-color: #E0E0E0; } - -/* Colours borrowed from Firefox's keyboard shortcuts table */ -.keycap, .keysym { - padding: 0px, 1px, 0px, 1px; - margin: 1px; - border-top: 1px solid #eedddd; - border-right: 2px solid #bbaaaa; - border-bottom: 2px solid #bbaaaa; - border-left: 1px solid #eeeedd; - background: #faf6f6; - font-family: Courier, monospaced, mono; -} - - -/* Mandrakesoft.com website default */ - -BODY { - background-color: #ffffff; - font-family: Arial, sans-serif; - font-size: 14px; - color: #333333; -} - -.plinks { - background-color: #ffffff; - font-family: Arial, sans-serif; - font-size: 13px; - color: #333333; -} - -TD { - font-family: Arial, sans-serif; - font-size: 15px; - color: #333333; -} - -FORM { - display: inline; -} - -A:link { - text-decoration: none; - color: #21449c; -} - -A:visited { - text-decoration: none; - color: #21449c; -} - -A:hover { - text-decoration: underline; - color: #21449c; -} - -A:active { - text-decoration: underline; - color: #21449c; -} - -INPUT, SELECT { - font-size: 15px; -} - -A.News { - font-size: 13px; - color: #333333; -} - -h1 { - font-family: Arial, sans-serif; - font-size: 23px; - font-weight: bold; - color: #000000; -} - -h2 { - font-family: Arial, sans-serif; - font-size: 18px; - font-weight: bold; - color: #21449c; - display: inline; -} - -h3 { - font-family: Arial, sans-serif; - font-size: 15px; - font-weight: italic; - color: #11649b; - padding: 25px; - display: inline; -} - -h4 { - font-family: Arial, sans-serif; - font-size: 14px; - padding: 45px; - display: inline; -} - -h3.div { - font-family: Arial, sans-serif; - font-size: 11px; - padding: 45px; - display: inline; -} - - -#MainTable { - width: 900px; -} - - -#ContentTable { - width: 719px; -} - -.SelectedLinks { - color: #333333; - font-size: 15px; - font-weight: bold; - padding: 3px; - background-color: #eeeeee; -} - - -.Footer { - font-size: 14px; - padding: 3px; - background-color: #eeeeee; -} - - -.BoxTitle { - font-size: 15px; - color: #333333; - padding-top: 2px; - padding-bottom: 2px; - font-weight: bold; -} - -.BoxContent { - font-size: 13px; - color: #333333; - padding-top: 2px; - padding-bottom: 2px; -} - -.SelectList { - background-color: #ffffff; - color: #333333; - border-style: none; -} - -.InputText { - font-size: 15px; - border-style: solid; - background-color: #ffffff; - border-color: #cccccc; -} - -A.FocusTitle { - color: #999999; - font-weight: bold; - font-size: 15px; - font-decoration: none; -} - -.HomeLink, A.HomeLink { - color: #21449c; - font-size: 15px; -} - -.HomeNewsDate { - color: #21449c; - font-size: 13px; -} - -.text { - font-family: Arial, sans-serif; - font-size: 15px; - color : #333333; -} - -.texte { - font-family: Arial, sans-serif; - font-size: 15px; - color : #333333; -} - -.text4form { - font-family: Arial, sans-serif; - font-size: 15px; - color: #333333; -} - - -.titre1 { - font-family: Arial, sans-serif; - font-size: 15px; - font-weight: bold; - color: #21449c; -} - -.titre2 { - font-family: Arial, sans-serif; - font-size: 15px; - font-weight: bold; - color: #21449c; - display: inline; -} - -.titre3 { - font-family: Arial, sans-serif; - font-size: 15px; - font-weight: bold; - color: #333333; -} - -.textbox { - font-family: Arial, sans-serif; - text-align: left; - font-size: 15px; - color: #000000; -} - -.newsdate { - font-family: Arial, sans-serif; - font-size: 15px; - color: #000000; -} - -.date { - font-family: Arial, sans-serif; - font-size: 13px; - font-weight: normal; - color: #333333; -} - -.note { - font-family: Arial, sans-serif; - font-size: 13px; - color: #333366; -} - -.inzedark { - font-family: Arial, sans-serif; - font-size: 13px; - color: #ffffff; -} - -.titrinzedark { - font-family: Arial, sans-serif; - font-size: 13px; - font-weight: bold; - color: #ffffff; -} - -.TitreHome1 { - font-family: Arial, sans-serif; - font-size: 21px; - font-weight: bold; - color: #acacac; - } - -.TitreHome2 { - font-family: Arial, sans-serif; - font-size: 18px; - font-weight: bold; - color: #21449c; - } diff --git a/globetrotter/.perl_checker b/globetrotter/.perl_checker deleted file mode 100644 index 444722de3..000000000 --- a/globetrotter/.perl_checker +++ /dev/null @@ -1,8 +0,0 @@ -Carp::Heavy -Digest::base -Gtk2::Gdk::Keysyms -Net::Ping -packdrake -urpm -warnings -Packdrakeng diff --git a/globetrotter/ChangeLog b/globetrotter/ChangeLog deleted file mode 100644 index 9dad9b73a..000000000 --- a/globetrotter/ChangeLog +++ /dev/null @@ -1,276 +0,0 @@ -2005-06-09 13:43 Thierry Vignaud <tvignaud at mandriva.com> - - * Makefile: (changelog) only track HEAD changes - -2005-06-09 13:07 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: - sync with DrakX's API - add a few comments - we only - need 4.6Gb for packages now (the DVD image) - update package - list: o for 10.0 -> LE2005 changes (eg: switch to dkms and the - like) o install all languages (marketing request) o install - multimedia plugins & Java runtime environment o do not unselect - anymore input methods - -2005-06-09 12:58 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: (installPackages) help packages' post-install scripts - -2005-06-09 12:58 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: (installPackages) help DrakX more - -2005-06-09 12:55 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: detect both old and new LaCie models - -2005-06-09 12:52 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: prevent building a disk w/o translation catalogs - -2005-06-09 12:50 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: prevent warning message about /proc to appear at boot - -2005-06-09 12:49 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: - urpmi syntax had changed - install all new media - -2005-06-09 12:48 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: devfs is dead - -2005-06-09 12:46 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: save X.org conf too on profile switch - -2005-06-09 12:31 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: set $::build_globetrotter - -2005-06-09 12:13 Thierry Vignaud <tvignaud at mandriva.com> - - * move.pm: (install2::configMove) prevent dm service to fail to - startup because of /tmp/.font-unix's permissions - -2005-06-09 12:11 Thierry Vignaud <tvignaud at mandriva.com> - - * move.pm: (install2::configMove) workaround init reading inittab - before any.pm alters it - -2005-06-09 12:09 Thierry Vignaud <tvignaud at mandriva.com> - - * move.pm: sync with drakx's API - -2005-06-09 12:08 Thierry Vignaud <tvignaud at mandriva.com> - - * move.pm: (automatic_xconf) class_discard is needed way earlier - -2005-06-09 12:07 Thierry Vignaud <tvignaud at mandriva.com> - - * move.pm: (install2::configMove) fix killing X11 due to XFree86 -> - X.org switch - -2005-06-09 12:06 Thierry Vignaud <tvignaud at mandriva.com> - - * move.pm: (install2::configMove) if formatError() returns nothing, - better display the raw error - -2005-06-09 11:59 Thierry Vignaud <tvignaud at mandriva.com> - - * Makefile: fix build - -2005-06-09 11:59 Thierry Vignaud <tvignaud at mandriva.com> - - * .perl_checker: blacklist more pakcages - -2005-06-09 11:58 Thierry Vignaud <tvignaud at mandriva.com> - - * runstage2: fix comment - -2005-06-02 05:20 Olivier Blin <oblin at mandriva.com> - - * hwprofile: fix netprofile stuff - -2005-05-25 10:56 Thierry Vignaud <tvignaud at mandriva.com> - - * fix-broken-hd.diff: fix broken hd - -2005-05-25 10:45 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: unmount partitions even when failled - -2005-05-25 10:41 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: display message earlier - -2005-05-25 10:40 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: on restoration, tell which one is the packages - partition when found - -2005-05-25 10:39 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: nicely tell that the restoration is completed - -2005-05-25 10:39 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: use newly introduced my_exit() in order to display - better messages - -2005-05-25 10:37 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: (my_exit) introduce it for smoother messages - -2005-05-25 10:36 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: handle smoothly packages partition with multiple - kernel packages - -2005-05-25 10:35 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: fix fs checking prior to restoration, thus handling - restoration on fscked hard disks - -2005-05-25 10:34 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: when we format the root fs prior to restoring the hd, - set back the label on the fs so that we can handle an aborted - restoration (power outrage, ...) - -2005-05-25 10:33 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: factorize some code through find_partition() - -2004-10-26 17:18 Thierry Vignaud <tvignaud at mandriva.com> - - * make_live: do not try to run killall until it has been installed - -2004-10-07 02:44 Pixel <pixel at mandriva.com> - - * move.pm: - XFdrake can detect a auxmouse which was not detected - by mousedrake so we need to call various_xfree_conf() - this - implies adding parameter $do_pkgs to a few functions - -2004-08-27 08:11 Thierry Vignaud <tvignaud at mandriva.com> - - * ChangeLog: initial commit - -2004-08-27 08:10 Thierry Vignaud <tvignaud at mandriva.com> - - * Makefile: add changelog target - -2004-07-20 04:42 Pixel <pixel@mandrakesoft.com> - - * hwprofile, move.pm, runstage2: MandrakeSoft -> Mandrakesoft - -2004-07-09 04:47 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: sometimes grub return non zero exit status w/o error - -2004-07-09 04:46 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: kill debug message - -2004-07-09 04:16 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: do not complain about unmounted usb fs in recue mode - -2004-07-09 03:45 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: fix restore mode (initrd's mount failled to mount ext2 - as ext3) - -2004-06-30 10:14 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * doc/BUILD: fix build explanation (else make_live will horribly - die due to missing functions :-() - -2004-06-30 09:25 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * doc/BUILD: update how to build instructions - -2004-06-30 08:13 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * doc/BUILD: do not forget to update hdlists - -2004-06-30 08:12 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * README: fix required packages list - -2004-06-30 07:24 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: display a nicer error message when disk is not found - -2004-06-29 08:25 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: fix umounting - -2004-06-29 05:28 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: unselect uim since mdk10 package of uim IM break first - time wizard when selecting english - -2004-06-29 04:09 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: perl_checker cleanups - -2004-06-29 03:36 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: add rescue support - -2004-06-24 11:41 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: (installPackages) kill debugging statements - -2004-06-24 10:17 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * hwprofile: create hw profile after having run first time wizard - so that if one refuse the icense, he has to run it again - -2004-06-24 07:39 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: make share partition be writeable by unpriviliegied - users - -2004-06-24 07:33 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: add fb2png in order to be able to take screenshots - -2004-06-24 07:31 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: per machine firewall configuration - -2004-06-18 05:44 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: force installation of both 2.4.x and 2.6.x centrino - drivers - -2004-06-18 05:44 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: - use labels for home and packages partitions too - - mount packages partition in read-only mode - -2004-06-18 04:08 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * make_live: install autologin as requested by QA - -2004-06-15 18:56 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * README: update package versions to reflect current globetrotter - -2004-06-15 18:54 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * README: update what's required in new initscripts - -2004-06-15 18:50 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * .perl_checker, Makefile, README, hwprofile, make_live, - mandrake-globetrotter.spec, move.pm, runstage2, doc/BUGS, - doc/BUILD, doc/NOTES: Imported Globetrotter - -2004-06-15 18:50 Thierry Vignaud <tvignaud@mandrakesoft.com> - - * .perl_checker, Makefile, README, hwprofile, make_live, - mandrake-globetrotter.spec, move.pm, runstage2, doc/BUGS, - doc/BUILD, doc/NOTES: Initial revision - diff --git a/globetrotter/Makefile b/globetrotter/Makefile deleted file mode 100644 index d6a0756cd..000000000 --- a/globetrotter/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -PACKAGE=mandrake-globetrotter -PKGVERSION:=$(shell rpm -q --qf '%{VERSION}\n' --specfile $(PACKAGE).spec|head -n 1) -RELEASE:=$(shell rpm -q --qf '%{RELEASE}\n' --specfile $(PACKAGE).spec|head -n 1) -TAG := $(shell echo "V$(PKGVERSION)_$(RELEASE)" | tr -- '-.' '__') - -DIRS=share/po -PREFIX = - -SBINDIR = $(PREFIX)/usr/sbin -LIBDIR = $(PREFIX)/usr/lib -LIBDEST = $(LIBDIR)/libDrakX -DATADIR = $(PREFIX)/usr/share - -LANG_FILES = pixmaps/langs -DISTFILES = hwprofile *.spec share/po/*.po share/po/Makefile Makefile Makefile.config *.pm runstage2 $(LANG_FILES) - -.PHONY: all install clean - -all: - rm -f share/po/DrakX.pot # force rebuild of po's - make -C share/po mofiles - - -localcopy: clean - cd .. ; rm -rf $(PACKAGE)-$(PKGVERSION) ; cp -af globetrotter $(PACKAGE)-$(PKGVERSION) - # include pixmaps for language selector: - mkdir ../$(PACKAGE)-$(PKGVERSION)/{pixmaps,share} - cp -af ../perl-install/pixmaps/langs ../$(PACKAGE)-$(PKGVERSION)/pixmaps/langs - # include drakx modules for first time wizard : - # cp -af ../perl-install/share/po ../$(PACKAGE)-$(PKGVERSION)/share/ - mkdir ../$(PACKAGE)-$(PKGVERSION)/share/po - # cp -af ../perl-install/share/po/{fr.po,Makefile,i18n_compssUsers} ../$(PACKAGE)-$(PKGVERSION)/share/po - cp -af ../perl-install/share/po/{*.po,Makefile} ../$(PACKAGE)-$(PKGVERSION)/share/po - # enable fast build: - perl -pi -e 's!^.*msgmerge.*\n!!' ../$(PACKAGE)-$(PKGVERSION)/share/po/Makefile - cp -af ../perl-install/{help,pkgs,install*}.pm ../$(PACKAGE)-$(PKGVERSION)/ - echo 'ALLPMS = *.pm' > ../$(PACKAGE)-$(PKGVERSION)/Makefile.config - @make nuke_perl - - -install: - install -d $(LIBDEST) $(DATADIR)/libDrakX/pixmaps/langs $(SBINDIR) - install -m 644 *.pm $(LIBDEST) - install -m 755 runstage2 $(SBINDIR)/mdkmove - cp -f pixmaps/langs/lang-*.png $(DATADIR)/libDrakX/pixmaps/langs - $(MAKE) -C share/po install PREFIX=$(PREFIX) SUDO= DATADIR=$(DATADIR) NAME=libDrakX2 -# %make -C po install SUDO= NAME=libDrakX2 LOCALEDIR=$(DEST)/usr/share/locale_special - - -rpm: localrpm -localrpm: localdist buildrpm - -srpm: localsrpm -localsrpm: spec_test localdist buildsrpm - -localdist: cleandist localcopy tar - -cleandist: - rm -rf ../$(PACKAGE)-$(PKGVERSION) ../$(PACKAGE)-$(PKGVERSION).tar.bz2 - -spec_test: - @if [[ -z "$(PKGVERSION)" ]]; then echo "unable to get spec version"; exit 3;fi - @if [[ -z "$(RELEASE)" ]]; then echo "unable to get spec release"; exit 2;fi - -tar: - cd ../$(PACKAGE)-$(PKGVERSION) && rm -rf debug.log `find -name CVS` - cd ..; tar cfj $(PACKAGE)-$(PKGVERSION).tar.bz2 $(patsubst %,$(PACKAGE)-$(PKGVERSION)/%,$(DISTFILES)) - #cd ..; rm -rf $(PACKAGE)-$(PKGVERSION) - -buildrpm: - rpm -ta ../$(PACKAGE)-$(PKGVERSION).tar.bz2 - -buildsrpm: - rpm -ts --nodeps ../$(PACKAGE)-$(PKGVERSION).tar.bz2 - -# rules to build a distributable rpm - -dist: cleandist export tar - -export: - cd ..; cvs export -d $(PACKAGE)-$(PKGVERSION) -r $(TAG) $(PACKAGE) - cd ../$(PACKAGE)-$(PKGVERSION) - cd ..; - @make nuke_perl - -nuke_perl: - find ../$(PACKAGE)-$(PKGVERSION) -name '*.pm' | xargs perl -pi -e 's/\s*use\s+(diagnostics|strict|vars|warnings).*//g' - -img: - /usr/bin/lilo-bmp2mdk mode:0x103 progress:397,190,14,6,64+8 clear:600,800,64+8 pos:0,0 < BOOTGTROTTER-install-lilo-8bis.bmp > isolinux_boot.msg - -.PHONY: log changelog - -log: changelog - -changelog: - cvs2cl --accum -W 400 -U ../../soft/common/username -F TRUNK diff --git a/globetrotter/README b/globetrotter/README deleted file mode 100644 index 7052212b3..000000000 --- a/globetrotter/README +++ /dev/null @@ -1,64 +0,0 @@ - Mandrakelinux GlobeTrotter, powered by LaCie Mobile Hard Drive project - ====================================================================== - - - -Requirements: -============= - -1) packages: ------------- - -you need to have the distro repositery mounted in /export. - -on top of the mdk10.0 base + its updates, the following packages were -updated from cooker: - -- misc bug fixes: - o drakconf-10-13mdk - o {drakxtools,harddrake}*-10-34.2mdk - o mdkonline-1.1-2.1.100mdk - o menudrake-0.7.4-8mdk - o perl-Libconf*-0.33-2mdk - o rpmdrake-2.1.3-5mdk - o initscripts-7.06-49.1mdk: - * usb starting when usb host drivers were loaded by initrd - * fix larsen on laptops -- root=LABEL=foobar and boot from USB support: - o mkinitrd-3.5.18-10mdk - o bootloader-utils-1.7-1mdk -- coexistance: - o glibc with /etc/ld.so.conf.d/ support - o ATI driver - o NIVIDIA driver -- new packages: - o kdetv, libkdevideo -- should we also take new kernel? - -Note: once you've updated some packages, you need to run "gendistrib - /export". - - -2) local checkout of drakx: ---------------------------- - -you need a copy of gi/perl-install in ../perl-install as well as -gi/mdk-stage1. - -you need to install the following packages: gcc, e2fsprogs, -ldetect-devel, libext2fs2-devel, libxfree86-devel, perl-devel, -perl-URPM, rpm-devel, rpmtools, and urpmi. - -then you need to type "make c" in ../perl-install. - -last but not least, you need to copy list_modules from gi/kernel into -perl-instéall and gi/mdk-stage1/pcmcia_/probe.c into perl-install/c. - - - -Building the hd image: -====================== - -just type ./make_live - -it'll reformat the hard disk, mount it and install packages
\ No newline at end of file diff --git a/globetrotter/doc/BUGS b/globetrotter/doc/BUGS deleted file mode 100644 index 97ff5d8b0..000000000 --- a/globetrotter/doc/BUGS +++ /dev/null @@ -1,6 +0,0 @@ --*- outline -*- - -* drakboot and diskdrake are not yet fully capable of managing LABEL= in -/tc/fstab - -* lilo failed to boot from USB diff --git a/globetrotter/doc/BUILD b/globetrotter/doc/BUILD deleted file mode 100644 index 108c44650..000000000 --- a/globetrotter/doc/BUILD +++ /dev/null @@ -1,28 +0,0 @@ - How to build Mandrakelinux Globetrotter: - ======================================== - -- you need first to install all the drakxtools' build dependancies - (thus running "urpmi /SRPMS/drakxtools-*" may be quite helpful) - -- copy the mdk10.0 DVD in /export -- leave main as Mandrake/RPMS -- copy h[cs]f*, FlashPlayer*, RealPlayer* into Mandrake/RPMS from Mandrake/RPMS[23] -- move contribs as Mandrake/RPMS2 -- move other RPMS? somewhere else -- add packages from ~tv/rpm/lacie on cluster -- add updates from /mnt/BIG/dis/updates/10.0 -- add updated proprietary packages for kernel update from kameha - (nplanel's work machine): - echo "mget *2.4.25.5mdk* *2.6.3.13mdk*" | \ -lftp -u a,a ftp://kameha:/~/../nplanel/rpm/prop/RPMS/i586/ -- run the following in order to remove duplicated packages: - doble [A-Z] | xargs rm -f - doble [a-g] | xargs rm -f - doble [h-z] | xargs rm -f -- run "gendistrib --noclean /export" -- plug the LaCie disk -- check out the whole gi cvs module -- run "C_DRAKX=1 make c" in gi/perl-install -- go into gi/globetrotter -- run make_live --partition --format --install --post in order to - prepare the disk diff --git a/globetrotter/doc/NOTES b/globetrotter/doc/NOTES deleted file mode 100644 index 5a43af0e2..000000000 --- a/globetrotter/doc/NOTES +++ /dev/null @@ -1,17 +0,0 @@ - Mandrakelinux GlobeTrotter release notes - - - -* Arabic support - - -you may want to enable the acon service from the acon package. -Just type: "chkconfig --add jserver" as root or use the "Services" -icon from the Mandrakelinux Control Center - - -* Japanese support - -you may want to enable the jserver service from the FreeWnn package. -Just type: "chkconfig --add jserver" as root or use the "Services" -icon from the Mandrakelinux Control Center
\ No newline at end of file diff --git a/globetrotter/fix-broken-hd.diff b/globetrotter/fix-broken-hd.diff deleted file mode 100644 index 6ae7fa491..000000000 --- a/globetrotter/fix-broken-hd.diff +++ /dev/null @@ -1,127 +0,0 @@ ---- make_live 2005-05-25 17:42:35.000000000 +0200 -+++ make_live 2005-05-25 17:46:41.000000000 +0200 -@@ -8,6 +8,7 @@ - use standalone; - use interactive; - use common; -+use detect_devices; - use partition_table; - use fsedit; - use fs; -@@ -321,8 +322,116 @@ - - $::prefix = $ARGV[0] || '/tmp/live_tree'; - -+#=========================================================================== -+# Fix disk if it's a bogus one: -+ -+my @packages2delete = qw( -+ Mandrake/RPMS/uqm-data-0.3-1mdk.noarch.rpm -+ -+ Mandrake/RPMS2/kernel24-tmb-2.4.25-6.tmb.1mdk-1-1mdk.i586.rpm -+ Mandrake/RPMS2/kernel24-tmb-2.4.25-7.tmb.1mdk-1-1mdk.i586.rpm -+ Mandrake/RPMS2/kernel24-tmb-2.4.25-7.tmb.2mdk-1-1mdk.i586.rpm -+ Mandrake/RPMS2/kernel24-tmb-enterprise-2.4.25-6.tmb.1mdk-1-1mdk.i586.rpm -+ Mandrake/RPMS2/kernel24-tmb-enterprise-2.4.25-7.tmb.1mdk-1-1mdk.i586.rpm -+ Mandrake/RPMS2/kernel24-tmb-enterprise-2.4.25-7.tmb.2mdk-1-1mdk.i586.rpm -+ Mandrake/RPMS2/kernel24-tmb-i686-up-4GB-2.4.25-6.tmb.1mdk-1-1mdk.i586.rpm -+ Mandrake/RPMS2/kernel24-tmb-i686-up-4GB-2.4.25-7.tmb.1mdk-1-1mdk.i586.rpm -+ Mandrake/RPMS2/kernel24-tmb-i686-up-4GB-2.4.25-7.tmb.2mdk-1-1mdk.i586.rpm -+ Mandrake/RPMS2/kernel24-tmb-source-2.4.25-7.tmb.2mdk.i586.rpm -+ -+ Mandrake/RPMS2/kernel-tmb-2.6.4-1.tmb.8mdk-1-1mdk.i586.rpm -+ Mandrake/RPMS2/kernel-tmb-enterprise-2.6.4-1.tmb.8mdk-1-1mdk.i586.rpm -+ Mandrake/RPMS2/kernel-tmb-i686-up-4GB-2.6.4-1.tmb.8mdk-1-1mdk.i586.rpm -+ Mandrake/RPMS2/kernel-tmb-source-2.6.4-1.tmb.8mdk.i586.rpm -+ Mandrake/RPMS2/kernel-win4lin-2.4.25.5mdk-3-7mdk.i586.rpm -+ Mandrake/RPMS2/kernel-win4lin-2.6.3.15mdk-3-8mdk.i586.rpm -+ Mandrake/RPMS2/kernel-win4lin-enterprise-2.4.25.5mdk-3-7mdk.i586.rpm -+ Mandrake/RPMS2/kernel-win4lin-enterprise-2.6.3.15mdk-3-8mdk.i586.rpm -+ Mandrake/RPMS2/kernel-win4lin-i686-up-4GB-2.4.25.5mdk-3-7mdk.i586.rpm -+ Mandrake/RPMS2/kernel-win4lin-i686-up-4GB-2.6.3.15mdk-3-8mdk.i586.rpm -+ Mandrake/RPMS2/kernel-win4lin-p3-smp-64GB-2.4.25.5mdk-3-7mdk.i586.rpm -+ Mandrake/RPMS2/kernel-win4lin-p3-smp-64GB-2.6.3.15mdk-3-8mdk.i586.rpm -+ Mandrake/RPMS2/kernel-win4lin-smp-2.4.25.5mdk-3-7mdk.i586.rpm -+ Mandrake/RPMS2/kernel-win4lin-smp-2.6.3.15mdk-3-8mdk.i586.rpm -+ ); -+ -+# misc paths; -+my $pkgs_mount_path = "/mnt/mdk_pkgs"; -+my $rescue_path = "/rescue-glob"; -+my $cd_mount_path = "/mnt/cdrom-glob"; -+ -+# enable to retry fixing partitions if fixing failed: -+my $__need2befixed_mark = "Mandrake/RPMS/NEED_TO_BE_FIXED"; -+my $need2befixed_mark = "$pkgs_mount_path/__need2befixed_mark"; -+ -+{ -+ mkdir_p($pkgs_mount_path); -+ -+ my $cleaner = before_leaving { -+ if (my $err = $@) { -+ print "\n>> an error happened: $err\n"; -+ } -+ print "Cleaning on end of fixing\n"; -+ eval { fs::umount($_) } foreach $pkgs_mount_path, $cd_mount_path; -+ undef $@; # do not propagate fs::umount exceptions -+ }; -+ -+ print "Checking if the packages partition needs to be fixed\n"; -+ # system("mount /dev/$pkg_dev->{device} $pkgs_mount_path"); -+ fs::mount($pkg_dev->{device}, $pkgs_mount_path, 'ext3'); -+ # my $pkgs_mount_path = "/home/qa/broken"; # FIXME: TESTING -+ -+ if (any { -e "$pkgs_mount_path/$_" } @packages2delete, $__need2befixed_mark) { -+ print "Preparing to fixing the partition packages...\n"; -+ touch($need2befixed_mark); -+ -+ # Cleaning the packages so that we get back some free space: -+ unlink("$pkgs_mount_path/$_") foreach @packages2delete; -+ -+ -+ # Lookup rescue CD: -+ -+ my $cdrom_path; -+ -+ my @cdroms = map { $_->{device} } detect_devices::cdroms(); -+ -+ mkdir_p($cd_mount_path); -+ -+ my ($found, $cdrom_dev); -+ -+ foreach my $cdrom (@cdroms) { -+ eval { fs::mount($cdrom, $cd_mount_path, 'iso9660', 1) } or next; # nicely handle empty drives -+ if (-d "$cd_mount_path/$rescue_path") { -+ $cdrom_dev = $cdrom; -+ $found = 1; -+ last; -+ } -+ fs:umount($cd_mount_path); -+ } -+ undef $@; # do not propagate fs::mount exceptions -+ -+ if ($found) { -+ warn "Found rescue CDROM on $cdrom_dev\n"; -+ } else { -+ warn "I failed to found the rescue CDROM\nPress enter to return to the menu"; -+ <STDIN>; -+ # TODO : replace by sg else if merged within make_live -+ exit(0); -+ } -+ -+ -+ print "Fixing the partition packages... in progress\n"; -+ # Copy Mandrake/base with the newly generated hdlists from the old repositery; -+ cp_af($_, "$pkgs_mount_path/Mandrake/base") foreach glob_("$cd_mount_path/$rescue_path/Mandrake/base/*"); -+ cp_af($_, "$pkgs_mount_path/Mandrake/RPMS") foreach glob_("$cd_mount_path/$rescue_path/Mandrake/pkgs/*"); -+ unlink($need2befixed_mark); -+ print "Fixing the partition packages... done\n"; -+ } -+} -+ -+ - #=========================================================================== - # Building the disk: - -d $::prefix or mkdir $::prefix; - print "Making live in $::prefix directory.\n"; - diff --git a/globetrotter/hwprofile b/globetrotter/hwprofile deleted file mode 100644 index a3b0574dd..000000000 --- a/globetrotter/hwprofile +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/perl - -# Copyright (c) 2004 Mandrakesoft -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -use lib qw(/usr/lib/libDrakX); - -use common; -use standalone; -use Digest::MD5 qw(md5_hex); -use network::network; - -# md5_hex call came from move::machine_ident() : -my $id = "MDK" . md5_hex(join("", (map { (split)[1] } cat_("/proc/bus/pci/devices")))); - -my $net = {}; - -# first boot wizard: -!glob_("/etc/netprofile/profiles/MDK*") and system('/usr/sbin/mdkmove'); - -# create hardware profile if needed: -if (! -d "/etc/netprofile/profiles/$id") { - network::network::netprofile_read($net); - network::network::netprofile_add($net, $id); -} - -# restore hardware profile: -eval { network::network::netprofile_set($net, $id) }; - -# redo ldconfig cache for libGL (since we've both ATI and NVIDIA GLX packages): -system("/sbin/ldconfig"); diff --git a/globetrotter/make_live b/globetrotter/make_live deleted file mode 100755 index bbdb46a3b..000000000 --- a/globetrotter/make_live +++ /dev/null @@ -1,547 +0,0 @@ -#!/usr/bin/perl - -$::isInstall = 1; # for /root/drakx/ddebug.log - -use strict; -#use lib qw(/usr/lib/libDrakX); -use lib "../perl-install"; -use standalone; -use interactive; -use common; -use detect_devices; -use partition_table; -use fsedit; -use fs; -use any; -use pkgs; -use class_discard; -use run_program; -use modules; -use modules::modules_conf; -use modules::any_conf; -use log; - -# my $in = interactive->vnew; - -$::isStandalone = undef; # for /tmp/ddebug.log -$::build_globetrotter = 1; -$::no_ugtk_init = 1; - -my (%options, @new_ARGV); - -foreach (@ARGV) { - if (/^--(.*)/) { - $options{$1} = 1; - } else { - push @new_ARGV, $_; - } -} - -my $rescue; - -if ($0 =~ /restore_globetrotter/) { - %options = (install => 1, post => 1); - $rescue = 1; -} - -@ARGV = @new_ARGV; - -if (!$rescue) { - die qq(\%_install_langs is not set to "all" in /etc/rpm/macros) if cat_('/etc/rpm/macros') !~ /\%_install_langs\s*all/; -} - -my @suggestions = ( - { mntpoint => "/", size => 4500 << 11, type => 0x483, ratio => 1, maxsize => 6000 << 11, fs_type => 'ext3' }, - # splited / and /usr: - # { mntpoint => "/", size => 250 << 11, type => 0x483, ratio => 1, maxsize => 2000 << 11 }, - # { mntpoint => "/usr", size => 300 << 11, type => 0x483, ratio => 4, maxsize => 4000 << 11 }, - { mntpoint => "/home", size => 2000 << 11, type => 0x483, ratio => 3, fs_type => 'ext3' }, - - # share partition with windows: - { mntpoint => "/mnt/share", size => 2000 << 11, type => 0xb, ratio => 3, fs_type => 'vfat' }, - { mntpoint => "/mnt/packages", size => 5000 << 11, type => 0x483, ratio => 3, maxsize => 5000 << 11, fs_type => 'ext3' }, - # allocated last b/c end of disk is usually faster: - { mntpoint => "swap", size => 64 << 11, type => 0x82, ratio => 1, maxsize => 500 << 11, fs_type => 'swap' }, - ); - - -sub get_hds() { - my $all_hds = fsedit::get_hds(); - my $other; - ($all_hds->{hds}, $other) = partition { $_->{usb_description} =~ /^LaCie|LaCie Hard( |)Drive USB/ } @{$all_hds->{hds}}; - my_exit("Your disk cannot be restored because it cannot be found!") if !$all_hds->{hds}[0]; - $all_hds, $all_hds->{hds}[0]; # $other -} - - -sub prepare_disk() { - # repartion the hard disk: - print "PARTITIONNING\n"; - my ($all_hds, $hd, $other) = get_hds(); - # partition_table::remove($hd, $_) while partition_table::get_normal_parts($hd); - run_program::run("swapoff", "/dev/$all_hds->{hds}[0]{device}8") if any { /$all_hds->{hds}[0]{device}/ } cat_("/proc/partitions"); - - partition_table::raw::zero_MBR_and_dirty($hd); - fsedit::allocatePartitions($all_hds, \@suggestions); - require diskdrake::interactive; - require class_discard; - # diskdrake::interactive::write_partitions(class_discard->new, $_, 'skip_check_rebootNeeded') foreach (@{$all_hds->{hds}}); - foreach (@{$all_hds->{hds}}) { - local $::isStandalone = undef; - print "WRITE PARTITION ON $_->{file}\n"; - diskdrake::interactive::write_partitions(class_discard->new, $_, 'skip_check_rebootNeeded') - } - # partition_table::write(@{$all_hds->{hds}}); - ($all_hds, $hd, $other); -} - - -sub formatdisk { - my ($hd) = @_; - print "FORMATTING\n"; - foreach (partition_table::get_normal_parts($hd)) { - print qq(Formatting "$_->{device}" ($_->{mntpoint})\n); - require fs::format; - fs::format::part(undef, $_, $::prefix, undef) if !$::testing; - } -} - - -#@ARGV <= 1 or die "usage: make_live [live_location=/tmp/live_tree]\n"; - - if (!find { m!/proc/bus/usb! } run_program::get_stdout('mount')) { - warn "USB service is *NOT* started" if !$rescue; - run_program::get_stdout('service', 'usb', 'start'); - } - -sub my_exit { - my ($msg) = @_; - print "\n\n==============================================================\n\n"; - print $msg; - print "\n\nPress <RETURN> to return back to menu\n\n"; - print "==============================================================\n\n"; - <STDIN>; - c::_exit(0); -} - -sub find_partition { - my ($label, @parts) = @_; - find { member(fs::type2fs($_), qw(ext2 ext3)) && chomp_(`e2label /dev/$_->{device} 2>/dev/root`) eq $label } @parts; -} - -my $pkg_dev; -if ($rescue) { - system("mount -t tmpfs none /tmp"); - # let be able to see USB devices: - system("mount -t usbfs none /proc/bus/usb"); - system("modprobe usb-storage; modprobe sd_mod"); - # let be able to detect SCSI hds: - mkdir("/sys"); - system("mount -t sysfs none /sys"); - - my ($all_hds, $hd, $other) = get_hds(); - print "Looking for the package partition\n"; - my @parts = partition_table::get_normal_parts($hd); - $pkg_dev = find_partition("MDK-PKGS", @parts); - #die "I cannot find the package partition which is needed in order to restore the system!" - my_exit("Your disk cannot be restored because there is no more a restore partition!") if is_empty_hash_ref($pkg_dev) || !$pkg_dev->{device}; - print "Packages partition was found on $pkg_dev->{device}\n"; - my $root = find_partition("MDK-ROOT", @parts); - $root = find { $_->{device} eq "sda1" } @parts if is_empty_hash_ref($root); - #my_exit("I cannot find any hard disk to restore!") if is_empty_hash_ref($root) || !$root->{device}; - my_exit("Your disk cannot be restored because there is no more a root partition!") if is_empty_hash_ref($root) || !$root->{device}; - print "\nPlease wait, disk is being checked, this can take quite some time\n\n"; - run_program::run("e2fsck -C0 -y $_") foreach map { - my $p = find_partition($_, @parts); - if_($p, $p->{device}); # handle lost labels - } "MDK-PKGS", "MDK-HOME"; # MDK-ROOT" - print "Please wait, disk reinstallation is in progress, this can take quite some time\n"; - print "Formating $root->{device}\n"; - system("mkfs.ext2 -j /dev/$root->{device} > /dev/null\n"); - run_program::run('tune2fs', '-L', "MDK-ROOT", "/dev/$root->{device}"); # prevent lost label if restore aborts before the end -} - -sub installPackages() { - local $::testing = undef; - - # for a gconftool-2 cleaner: - my $pid = fork(); - !defined $pid and die("cannot fork: $!"); - !$pid and do { - while (1) { - sleep(10); - run_program::run('/usr/bin/killall', 'gconftool-2') if -x '/usr/bin/killall'; - } - }; - my $_b = before_leaving { kill 'TERM', $pid if $pid }; - - # ensure no %_install_langs: - output_p("$::prefix/etc/rpm/macros", "%_install_langs all\n"); - # ensure boot from USB will work: - output_p("$::prefix/etc/sysconfig/mkinitrd", "forceusb=yes\n"); - - # help DrakX: - mkdir_p("$::prefix/$_") foreach qw(tmp/headers var/lib/rpm root/drakx); - - # help packages' post scripts: - mkdir_p("$::prefix/proc"); - run_program::run('mount', '-t', 'proc', 'none', "$::prefix/proc"); - run_program::run('makedev', "$::prefix/dev"); - - undef *install_any::setDefaultPackages; - *install_any::setDefaultPackages = sub {}; - - undef *install_any::getFile; - *install_any::getFile = sub { - my ($f, $o_method) = @_; - log::l("getFile $f:$o_method"); - open(my $F, '/export/' . install_any::relGetFile($f)) or return; - $F; - }; - - undef *c::kernel_version; - *c::kernel_version = sub { - #my @l = glob_('/export/Mandrake/RPMS/kernel-enterprise-2.6*'); - my @l = glob_('/export/media/main/kernel-2.6.*'); - @l >= 1 or die "can't find kernel"; - @l <= 1 or warn "too many kernels"; - first(`rpm -qp --qf '%{name}' $l[-1]` =~ /kernel-(.*)/); - }; - - my $kernel_version = c::kernel_version(); - # for third party drivers: - my $dkms_kernel_version = $kernel_version; - $dkms_kernel_version =~ s/\.(\d*mdk)$/-$1/; - - print "INSTALLING\n"; - install_any::setPackages(my $o = $::o = - bless { - prefix => $::prefix, - meta_class => 'desktop', - modules_conf => modules::modules_conf::read(modules::any_conf::vnew(), '/tmp/modules.conf'), - default_packages => [ - #- for screenshots: - qw(fb2png), - qw(xorg-x11-server xorg-x11-xfs xorg-x11-FBDev), - qw(openssh-server), #- fred wants it - qw(alsa-utils cdialog newt), - qw(k3b-dvd), - qw(davfs2 nfs-utils samba-server sane-backends xsane xsane-gimp ntp), - qw(acpi acpid), #- so that removing acpi=ht will work - qw(mountloop), #- crypted folders - #- doc: - (map { "mandrake-doc-$_" } map { ("Drakxtools-Guide-$_", "Command-Line-$_", "Quick-Startup-Plus-$_", "Starter-$_") } qw(de en es fr it)), - qw(autologin), - qw(synaptics), - #- network conf: - qw(wireless-tools pcmcia-cs), - #- zeroconf: - qw(zcip dhcpcd tmdns), - #- cnx stuff: - qw(dhcp-client ppp kdenetwork-kppp ppp-pppoatm ppp-pppoe pptp-linux pptp-adsl rp-pppoe), - "kernel-$kernel_version", - #- for older machines: - "kernel-i586-up-1GB-$kernel_version", - #- ISDN stuff: - # qw(isdn4net ibod isdn4k-utils), # not installed since it provides an interface (will be automatically installed by drakconnect) - #- network file sharing: - qw(nfs-utils-clients samba-client), - #- network drivers and firmwares: - qw(eagle-usb ipw2100-firmware ipw2200-firmware ndiswrapper speedtouch speedtouch_mgmt unicorn), - #- configuration: - qw(drakconf drakcronat drakfirsttime drakxtools harddrake-ui mdkonline rpmdrake userdrake), - qw(cups cups-drivers foomatic-db gimpprint hpoj libnet-snmp mtools mtoolsfm nmap printer-filters printer-testpages printer-utils scli xojpanel xpp), #- printer stuff - #qw(gcc), - "ati-kernel-$dkms_kernel_version", "nvidia-kernel-$dkms_kernel_version", qw(ati nvidia dkms patch dkms-ati dkms-nvidia libMesaGLU1), - # qw(hcfpcimodem hsflinmodem ltmodem), #- 2.4.x only - qw(xinput), #- for some mice - qw(bash-completion binutils emacs-X11 ntsysv perl-doc perl-Term-Readline-Gnu vim-enhanced openssh-clients lftp diffstat), #- allow debugging - qw(openssh-askpass-gnome), #- openssh-askpass for mountloop doesn't allow to click on ok/cancel buttons - qw(clanbomber freeciv-client freeciv-server crack-attack kdegames), #- more games - qw(numlock), # shorewall # not installed since its default config breaks network (will be automatically installed by drakfirewall) - qw(xawtv zapping kdetv), #- tv apps - #- locales: - qw(scim-hangul scim-m17n scim-tables scim-uim), #- Input Methods - (map { "locales-$_" } qw(af am ar as az be bg bn br bs ca cs cy da de el en eo es et eu fa fi fo fr fur fy ga gd gl gu gv he hi hr hu hy id ik is it iu ja ka kl km kn ko ku kw ky li lo lt lv mi mk ml mn mr ms mt nds ne nl no oc pa ph pl pt ro ru sc se sk sl sq sr st sv sw ta te tg th tk tr tt uk ur uz vi wa xh yi zh zu)), - (map { "kde-i18n-$_" } qw(af ar az be bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fo fr ga gl he hi hr hsb hu id is it ja ko ku lo lt lv mi mk mn ms mt nb nds nl nn nso oc pa pl pt pt_BR ro ru se sk sl sr ss sv ta tg th tr uk uz ven vi wa wen xh zh_CN.GB2312 zh_TW.Big5 zu)), - (map { "koffice-i18n-$_" } qw(af az bg br ca cs cy da de el en_GB eo es et fa fi fr he hsb hu it ja lo lt mt nb nl nn pl pt pt_BR ru se sk sl sr sv ta tg th tr uk ven xh zh_CN zh_TW zu)), - (map { "OpenOffice.org-l10n-$_" } qw(af ar ca cs cy da de el en es et eu fi fr he hu it ja ko nb nl nn ns pl pt pt_BR ru sk sl sv tr zh_CN zh_TW zu)), - #- for GNOME: - qw(gnome2), - qw(mozilla-firefox gnome-terminal), # QA request - (map { "mozilla-firefox-$_" } qw(af br ca cs da de devel el es fi fr ga he hu it ja ko nb nl pl pt pt_BR register ro ru sk sl sv tr zh_CN zh_TW)), - qw(dosfstools mtools), - qw(koffice konsole), - qw(udev dynamic harddrake hotplug mandrake-globetrotter netprofile), - qw(alsa-utils), - qw(mozilla-firefox), - #- plugins: - qw(acroread acroread-nppdf acroread-plugins FlashPlayer j2re RealPlayer RealPlayer-Codecs RealPlayer-rpnp), - qw(kdebase-nsplugins kdebase-kcontrol-nsplugins), - #- fonts: - qw(xorg-x11-100dpi-fonts xorg-x11-75dpi-fonts), - qw(fonts-bitmap-tscii fonts-hebrew-elmar), - (map { "fonts-ttf-$_" } qw(arabic armenian bengali big5 decoratives dejavu ethiopic gb2312 japanese kannada korean latex tamil thai tscii vera west_european)), - (map { "fonts-type1-$_" } qw(cyrillic greek hebrew)), - ], - }, 'install_any'); - - my %rpmsrate_flags_chosen = map { $_ => 1 } map { @{$_->{flags}} } @{$o->{compssUsers}}; - $rpmsrate_flags_chosen{$_} = 0 foreach qw(CAT_NETWORKING_MAIL_SERVER); - $rpmsrate_flags_chosen{$_} = 1 foreach qw(CAT_AUDIO CAT_KDE CAT_GNOME CAT_NETWORKING CAT_OFFICE CAT_SYSTEM CAT_MINIMAL_DOCS DVD USB SOUND BURNER UTF8 TV 3D INSTALL); - $rpmsrate_flags_chosen{qq(LOCALES"$_")} = 1 foreach lang::langsLANGUAGE({ all => 1 }); - pkgs::setSelectedFromCompssList($o->{packages}, \%rpmsrate_flags_chosen, 4, 0); - - my $unselect = sub { - my ($pkg) = @_; - my $p = pkgs::packageByName($o->{packages}, $pkg); - pkgs::unselectPackage($o->{packages}, $p) if $p; - }; - - $unselect->("kernel-smp-$kernel_version"); - - # unselect some packages whose services fsck up the box and whose services are not enabled by appropriate tools: - # (shorewall must be deselected before iptables is) - $unselect->($_) foreach qw(at hpoj shorewall iptables ntp tmdns zcip ); - - # unselect uim since uim IM break first time wizard when selecting english: - #$unselect->($_) foreach qw(uim-applet uim libuim0); - - my @toInstall = pkgs::packagesToInstall($o->{packages}); - local $ENV{DURING_INSTALL} = 1; - $ENV{LD_LIBRARY_PATH} = "/lib:/usr/lib:/usr/X11R6/lib:/usr/lib/qt3/lib"; - pkgs::install(0, \@toInstall, $o->{packages}); - - eval { fs::mount::umount("$::prefix/proc") }; -} - -sub config_X_proprietary_drivers() { - unlink "$::prefix/usr/lib/libGL.so"; - - my %name_to_Driver = (NVIDIA_GLX => 'nvidia', ATI_GLX => 'fglrx'); - - my $lib = 'libGL.so.1'; - symlinkf("/etc/X11/$lib", "$::prefix/usr/lib/$lib"); - foreach (keys %name_to_Driver) { - my ($full_name) = run_program::rooted_get_stdout($::prefix, 'rpm', '-ql', $_) =~ m!/usr/lib/(\Q$lib\E\..*)! or die ''; - symlinkf($full_name, "$::prefix/usr/lib/$lib.$name_to_Driver{$_}"); - } - #- remove the dirty hack done by NVIDIA_kernel-xxx proprietary package - #- we do it by hand when needed - substInFile { $_ = '' if $_ eq 'nvidia' } "$::prefix/etc/modules"; -} - -my $fstab; - -my $cleaner = before_leaving { - if (my $err = $@) { - print "\n>> an error happened: $err\n"; - } - print "Cleaning on exiting\n"; - print "- Umounting partitions:\n"; - print "\tumounting /proc\n"; - eval { fs::mount::umount("$::prefix/proc") }; - # fs::umount("$::prefix/$_") foreach 'mnt/packages', 'mnt/share', 'home', ''; - if ($fstab) { - print "\tumounting everything else\n"; - eval { fs::mount::umount_all($fstab) } or system("umount $::prefix"); - } - print "\tumounting /tmp\n"; - eval { fs::mount::umount("/tmp") } if $rescue; - print "Cleaning done\n"; -}; - - -$::prefix = $ARGV[0] || '/tmp/live_tree'; - - -#=========================================================================== -# Building the disk: --d $::prefix or mkdir $::prefix; -print "Making live in $::prefix directory.\n"; - - -my ($all_hds, $hd, $other) = do { - # here we want testing so that diskdrake still set mount points in data structure: - local $::testing = !$options{partition}; - prepare_disk(); -}; - -formatdisk($hd) if $options{format}; - -add2hash($hd, $other); - -undef $::testing; - -my @parts = partition_table::get_normal_parts($hd); - -my ($root) = grep { $_->{mntpoint} eq "/" } @parts; -print "Root is $root->{device}\n"; -run_program::run('tune2fs', '-L', "MDK-ROOT", "/dev/$root->{device}"); -# fs::mount_part($root, $::prefix); -$fstab = [ fs::get::fstab($all_hds) ]; - -# we need to mount every fs we want to see into /etc/fstab !!! -fs::mount::part($_) foreach sort { $a->{mntpoint} cmp $b->{mntpoint} } @$fstab; - -symlink("$::prefix/mnt/packages", "/export") if $rescue; - -eval { - print "Installing packages\n"; - installPackages(); -} if $options{install}; -print "ERROR WHILE INSTALLING PACKAGES: $@\n" if $@; -log::closeLog; - -sub doRootSubst { - my ($file) = @_; - substInFile { - s!/dev/$root->{device}!LABEL=MDK-ROOT!g; - } $file; -} - -#fs::merge_info_from_mtab($fstab); -fs::write_fstab($all_hds, $::prefix); -append_to_file("$::prefix/etc/fstab", - "none /dev/pts devpts mode=0620 0 0\n", - "none /proc proc defaults 0 0\n"); -doRootSubst("$::prefix/etc/fstab"); - -my ($home) = grep { $_->{mntpoint} eq "/home" } @parts; -my ($mnt_pkgs) = grep { $_->{mntpoint} eq "/mnt/packages" } @parts; -run_program::run('tune2fs', '-L', "MDK-HOME", "/dev/$home->{device}") if $home; -run_program::run('tune2fs', '-L', "MDK-PKGS", "/dev/$mnt_pkgs->{device}") if $mnt_pkgs; - -substInFile { - s!defaults\s!defaults,ro ! if m!/mnt/packages!; - s!defaults\s!defaults,umask=0000 ! if m!/mnt/share!; - s!/dev/$home->{device}!LABEL=MDK-HOME!g; - s!/dev/$mnt_pkgs->{device}!LABEL=MDK-PKGS!g; -} "$::prefix/etc/fstab"; - - -#------------------------------------------------------------------- -#- Bootloader -print "Configuring bootloader\n"; -system("modprobe loop"); -require keyboard; -require bootloader; - -my $bootloader = { - keytable => keyboard::keyboard2kmap(keyboard::lang2keyboard('fr')), - bios => { '/dev/sda' => '0x80' }, - }; - -bootloader::suggest($bootloader, $all_hds, - vga_fb => 788, - quiet => 1); - -$bootloader->{method} = 'lilo-graphic'; - -eval { bootloader::install($bootloader, $all_hds) }; - -doRootSubst("$::prefix/etc/lilo.conf"); - -# fix LILO configuration: -substInFile { - s!root=(LABEL=MDK-ROOT)!root="\1"!g; -} "$::prefix/etc/lilo.conf"; - -run_program::rooted($::prefix, 'lilo'); - -## disable ISDN by default (bogus isdn4net came with an enabled interface :-(): -#substInFile { -# s/#ONBOOT.*/ONBOOT="no"/ -#} "$::prefix/etc/sysconfig/network-scripts/ifcfg-ippp0"; -# - -print "Post install misc configuration\n"; - - -# clean services: -# cups-lpd ibod isdn4linux isdnlog)) { -run_program::rooted($::prefix, '/sbin/chkconfig', '--del', $_) foreach qw(acon jserver oki4daemon); -#foreach my $service (qw(acon atd cups-lpd hpoj ibod iptables isdn4linux isdnlog jserver ntpd oki4daemon shorewall tmdns)) { -# run_program::rooted($::prefix, '/sbin/chkconfig', '--level', $_, $service, 'off') foreach qw(3 5); -#} - -# probably useless: -foreach my $service (qw(alsa dm harddrake hotplug sound)) { - run_program::rooted($::prefix, '/sbin/chkconfig', '--level', $_, $service, 'on') foreach qw(3 5); -} - -if ($options{post}) { - #------------------------------------------------------------------- - # save a few more files in profiles - my $prof_cfg = "$::prefix/etc/netprofile/list"; - my @files = map { chomp_($_) } cat_($prof_cfg); - # do not save the whole /etc/sysconfig; - push @files, (map { "/etc/X11/$_" } qw(XF86Config XF86Config-4 xorg.conf)), - (map { "/etc/sysconfig/$_" } qw(keyboard harddrake2/previous_hw harddisks)), - (map { "/etc/$_" } qw(modprobe.conf modprobe.preload modules modules.conf)), - qw(/etc/asound.state /etc/fstab /etc/ld.so.conf/GL.conf /etc/shorewall/); - - output($prof_cfg, join("\n", sort @files)); - - - #------------------------------------------------------------------- - #- regenerate library loader and fonts cache - run_program::rooted($::prefix, 'ldconfig'); - any::fix_broken_alternatives(); - run_program::rooted($::prefix, 'fc-cache'); #- generate cache in all directories mentioned in config file - - #- XFree - - touch("$::prefix/etc/menu/enable_simplified"); - - { - local $ENV{LC_ALL} = 'en_US'; #- update-menus doesn't work when there is no locale (aka locale "C") - #local $ENV{HOME} = '/'; #- savekdemimetypes.pl needs this otherwise it's tmp file fails - run_program::rooted($::prefix, 'update-menus', '-n'); - } - - run_program::rooted($::prefix, 'nspluginscan'); #- must be run before kbuildsycoca for the ksycoca to be flash plugin aware - - $ENV{HELP_BROWSER} = "kfmclient openProfile webbrowsing"; - $ENV{BROWSER} = "kfmclient openProfile webbrowsing"; - $ENV{DESKTOP} = "kde"; - #- faster boot: - foreach my $lang (lang::list_langs()) { - local $ENV{LC_ALL} = lang::getLANGUAGE($lang); - unlink "$::prefix/usr/share/services/ksycoca"; - run_program::rooted($::prefix, 'kbuildsycoca', '--global'); - rename("$::prefix/usr/share/services/ksycoca", "$::prefix/usr/share/services/ksycoca-$lang"); - } - symlinkf('/etc/X11/ksycoca', "$::prefix/usr/share/services/ksycoca"); -} - -# clean gconftool-2 mess: -unlink $_ foreach glob("$::prefix/core.*"); - - -##- Mandrake -#substInFile { -# s!Mandrake(l| L)inux release (\S+) \(.*\)!Mandrakelinux Nomad, powered by LaCie Mobile Hard Drive)!; -#} "$::prefix/etc/mandrake-release"; -# - - -system("rsync -rvltp /export/ $::prefix/mnt/packages/") if !$rescue; -if ($rescue) { - foreach (glob("$::prefix/home/*/")) { - next if /lost\+found/; - my (undef, undef, undef, undef, $uid) = stat($_); - my $name = $_; - $name =~ s!/$!!; - $name =~ s!.*/!!; - run_program::rooted($::prefix, "adduser", "-u", $uid, "$name"); - } -} - -unlink $_ foreach glob("$::prefix/var/lib/urpmi/*"); -run_program::rooted($::prefix, 'urpmi.addmedia', '--probe-hdlist', $_, "/mnt/packages/media/$_/") foreach qw(main contrib firmwares dkms modules plugins); - -# for fast test replaying: -run_program::rooted($::prefix, 'tar', 'cfj', '/root/etc.tar.bz2', '/etc'); - -my_exit($rescue ? "Your disk was succesfully restored!\nYou can now reboot your machine." : "Installation completed."); diff --git a/globetrotter/mandrake-globetrotter.spec b/globetrotter/mandrake-globetrotter.spec deleted file mode 100644 index 4bb3a8ac9..000000000 --- a/globetrotter/mandrake-globetrotter.spec +++ /dev/null @@ -1,45 +0,0 @@ -Summary: Mandrakelinux Globetrotter tools -Name: mandrake-globetrotter -Version: 10 -Release: 1mdk -Url: http://www.mandrakelinux.com/en/drakx.php3 -Source0: %name-%version.tar.bz2 -License: GPL -Group: System/Configuration/Other -Requires: drakxtools netprofile -BuildRoot: %_tmppath/%name-buildroot - - -%description -Contains many Mandrakelinux tools needed for Mandrakelinux Globetrotter. - -%prep -%setup -q - -%build -%make - -%install -rm -rf $RPM_BUILD_ROOT - -mkdir -p $RPM_BUILD_ROOT/{%_initrddir,%_datadir/harddrake} -%makeinstall_std PREFIX=$RPM_BUILD_ROOT -install -m 755 hwprofile $RPM_BUILD_ROOT/%_datadir/harddrake/hwprofile - -%find_lang libDrakX2 - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -f libDrakX2.lang -%defattr(-,root,root) -%_datadir/harddrake/* -%_sbindir/* -/usr/lib/libDrakX/*pm -/usr/share/libDrakX/pixmaps/lang* - -%changelog -* Wed Apr 28 2004 Thierry Vignaud <tvignaud@mandrakesoft.com> 10-1mdk -- initial release diff --git a/globetrotter/move.pm b/globetrotter/move.pm deleted file mode 100644 index 9c3ae7226..000000000 --- a/globetrotter/move.pm +++ /dev/null @@ -1,175 +0,0 @@ -package move; # $Id$ - -#- Copyright (c) 2004-2005 Mandriva -#- -#- This program is free software; you can redistribute it and/or modify -#- it under the terms of the GNU General Public License as published by -#- the Free Software Foundation; either version 2, or (at your option) -#- any later version. -#- -#- This program is distributed in the hope that it will be useful, -#- but WITHOUT ANY WARRANTY; without even the implied warranty of -#- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -#- GNU General Public License for more details. -#- -#- You should have received a copy of the GNU General Public License -#- along with this program; if not, write to the Free Software -#- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -use diagnostics; -use strict; - -use c; -use common; -use modules; -use fs; -use fsedit; -use run_program; -use partition_table qw(:types); -use log; -use lang; -use detect_devices; - -sub symlinkf_short { - my ($dest, $file) = @_; - if (my $l = readlink $dest) { - $dest = $l if $l =~ m!^/!; - } - -d $file and log::l("$file already exists and is a directory! writing in directory may be needed, not overwriting"), return; - symlinkf($dest, $file); -} - -#- run very soon at stage2 start, setup things on tmpfs rw / that -#- were not necessary to start stage2 itself (there were setup -#- by stage1 of course) -sub init { - my ($o) = @_; - - check_for_xserver() and c::bind_textdomain_codeset('libDrakX2', 'UTF8'); - - - -d '/lib/modules/' . c::kernel_version() or warn("ERROR: kernel package " . c::kernel_version() . " not installed\n"), c::_exit(1); - - modules::load_category('bus/usb'); - *c::pcmcia_probe = \&detect_devices::pcmcia_probe; - $o->{pcmcia} ||= !$::noauto && c::pcmcia_probe(); - install_steps::setupSCSI($o); - -drakx_stuff: - $o->{steps}{$_} = { reachable => 1, text => $_ } - foreach qw(autoSelectLanguage configMove selectMouse setRootPassword addUser configureNetwork miscellaneous selectMouse); - $o->{orderedSteps_orig} = $o->{orderedSteps}; - $o->{orderedSteps} = [ qw(selectLanguage acceptLicense selectMouse setupSCSI miscellaneous selectKeyboard setRootPassword addUser configureNetwork configMove ) ]; - $o->{steps}{first} = $o->{orderedSteps}[0]; -} - - - - -sub enable_service { - run_program::run('/sbin/chkconfig', '--level', 5, $_[0], 'on'); -} - -sub disable_service { - run_program::run('/sbin/chkconfig', '--del', $_[0], 'on'); -} - -sub install2::configMove { - my $o = $::o; - - security::level::set($o->{security}); - - require install_steps; - install_steps::addUser($o); # for test, when replaying wizard on an already configured machine - while ($#{$o->{users}} eq -1) { - install_steps::addUser($o); - } - - $::noauto and goto after_autoconf; - - my $_wait = $o->wait_message(N("Auto configuration"), N("Please wait, detecting and configuring devices...")); - - #- automatic printer, timezone, network configs - require install_steps_interactive; - if (cat_('/proc/mounts') !~ /nfs/) { - install_steps_interactive::configureNetwork($o); - enable_service('network'); - } - enable_service('netfs'); - install_steps_interactive::summaryBefore($o); - - modules::load_category('multimedia/sound'); - enable_service('sound'); - - detect_devices::isLaptop() or enable_service('numlock'); - -after_autoconf: - require timezone; - timezone::write($o->{timezone}); - - $o->{useSupermount} = 1; - fs::set_removable_mntpoints($o->{all_hds}); - require fs::mount_options; - fs::mount_options::set_all_default($o->{all_hds}, %$o, lang::fs_options($o->{locale})); - - $o->{modules_conf}->write; - require mouse; - mouse::write_conf($o, $o->{mouse}, 1); #- write xfree mouse conf - detect_devices::install_addons(''); - - foreach my $step (@{$o->{orderedSteps_orig}}) { - next if member($step, @{$o->{orderedSteps}}); - while (my $f = shift @{$o->{steps}{$step}{toBeDone} || []}) { - log::l("doing remaining toBeDone for undone step $step"); - eval { &$f() }; - $o->ask_warn(N("Error"), [ -N("An error occurred, but I don't know how to handle it nicely. -Continue at your own risk."). formatError($@) || $@ ]) if $@; - } - } - run_program::run('killall', 'Xorg'); - output_p("$::prefix/etc/rpm/macros", "%_install_langs all\n"); - # workaround init reading inittab before any.pm alters it: - if ($::o->{autologin}) { - run_program::run('chkconfig', 'dm', 'on'); - run_program::run('telinit', 'Q'); - } - # prevent dm service to fail to startup because of /tmp/.font-unix's permissions: - run_program::run('service', 'xfs', 'stop'); - c::_exit(0); -} - - - -sub automatic_xconf { - my ($o) = @_; - - log::l('automatic XFree configuration'); - - any::devfssymlinkf($o->{mouse}, 'mouse'); - local $o->{mouse}{device} = 'mouse'; - - require Xconfig::default; - require class_discard; - $o->{raw_X} = Xconfig::default::configure(class_discard->new, { KEYBOARD => 'uk' }, $o->{mouse}); #- using uk instead of us for now to have less warnings - - require Xconfig::main; - Xconfig::main::configure_everything_auto_install($o->{raw_X}, class_discard->new, {}, - { allowNVIDIA_rpms => sub { [] }, allowATI_rpms => sub { [] }, allowFB => $o->{allowFB} }); - - modules::load_category('various/agpgart'); - - my $file = '/etc/X11/XF86Config'; - $file = "$file-4" if -e "$file-4"; - my ($Driver) = cat_($file) =~ /Section "Device".*Driver\s*"(.*?)"/s; - if ($Driver eq 'nvidia') { - modules::load('nvidia'); - } - my $lib = 'libGL.so.1'; - symlinkf_short(-e "/usr/lib/$lib.$Driver" ? "/usr/lib/$lib.$Driver" : "/usr/X11R6/lib/$lib", "/etc/X11/$lib"); -} - -sub handleI18NClp {} - - -1; diff --git a/globetrotter/runstage2 b/globetrotter/runstage2 deleted file mode 100755 index 26d10d4fa..000000000 --- a/globetrotter/runstage2 +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/perl - -#- Copyright (c) 2004 Mandrakesoft -#- -#- This program is free software; you can redistribute it and/or modify -#- it under the terms of the GNU General Public License as published by -#- the Free Software Foundation; either version 2, or (at your option) -#- any later version. -#- -#- This program is distributed in the hope that it will be useful, -#- but WITHOUT ANY WARRANTY; without even the implied warranty of -#- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -#- GNU General Public License for more details. -#- -#- You should have received a copy of the GNU General Public License -#- along with this program; if not, write to the Free Software -#- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# i18n: IMPORTANT: to get correct namespace (libDrakX2 instead of libDrakX) -BEGIN { unshift @::textdomains, 'libDrakX2' } -c::bind_textdomain_codeset($_, 'UTF8') foreach 'libDrakX', @::textdomains; - -use lib qw(../perl-install /usr/lib/libDrakX); -use standalone; -use install2; - -#$::isStandalone = 0; -install2::main(@ARGV, '--globetrotter'); - -c::_exit(0); diff --git a/images/Makefile b/images/Makefile index cfdaa2141..850b7b83b 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=1.49 +VERSION=1.50 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/2.*) diff --git a/images/NEWS b/images/NEWS index 83db55501..3e05a6080 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,7 @@ +Version 1.50 - 13 Oct 2010, by Thierry Vignaud + +- 2011.0 build + Version 1.49 - 27 May 2010, by Olivier Blin - disable restore option diff --git a/images/help.msg.xml b/images/help.msg.xml index e6d715830..358dcf248 100644 --- a/images/help.msg.xml +++ b/images/help.msg.xml @@ -1,5 +1,5 @@ <document> - <green>Welcome to <blue>Mandriva Linux</blue> install help</green> + <green>Welcome to <blue>Mageia</blue> install help</green> In most cases, the best way to get started is to simply press the <yellow><Enter></yellow> key. If you experience problems with standard install, try one of the following diff --git a/images/make_boot_img b/images/make_boot_img index 2d70e6483..81b2d6429 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -452,9 +452,9 @@ To Build a Bootable CD-ROM, try: -f "$type.rdz" ? _ "cp -f $type.rdz $dir" : initrd($type, $I, "$dir/$type.rdz"); output("$dir/boot.msg", " -Welcome to Mandriva Linux 7.1 +Welcome to Mageia 1 -Press <Enter> to install or upgrade a system 7mMandriva Linux7m +Press <Enter> to install or upgrade a system 7mMageia7m "); output("$dir/silo.conf", qq( @@ -501,7 +501,7 @@ sub boot_img_ppc { MacRISC </COMPATIBLE> <DESCRIPTION> -Mandriva Linux PPC bootloader +Mageia PPC bootloader </DESCRIPTION> <BOOT-SCRIPT> " screen" output @@ -513,7 +513,7 @@ device-end 3 to foreground-color 0 to background-color " "(0C)" fb8-write drop -" Booting Mandriva Linux PPC..." fb8-write drop 100 ms +" Booting Mageia PPC..." fb8-write drop 100 ms boot cd:,\boot\yaboot </BOOT-SCRIPT> <OS-BADGE-ICONS> @@ -571,7 +571,7 @@ boot cd:,\boot\yaboot '); output("images/yaboot.conf", ' -init-message = "\nWelcome to Mandriva Linux PPC!\nHit <TAB> for boot options.\n\n" +init-message = "\nWelcome to Mageia PPC!\nHit <TAB> for boot options.\n\n" timeout = 150 device=cd: default = install-gui @@ -663,7 +663,7 @@ image = enet:0,vmlinux-power4 '); output("images/yaboot.msg", ' -Thanks for choosing Mandriva Linux PPC. The following is a short +Thanks for choosing Mageia PPC. The following is a short explanation of the various options for booting the install CD. All options ending with "-power4" use the BOOT kernel for ppc 9xx and POWER4. @@ -700,7 +700,7 @@ sub syslinux_all_files { @$kernels or die "syslinux_all_files: no kernel\n"; $default_vga =~ /788/ or die 'we rely on vga=788 for bootsplash'; - my $theme = $ENV{THEME} || 'Mandriva-Free'; + my $theme = $ENV{THEME} || 'Mageia-Free'; each_index { mkdir "$dir/alt$::i", 0777; @@ -758,14 +758,14 @@ sub boot_iso { _ "cp /usr/lib/syslinux/isolinux.bin .boot_iso/isolinux/isolinux.bin"; my $with_gfxboot = 0; - _ "cp /usr/share/gfxboot/themes/Mandriva/install/* .boot_iso/isolinux" if $with_gfxboot; + _ "cp /usr/share/gfxboot/themes/Mageia/install/* .boot_iso/isolinux" if $with_gfxboot; # _ "cp /home/pixel/cooker/soft/theme/mandriva-gfxboot-theme/inst/* .boot_iso/isolinux" if $with_gfxboot; #_ "cp /home/teuf/mdv/src/mandriva-gfxboot-theme/inst/* .boot_iso/isolinux" if $with_gfxboot; _ "cp /usr/lib/syslinux/gfxboot.com .boot_iso/isolinux/gfxboot.com" if $with_gfxboot; output('.boot_iso/isolinux/isolinux.cfg', syslinux_cfg_all('', $with_gfxboot)); - _ "genisoimage -r -f -J -cache-inodes -V 'Mdv Boot ISO' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o $iso .boot_iso"; + _ "genisoimage -r -f -J -cache-inodes -V 'Mga Boot ISO' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o $iso .boot_iso"; rm_rf('.boot_iso'); } @@ -787,7 +787,7 @@ timeout 10 default 0 fallback 1 -title Mandriva Linux Install +title Mageia Install root (hd0,0) kernel /cooker/isolinux/alt0/vmlinuz $default_append $default_acpi $default_vga automatic=method:disk @@ -799,13 +799,13 @@ pause To display the help, press <space> until you reach "HELP END" pause . pause Please see http://qa.mandriva.com/hd_grub.cgi for a friendlier solution pause . -pause To specify the location where Mandriva Linux is copied, -pause choose "Mandriva Linux Install", and press "e". +pause To specify the location where Mageia is copied, +pause choose "Mageia Install", and press "e". pause Then change "root (hd0,0)". FYI: pause - (hd0,0) is the first partition on first bios hard drive (usually hda1) pause - (hd0,4) is the first extended partition (usually hda5) pause - (hd1,0) is the first partition on second bios hard drive -pause Replace /cooker to suits the directory containing Mandriva Linux +pause Replace /cauldron to suit the directory containing Mageia pause . pause HELP END EOF diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm index 603c2d880..afc2d64c5 100644 --- a/kernel/list_modules.pm +++ b/kernel/list_modules.pm @@ -1,4 +1,4 @@ -package list_modules; # $Id$ +package list_modules; # $Id: list_modules.pm 268192 2010-05-04 09:37:32Z pterjan $ use MDK::Common; diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 34efc42dc..71a0332e4 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -2,7 +2,7 @@ # # mdk-stage1 - the program that will load second-stage install # - # $Id$ + # $Id: Makefile 271082 2010-10-13 18:55:00Z tv $ # # Pixel (pixel@mandriva.com) (mostly done by Guillaume Cottenceau) # @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -VERSION=1.46 +VERSION=1.47 PRODUCT=drakx-installer-binaries # diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index 137dabe04..2dfc7ac64 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,6 @@ +1.47: +- 2011.0 build + 1.46: - create device listed in /proc/partitions with correct major/minor (#57032) diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c index a74a703d2..8130b422b 100644 --- a/mdk-stage1/init.c +++ b/mdk-stage1/init.c @@ -219,25 +219,6 @@ void doklog() } } - /* examine some fd's in the hope to find some syslog outputs from programs */ - for (readfd = 0; readfd < 20; ++readfd) { - if (FD_ISSET(readfd, &readset) && FD_ISSET(readfd, &unixs)) { - i = read(readfd, buf, sizeof(buf)); - if (i > 0) { - /* grep out the output of RPM telling that it installed/removed some packages */ - if (!strstr(buf, "mdk installed") && !strstr(buf, "mdk removed")) { - if (out >= 0) - write(out, buf, i); - write(log, buf, i); - } - } else if (i == 0) { - /* socket closed */ - close(readfd); - FD_CLR(readfd, &unixs); - } - } - } - /* the socket has moved, new stuff to do */ if (sock >= 0 && FD_ISSET(sock, &readset)) { s = sizeof(sockaddr); diff --git a/mdk-stage1/pci-resource/Makefile b/mdk-stage1/pci-resource/Makefile index 24cfc7dd0..b29c30203 100644 --- a/mdk-stage1/pci-resource/Makefile +++ b/mdk-stage1/pci-resource/Makefile @@ -1,6 +1,6 @@ #****************************************************************************** # - # $Id$ + # $Id: Makefile 253685 2009-03-06 14:27:29Z tv $ # # Guillaume Cottenceau (gc@mandriva.com) # diff --git a/mdk-stage1/ppp/PLUGINS b/mdk-stage1/ppp/PLUGINS index 0eeabe249..5f17e1d0a 100644 --- a/mdk-stage1/ppp/PLUGINS +++ b/mdk-stage1/ppp/PLUGINS @@ -128,4 +128,4 @@ set *popts to a wordlist containing any extra options for this user which pppd should apply at this point. -## $Id$ ## +## $Id: PLUGINS 195720 2001-06-11 11:44:34Z gc $ ## diff --git a/mdk-stage1/ppp/README b/mdk-stage1/ppp/README index aa1e5f9c2..0967fc92a 100644 --- a/mdk-stage1/ppp/README +++ b/mdk-stage1/ppp/README @@ -165,4 +165,4 @@ The primary site for releases of this software is: ftp://linuxcare.com.au/pub/ppp/ -($Id$) +($Id: README 195720 2001-06-11 11:44:34Z gc $) diff --git a/mdk-stage1/ppp/chat/Makefile.linux b/mdk-stage1/ppp/chat/Makefile.linux index 586cbd876..a7045522c 100644 --- a/mdk-stage1/ppp/chat/Makefile.linux +++ b/mdk-stage1/ppp/chat/Makefile.linux @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile.linux 195720 2001-06-11 11:44:34Z gc $ CDEF1= -DTERMIOS # Use the termios structure CDEF2= -DSIGTYPE=void # Standard definition diff --git a/mdk-stage1/ppp/chat/Makefile.linux.makeopt b/mdk-stage1/ppp/chat/Makefile.linux.makeopt index 974680a93..32f4e71ac 100644 --- a/mdk-stage1/ppp/chat/Makefile.linux.makeopt +++ b/mdk-stage1/ppp/chat/Makefile.linux.makeopt @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile.linux.makeopt 195720 2001-06-11 11:44:34Z gc $ CDEF1= -DTERMIOS # Use the termios structure CDEF2= -DSIGTYPE=void # Standard definition diff --git a/mdk-stage1/ppp/chat/chat.8 b/mdk-stage1/ppp/chat/chat.8 index 8d2029609..dc3889cfc 100644 --- a/mdk-stage1/ppp/chat/chat.8 +++ b/mdk-stage1/ppp/chat/chat.8 @@ -1,6 +1,6 @@ .\" -*- nroff -*- .\" manual page [] for chat 1.8 -.\" $Id$ +.\" $Id: chat.8 195720 2001-06-11 11:44:34Z gc $ .\" SH section heading .\" SS subsection heading .\" LP paragraph diff --git a/mdk-stage1/ppp/chat/chat.c b/mdk-stage1/ppp/chat/chat.c index 1b22907a8..6c4a8487b 100644 --- a/mdk-stage1/ppp/chat/chat.c +++ b/mdk-stage1/ppp/chat/chat.c @@ -87,7 +87,7 @@ #endif #ifndef lint -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: chat.c 195720 2001-06-11 11:44:34Z gc $"; #endif #include <stdio.h> diff --git a/mdk-stage1/ppp/common/zlib.c b/mdk-stage1/ppp/common/zlib.c index 503076886..f4d2cc266 100644 --- a/mdk-stage1/ppp/common/zlib.c +++ b/mdk-stage1/ppp/common/zlib.c @@ -10,7 +10,7 @@ * - added inflateIncomp and deflateOutputPending * - allow strm->next_out to be NULL, meaning discard the output * - * $Id$ + * $Id: zlib.c 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/common/zlib.h b/mdk-stage1/ppp/common/zlib.h index 188ddaff9..936851f8f 100644 --- a/mdk-stage1/ppp/common/zlib.h +++ b/mdk-stage1/ppp/common/zlib.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: zlib.h 195720 2001-06-11 11:44:34Z gc $ */ /* * This file is derived from zlib.h and zconf.h from the zlib-1.0.4 diff --git a/mdk-stage1/ppp/configure b/mdk-stage1/ppp/configure index 544fb0d71..2e3b3b291 100755 --- a/mdk-stage1/ppp/configure +++ b/mdk-stage1/ppp/configure @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# $Id: configure 195720 2001-06-11 11:44:34Z gc $ # if [ -d /NextApps ]; then # system="NeXTStep" diff --git a/mdk-stage1/ppp/contrib/pppgetpass/pppgetpass.sh b/mdk-stage1/ppp/contrib/pppgetpass/pppgetpass.sh index 09c480519..09c480519 100644..100755 --- a/mdk-stage1/ppp/contrib/pppgetpass/pppgetpass.sh +++ b/mdk-stage1/ppp/contrib/pppgetpass/pppgetpass.sh diff --git a/mdk-stage1/ppp/include/linux/if_ppp.h b/mdk-stage1/ppp/include/linux/if_ppp.h index 1febf0931..f794da06a 100644 --- a/mdk-stage1/ppp/include/linux/if_ppp.h +++ b/mdk-stage1/ppp/include/linux/if_ppp.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: if_ppp.h 195720 2001-06-11 11:44:34Z gc $ */ /* * if_ppp.h - Point-to-Point Protocol definitions. diff --git a/mdk-stage1/ppp/include/linux/ppp-comp.h b/mdk-stage1/ppp/include/linux/ppp-comp.h index 3184d0731..a116be0cf 100644 --- a/mdk-stage1/ppp/include/linux/ppp-comp.h +++ b/mdk-stage1/ppp/include/linux/ppp-comp.h @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: ppp-comp.h 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/include/linux/ppp_defs.h b/mdk-stage1/ppp/include/linux/ppp_defs.h index 46946fbdc..4e737b40f 100644 --- a/mdk-stage1/ppp/include/linux/ppp_defs.h +++ b/mdk-stage1/ppp/include/linux/ppp_defs.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: ppp_defs.h 195720 2001-06-11 11:44:34Z gc $ */ /* * ppp_defs.h - PPP definitions. diff --git a/mdk-stage1/ppp/include/net/if_ppp.h b/mdk-stage1/ppp/include/net/if_ppp.h index 1527ecf3f..c64484e84 100644 --- a/mdk-stage1/ppp/include/net/if_ppp.h +++ b/mdk-stage1/ppp/include/net/if_ppp.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: if_ppp.h 195720 2001-06-11 11:44:34Z gc $ */ /* * if_ppp.h - Point-to-Point Protocol definitions. diff --git a/mdk-stage1/ppp/include/net/ppp-comp.h b/mdk-stage1/ppp/include/net/ppp-comp.h index 0e6a9c672..30b0def68 100644 --- a/mdk-stage1/ppp/include/net/ppp-comp.h +++ b/mdk-stage1/ppp/include/net/ppp-comp.h @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: ppp-comp.h 195720 2001-06-11 11:44:34Z gc $ */ #ifndef _NET_PPP_COMP_H diff --git a/mdk-stage1/ppp/include/net/ppp_defs.h b/mdk-stage1/ppp/include/net/ppp_defs.h index 46bef52bb..ecd0528ec 100644 --- a/mdk-stage1/ppp/include/net/ppp_defs.h +++ b/mdk-stage1/ppp/include/net/ppp_defs.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: ppp_defs.h 203043 2003-06-04 18:31:57Z gbeauchesne $ */ /* * ppp_defs.h - PPP definitions. diff --git a/mdk-stage1/ppp/include/net/pppio.h b/mdk-stage1/ppp/include/net/pppio.h index 9db1ca9ab..e327db3ce 100644 --- a/mdk-stage1/ppp/include/net/pppio.h +++ b/mdk-stage1/ppp/include/net/pppio.h @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: pppio.h 195720 2001-06-11 11:44:34Z gc $ */ #define _PPPIO(n) (('p' << 8) + (n)) diff --git a/mdk-stage1/ppp/include/net/slcompress.h b/mdk-stage1/ppp/include/net/slcompress.h index 9e19bc0ed..d7b7dc4ee 100644 --- a/mdk-stage1/ppp/include/net/slcompress.h +++ b/mdk-stage1/ppp/include/net/slcompress.h @@ -1,7 +1,7 @@ /* * Definitions for tcp compression routines. * - * $Id$ + * $Id: slcompress.h 195720 2001-06-11 11:44:34Z gc $ * * Copyright (c) 1989 Regents of the University of California. * All rights reserved. diff --git a/mdk-stage1/ppp/include/net/vjcompress.h b/mdk-stage1/ppp/include/net/vjcompress.h index c64596926..0ff6d3943 100644 --- a/mdk-stage1/ppp/include/net/vjcompress.h +++ b/mdk-stage1/ppp/include/net/vjcompress.h @@ -1,7 +1,7 @@ /* * Definitions for tcp compression routines. * - * $Id$ + * $Id: vjcompress.h 195720 2001-06-11 11:44:34Z gc $ * * Copyright (c) 1989 Regents of the University of California. * All rights reserved. diff --git a/mdk-stage1/ppp/modules/bsd-comp.c b/mdk-stage1/ppp/modules/bsd-comp.c index b1b9325c7..bbc8625db 100644 --- a/mdk-stage1/ppp/modules/bsd-comp.c +++ b/mdk-stage1/ppp/modules/bsd-comp.c @@ -41,7 +41,7 @@ * This version is for use with STREAMS under SunOS 4.x, * Digital UNIX, AIX 4.x, and SVR4 systems including Solaris 2. * - * $Id$ + * $Id: bsd-comp.c 195720 2001-06-11 11:44:34Z gc $ */ #ifdef AIX4 diff --git a/mdk-stage1/ppp/modules/deflate.c b/mdk-stage1/ppp/modules/deflate.c index 1b9054412..592344f9b 100644 --- a/mdk-stage1/ppp/modules/deflate.c +++ b/mdk-stage1/ppp/modules/deflate.c @@ -27,7 +27,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: deflate.c 195720 2001-06-11 11:44:34Z gc $ */ #ifdef AIX4 diff --git a/mdk-stage1/ppp/modules/if_ppp.c b/mdk-stage1/ppp/modules/if_ppp.c index 14e89eb4a..9792708d1 100644 --- a/mdk-stage1/ppp/modules/if_ppp.c +++ b/mdk-stage1/ppp/modules/if_ppp.c @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: if_ppp.c 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/modules/ppp.c b/mdk-stage1/ppp/modules/ppp.c index 44bf08dff..f6d8c93df 100644 --- a/mdk-stage1/ppp/modules/ppp.c +++ b/mdk-stage1/ppp/modules/ppp.c @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: ppp.c 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/modules/ppp_ahdlc.c b/mdk-stage1/ppp/modules/ppp_ahdlc.c index d0b961258..e3c4baa28 100644 --- a/mdk-stage1/ppp/modules/ppp_ahdlc.c +++ b/mdk-stage1/ppp/modules/ppp_ahdlc.c @@ -41,7 +41,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: ppp_ahdlc.c 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/modules/ppp_comp.c b/mdk-stage1/ppp/modules/ppp_comp.c index f6eef5ab1..941e9d8c5 100644 --- a/mdk-stage1/ppp/modules/ppp_comp.c +++ b/mdk-stage1/ppp/modules/ppp_comp.c @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: ppp_comp.c 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/modules/vjcompress.c b/mdk-stage1/ppp/modules/vjcompress.c index 809b87231..af519b434 100644 --- a/mdk-stage1/ppp/modules/vjcompress.c +++ b/mdk-stage1/ppp/modules/vjcompress.c @@ -29,7 +29,7 @@ * This version is used under SunOS 4.x, Digital UNIX, AIX 4.x, * and SVR4 systems including Solaris 2. * - * $Id$ + * $Id: vjcompress.c 195720 2001-06-11 11:44:34Z gc $ */ #include <sys/types.h> diff --git a/mdk-stage1/ppp/pppd/Makefile.linux b/mdk-stage1/ppp/pppd/Makefile.linux index 47d6ba01e..4438ea824 100644 --- a/mdk-stage1/ppp/pppd/Makefile.linux +++ b/mdk-stage1/ppp/pppd/Makefile.linux @@ -1,6 +1,6 @@ # # pppd makefile for Linux -# $Id$ +# $Id: Makefile.linux 195720 2001-06-11 11:44:34Z gc $ # # Default installation locations diff --git a/mdk-stage1/ppp/pppd/Makefile.linux.make b/mdk-stage1/ppp/pppd/Makefile.linux.make index d98a32562..3a2eca00e 100644 --- a/mdk-stage1/ppp/pppd/Makefile.linux.make +++ b/mdk-stage1/ppp/pppd/Makefile.linux.make @@ -1,6 +1,6 @@ # # pppd makefile for Linux -# $Id$ +# $Id: Makefile.linux.make 195720 2001-06-11 11:44:34Z gc $ # # Default installation locations diff --git a/mdk-stage1/ppp/pppd/Makefile.linux.makeopt b/mdk-stage1/ppp/pppd/Makefile.linux.makeopt index 3094c941c..1b58114cd 100644 --- a/mdk-stage1/ppp/pppd/Makefile.linux.makeopt +++ b/mdk-stage1/ppp/pppd/Makefile.linux.makeopt @@ -1,6 +1,6 @@ # # pppd makefile for Linux -# $Id$ +# $Id: Makefile.linux.makeopt 195720 2001-06-11 11:44:34Z gc $ # # Default installation locations diff --git a/mdk-stage1/ppp/pppd/Makefile.sol2 b/mdk-stage1/ppp/pppd/Makefile.sol2 index dfdcddd97..ead5685d7 100644 --- a/mdk-stage1/ppp/pppd/Makefile.sol2 +++ b/mdk-stage1/ppp/pppd/Makefile.sol2 @@ -1,6 +1,6 @@ # # Makefile for pppd under Solaris 2. -# $Id$ +# $Id: Makefile.sol2 195720 2001-06-11 11:44:34Z gc $ # include ../solaris/Makedefs diff --git a/mdk-stage1/ppp/pppd/Makefile.sunos4 b/mdk-stage1/ppp/pppd/Makefile.sunos4 index 694ac341f..340a8747b 100644 --- a/mdk-stage1/ppp/pppd/Makefile.sunos4 +++ b/mdk-stage1/ppp/pppd/Makefile.sunos4 @@ -1,6 +1,6 @@ # # Makefile for pppd under SunOS 4. -# $Id$ +# $Id: Makefile.sunos4 195720 2001-06-11 11:44:34Z gc $ # include ../sunos4/Makedefs diff --git a/mdk-stage1/ppp/pppd/auth.c b/mdk-stage1/ppp/pppd/auth.c index 5f95a2982..0520c1eef 100644 --- a/mdk-stage1/ppp/pppd/auth.c +++ b/mdk-stage1/ppp/pppd/auth.c @@ -32,7 +32,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id$" +#define RCSID "$Id: auth.c 195734 2001-06-11 14:46:02Z gc $" #include <stdio.h> #include <stddef.h> diff --git a/mdk-stage1/ppp/pppd/cbcp.c b/mdk-stage1/ppp/pppd/cbcp.c index 8c57b3cde..b286ef9f9 100644 --- a/mdk-stage1/ppp/pppd/cbcp.c +++ b/mdk-stage1/ppp/pppd/cbcp.c @@ -18,7 +18,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id$" +#define RCSID "$Id: cbcp.c 195720 2001-06-11 11:44:34Z gc $" #include <stdio.h> #include <string.h> diff --git a/mdk-stage1/ppp/pppd/ccp.c b/mdk-stage1/ppp/pppd/ccp.c index 7e36e384e..eaa6b4336 100644 --- a/mdk-stage1/ppp/pppd/ccp.c +++ b/mdk-stage1/ppp/pppd/ccp.c @@ -25,7 +25,7 @@ * OR MODIFICATIONS. */ -#define RCSID "$Id$" +#define RCSID "$Id: ccp.c 195720 2001-06-11 11:44:34Z gc $" #include <stdlib.h> #include <string.h> diff --git a/mdk-stage1/ppp/pppd/ccp.h b/mdk-stage1/ppp/pppd/ccp.h index 609d858c5..406fe4d17 100644 --- a/mdk-stage1/ppp/pppd/ccp.h +++ b/mdk-stage1/ppp/pppd/ccp.h @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: ccp.h 195720 2001-06-11 11:44:34Z gc $ */ typedef struct ccp_options { diff --git a/mdk-stage1/ppp/pppd/chap.c b/mdk-stage1/ppp/pppd/chap.c index 54c0e0095..76560dcf0 100644 --- a/mdk-stage1/ppp/pppd/chap.c +++ b/mdk-stage1/ppp/pppd/chap.c @@ -33,7 +33,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id$" +#define RCSID "$Id: chap.c 195720 2001-06-11 11:44:34Z gc $" /* * TODO: diff --git a/mdk-stage1/ppp/pppd/chap.h b/mdk-stage1/ppp/pppd/chap.h index 945d051d0..1218c151b 100644 --- a/mdk-stage1/ppp/pppd/chap.h +++ b/mdk-stage1/ppp/pppd/chap.h @@ -30,7 +30,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id$ + * $Id: chap.h 195720 2001-06-11 11:44:34Z gc $ */ #ifndef __CHAP_INCLUDE__ diff --git a/mdk-stage1/ppp/pppd/chap_ms.c b/mdk-stage1/ppp/pppd/chap_ms.c index 81a57bb5a..9cf9ada66 100644 --- a/mdk-stage1/ppp/pppd/chap_ms.c +++ b/mdk-stage1/ppp/pppd/chap_ms.c @@ -31,7 +31,7 @@ * You should also use DOMAIN\\USERNAME as described in README.MSCHAP80 */ -#define RCSID "$Id$" +#define RCSID "$Id: chap_ms.c 195720 2001-06-11 11:44:34Z gc $" #ifdef CHAPMS diff --git a/mdk-stage1/ppp/pppd/chap_ms.h b/mdk-stage1/ppp/pppd/chap_ms.h index fad2755c8..ab2848a59 100644 --- a/mdk-stage1/ppp/pppd/chap_ms.h +++ b/mdk-stage1/ppp/pppd/chap_ms.h @@ -19,7 +19,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id$ + * $Id: chap_ms.h 195720 2001-06-11 11:44:34Z gc $ */ #ifndef __CHAPMS_INCLUDE__ diff --git a/mdk-stage1/ppp/pppd/demand.c b/mdk-stage1/ppp/pppd/demand.c index 9a740be8d..293c8957e 100644 --- a/mdk-stage1/ppp/pppd/demand.c +++ b/mdk-stage1/ppp/pppd/demand.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id$" +#define RCSID "$Id: demand.c 195720 2001-06-11 11:44:34Z gc $" #include <stdio.h> #include <stdlib.h> diff --git a/mdk-stage1/ppp/pppd/eui64.c b/mdk-stage1/ppp/pppd/eui64.c index 7f3176035..a18c43a27 100644 --- a/mdk-stage1/ppp/pppd/eui64.c +++ b/mdk-stage1/ppp/pppd/eui64.c @@ -15,10 +15,10 @@ WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - $Id$ + $Id: eui64.c 195720 2001-06-11 11:44:34Z gc $ */ -#define RCSID "$Id$" +#define RCSID "$Id: eui64.c 195720 2001-06-11 11:44:34Z gc $" #include "pppd.h" diff --git a/mdk-stage1/ppp/pppd/eui64.h b/mdk-stage1/ppp/pppd/eui64.h index ca4445345..1398f08da 100644 --- a/mdk-stage1/ppp/pppd/eui64.h +++ b/mdk-stage1/ppp/pppd/eui64.h @@ -15,7 +15,7 @@ WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - $Id$ + $Id: eui64.h 195720 2001-06-11 11:44:34Z gc $ */ #ifndef __EUI64_H__ diff --git a/mdk-stage1/ppp/pppd/fsm.c b/mdk-stage1/ppp/pppd/fsm.c index 07a8c11f1..92661fc7a 100644 --- a/mdk-stage1/ppp/pppd/fsm.c +++ b/mdk-stage1/ppp/pppd/fsm.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id$" +#define RCSID "$Id: fsm.c 195720 2001-06-11 11:44:34Z gc $" /* * TODO: diff --git a/mdk-stage1/ppp/pppd/fsm.h b/mdk-stage1/ppp/pppd/fsm.h index c94a68e6c..7f20202d8 100644 --- a/mdk-stage1/ppp/pppd/fsm.h +++ b/mdk-stage1/ppp/pppd/fsm.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id$ + * $Id: fsm.h 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/pppd/ipcp.c b/mdk-stage1/ppp/pppd/ipcp.c index 3f64357ed..63dd2540a 100644 --- a/mdk-stage1/ppp/pppd/ipcp.c +++ b/mdk-stage1/ppp/pppd/ipcp.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id$" +#define RCSID "$Id: ipcp.c 198597 2002-05-13 15:34:06Z gc $" /* * TODO: diff --git a/mdk-stage1/ppp/pppd/ipcp.h b/mdk-stage1/ppp/pppd/ipcp.h index 8c5aca861..ca180b98a 100644 --- a/mdk-stage1/ppp/pppd/ipcp.h +++ b/mdk-stage1/ppp/pppd/ipcp.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id$ + * $Id: ipcp.h 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/pppd/ipv6cp.c b/mdk-stage1/ppp/pppd/ipv6cp.c index 35fa2b53a..01f963990 100644 --- a/mdk-stage1/ppp/pppd/ipv6cp.c +++ b/mdk-stage1/ppp/pppd/ipv6cp.c @@ -90,10 +90,10 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id$ + * $Id: ipv6cp.c 215411 2007-04-25 12:26:16Z pixel $ */ -#define RCSID "$Id$" +#define RCSID "$Id: ipv6cp.c 215411 2007-04-25 12:26:16Z pixel $" /* * TODO: diff --git a/mdk-stage1/ppp/pppd/ipv6cp.h b/mdk-stage1/ppp/pppd/ipv6cp.h index c98d80209..eba75465c 100644 --- a/mdk-stage1/ppp/pppd/ipv6cp.h +++ b/mdk-stage1/ppp/pppd/ipv6cp.h @@ -90,7 +90,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id$ + * $Id: ipv6cp.h 215411 2007-04-25 12:26:16Z pixel $ */ /* diff --git a/mdk-stage1/ppp/pppd/ipxcp.c b/mdk-stage1/ppp/pppd/ipxcp.c index f9a12b934..30f3f2028 100644 --- a/mdk-stage1/ppp/pppd/ipxcp.c +++ b/mdk-stage1/ppp/pppd/ipxcp.c @@ -19,7 +19,7 @@ #ifdef IPX_CHANGE -#define RCSID "$Id$" +#define RCSID "$Id: ipxcp.c 195720 2001-06-11 11:44:34Z gc $" /* * TODO: diff --git a/mdk-stage1/ppp/pppd/ipxcp.h b/mdk-stage1/ppp/pppd/ipxcp.h index 47f680d70..12bc6700e 100644 --- a/mdk-stage1/ppp/pppd/ipxcp.h +++ b/mdk-stage1/ppp/pppd/ipxcp.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id$ + * $Id: ipxcp.h 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/pppd/lcp.c b/mdk-stage1/ppp/pppd/lcp.c index 41c58cad5..73f7efdbc 100644 --- a/mdk-stage1/ppp/pppd/lcp.c +++ b/mdk-stage1/ppp/pppd/lcp.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id$" +#define RCSID "$Id: lcp.c 195720 2001-06-11 11:44:34Z gc $" /* * TODO: diff --git a/mdk-stage1/ppp/pppd/lcp.h b/mdk-stage1/ppp/pppd/lcp.h index b87a9295e..393b13c68 100644 --- a/mdk-stage1/ppp/pppd/lcp.h +++ b/mdk-stage1/ppp/pppd/lcp.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id$ + * $Id: lcp.h 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/pppd/magic.c b/mdk-stage1/ppp/pppd/magic.c index 1682dee03..845dfe21f 100644 --- a/mdk-stage1/ppp/pppd/magic.c +++ b/mdk-stage1/ppp/pppd/magic.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id$" +#define RCSID "$Id: magic.c 195734 2001-06-11 14:46:02Z gc $" #include <stdlib.h> #include <stdio.h> diff --git a/mdk-stage1/ppp/pppd/magic.h b/mdk-stage1/ppp/pppd/magic.h index 1344626a3..3b709b563 100644 --- a/mdk-stage1/ppp/pppd/magic.h +++ b/mdk-stage1/ppp/pppd/magic.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id$ + * $Id: magic.h 195720 2001-06-11 11:44:34Z gc $ */ void magic_init __P((void)); /* Initialize the magic number generator */ diff --git a/mdk-stage1/ppp/pppd/main.c b/mdk-stage1/ppp/pppd/main.c index c074938cd..1e540ae90 100644 --- a/mdk-stage1/ppp/pppd/main.c +++ b/mdk-stage1/ppp/pppd/main.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id$" +#define RCSID "$Id: main.c 195734 2001-06-11 14:46:02Z gc $" #include <stdio.h> #include <ctype.h> diff --git a/mdk-stage1/ppp/pppd/options.c b/mdk-stage1/ppp/pppd/options.c index 1921d9ec5..018dbd006 100644 --- a/mdk-stage1/ppp/pppd/options.c +++ b/mdk-stage1/ppp/pppd/options.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id$" +#define RCSID "$Id: options.c 195734 2001-06-11 14:46:02Z gc $" #include <ctype.h> #include <stdio.h> diff --git a/mdk-stage1/ppp/pppd/patchlevel.h b/mdk-stage1/ppp/pppd/patchlevel.h index 2a2d816f1..c16f01dba 100644 --- a/mdk-stage1/ppp/pppd/patchlevel.h +++ b/mdk-stage1/ppp/pppd/patchlevel.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: patchlevel.h 195720 2001-06-11 11:44:34Z gc $ */ #define VERSION "2.4.1" #define DATE "25 March 2001" diff --git a/mdk-stage1/ppp/pppd/pathnames.h b/mdk-stage1/ppp/pppd/pathnames.h index e80784567..7e3b77f82 100644 --- a/mdk-stage1/ppp/pppd/pathnames.h +++ b/mdk-stage1/ppp/pppd/pathnames.h @@ -1,7 +1,7 @@ /* * define path names * - * $Id$ + * $Id: pathnames.h 195734 2001-06-11 14:46:02Z gc $ */ #define _PATH_VARRUN "/var/run/" diff --git a/mdk-stage1/ppp/pppd/plugins/Makefile.sol2 b/mdk-stage1/ppp/pppd/plugins/Makefile.sol2 index 8f4398258..5e110201c 100644 --- a/mdk-stage1/ppp/pppd/plugins/Makefile.sol2 +++ b/mdk-stage1/ppp/pppd/plugins/Makefile.sol2 @@ -1,7 +1,7 @@ # # Makefile for plugins on Solaris 2 # -# $Id$ +# $Id: Makefile.sol2 195720 2001-06-11 11:44:34Z gc $ # include ../../svr4/Makedefs diff --git a/mdk-stage1/ppp/pppd/pppd.8 b/mdk-stage1/ppp/pppd/pppd.8 index ab091cd83..cded59872 100644 --- a/mdk-stage1/ppp/pppd/pppd.8 +++ b/mdk-stage1/ppp/pppd/pppd.8 @@ -1,5 +1,5 @@ .\" manual page [] for pppd 2.4 -.\" $Id$ +.\" $Id: pppd.8 195720 2001-06-11 11:44:34Z gc $ .\" SH section heading .\" SS subsection heading .\" LP paragraph diff --git a/mdk-stage1/ppp/pppd/pppd.h b/mdk-stage1/ppp/pppd/pppd.h index 02f6dfcef..158756220 100644 --- a/mdk-stage1/ppp/pppd/pppd.h +++ b/mdk-stage1/ppp/pppd/pppd.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id$ + * $Id: pppd.h 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/pppd/pppd.h.wtmp b/mdk-stage1/ppp/pppd/pppd.h.wtmp index 4d440be06..b69585d8c 100644 --- a/mdk-stage1/ppp/pppd/pppd.h.wtmp +++ b/mdk-stage1/ppp/pppd/pppd.h.wtmp @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id$ + * $Id: pppd.h.wtmp 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/pppd/sys-solaris.c b/mdk-stage1/ppp/pppd/sys-solaris.c index da5f9c45a..60b3003ed 100644 --- a/mdk-stage1/ppp/pppd/sys-solaris.c +++ b/mdk-stage1/ppp/pppd/sys-solaris.c @@ -42,7 +42,7 @@ * OR MODIFICATIONS. */ -#define RCSID "$Id$" +#define RCSID "$Id: sys-solaris.c 195720 2001-06-11 11:44:34Z gc $" #include <limits.h> #include <stdio.h> diff --git a/mdk-stage1/ppp/pppd/sys-sunos4.c b/mdk-stage1/ppp/pppd/sys-sunos4.c index 3344948e9..8365e3894 100644 --- a/mdk-stage1/ppp/pppd/sys-sunos4.c +++ b/mdk-stage1/ppp/pppd/sys-sunos4.c @@ -25,7 +25,7 @@ * OR MODIFICATIONS. */ -#define RCSID "$Id$" +#define RCSID "$Id: sys-sunos4.c 195720 2001-06-11 11:44:34Z gc $" #include <stdio.h> #include <stddef.h> diff --git a/mdk-stage1/ppp/pppd/tty.c b/mdk-stage1/ppp/pppd/tty.c index 4db707968..cd724e935 100644 --- a/mdk-stage1/ppp/pppd/tty.c +++ b/mdk-stage1/ppp/pppd/tty.c @@ -20,7 +20,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id$" +#define RCSID "$Id: tty.c 195720 2001-06-11 11:44:34Z gc $" #include <stdio.h> #include <ctype.h> diff --git a/mdk-stage1/ppp/pppd/upap.c b/mdk-stage1/ppp/pppd/upap.c index bd569fb74..83bf8f7e6 100644 --- a/mdk-stage1/ppp/pppd/upap.c +++ b/mdk-stage1/ppp/pppd/upap.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id$" +#define RCSID "$Id: upap.c 195720 2001-06-11 11:44:34Z gc $" /* * TODO: diff --git a/mdk-stage1/ppp/pppd/upap.h b/mdk-stage1/ppp/pppd/upap.h index 42d6f4f0f..a1ee587d1 100644 --- a/mdk-stage1/ppp/pppd/upap.h +++ b/mdk-stage1/ppp/pppd/upap.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id$ + * $Id: upap.h 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/pppd/utils.c b/mdk-stage1/ppp/pppd/utils.c index 5861d8980..64b960a63 100644 --- a/mdk-stage1/ppp/pppd/utils.c +++ b/mdk-stage1/ppp/pppd/utils.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id$" +#define RCSID "$Id: utils.c 203596 2003-08-19 08:57:26Z gbeauchesne $" #include <stdio.h> #include <ctype.h> diff --git a/mdk-stage1/ppp/pppdump/Makefile.sol2 b/mdk-stage1/ppp/pppdump/Makefile.sol2 index d7e6b413e..bbd07ebff 100644 --- a/mdk-stage1/ppp/pppdump/Makefile.sol2 +++ b/mdk-stage1/ppp/pppdump/Makefile.sol2 @@ -1,6 +1,6 @@ # # pppdump Makefile for SVR4 systems -# $Id$ +# $Id: Makefile.sol2 195720 2001-06-11 11:44:34Z gc $ # include ../solaris/Makedefs diff --git a/mdk-stage1/ppp/pppdump/Makefile.sunos4 b/mdk-stage1/ppp/pppdump/Makefile.sunos4 index 915c8267d..5f60f747c 100644 --- a/mdk-stage1/ppp/pppdump/Makefile.sunos4 +++ b/mdk-stage1/ppp/pppdump/Makefile.sunos4 @@ -1,6 +1,6 @@ # # pppstats makefile -# $Id$ +# $Id: Makefile.sunos4 195720 2001-06-11 11:44:34Z gc $ # include ../sunos4/Makedefs diff --git a/mdk-stage1/ppp/pppdump/bsd-comp.c b/mdk-stage1/ppp/pppdump/bsd-comp.c index 1e14e98bb..cf3c18d35 100644 --- a/mdk-stage1/ppp/pppdump/bsd-comp.c +++ b/mdk-stage1/ppp/pppdump/bsd-comp.c @@ -38,7 +38,7 @@ */ /* - * $Id$ + * $Id: bsd-comp.c 195720 2001-06-11 11:44:34Z gc $ */ #include <sys/types.h> diff --git a/mdk-stage1/ppp/pppdump/deflate.c b/mdk-stage1/ppp/pppdump/deflate.c index 08e8abc0d..812905bfe 100644 --- a/mdk-stage1/ppp/pppdump/deflate.c +++ b/mdk-stage1/ppp/pppdump/deflate.c @@ -25,7 +25,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: deflate.c 195720 2001-06-11 11:44:34Z gc $ */ #include <sys/types.h> diff --git a/mdk-stage1/ppp/pppdump/ppp-comp.h b/mdk-stage1/ppp/pppdump/ppp-comp.h index 9221c0db4..7608c393d 100644 --- a/mdk-stage1/ppp/pppdump/ppp-comp.h +++ b/mdk-stage1/ppp/pppdump/ppp-comp.h @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: ppp-comp.h 195720 2001-06-11 11:44:34Z gc $ */ #ifndef _NET_PPP_COMP_H diff --git a/mdk-stage1/ppp/pppdump/pppdump.8 b/mdk-stage1/ppp/pppdump/pppdump.8 index c0172f519..b908eeed7 100644 --- a/mdk-stage1/ppp/pppdump/pppdump.8 +++ b/mdk-stage1/ppp/pppdump/pppdump.8 @@ -1,4 +1,4 @@ -.\" @(#) $Id$ +.\" @(#) $Id: pppdump.8 195720 2001-06-11 11:44:34Z gc $ .TH PPPDUMP 8 "1 April 1999" .SH NAME pppdump \- convert PPP record file to readable format diff --git a/mdk-stage1/ppp/pppdump/zlib.c b/mdk-stage1/ppp/pppdump/zlib.c index 5b8372719..8b6a8a138 100644 --- a/mdk-stage1/ppp/pppdump/zlib.c +++ b/mdk-stage1/ppp/pppdump/zlib.c @@ -11,7 +11,7 @@ * - added Z_PACKET_FLUSH (see zlib.h for details) * - added inflateIncomp * - * $Id$ + * $Id: zlib.c 195720 2001-06-11 11:44:34Z gc $ */ diff --git a/mdk-stage1/ppp/pppdump/zlib.h b/mdk-stage1/ppp/pppdump/zlib.h index 9c7ac734d..b4a7d91a9 100644 --- a/mdk-stage1/ppp/pppdump/zlib.h +++ b/mdk-stage1/ppp/pppdump/zlib.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: zlib.h 195720 2001-06-11 11:44:34Z gc $ */ /* * This file is derived from zlib.h and zconf.h from the zlib-0.95 diff --git a/mdk-stage1/ppp/pppstats/Makefile.linux b/mdk-stage1/ppp/pppstats/Makefile.linux index ef0764c5d..fc9da74a5 100644 --- a/mdk-stage1/ppp/pppstats/Makefile.linux +++ b/mdk-stage1/ppp/pppstats/Makefile.linux @@ -1,6 +1,6 @@ # # pppstats makefile -# $Id$ +# $Id: Makefile.linux 195720 2001-06-11 11:44:34Z gc $ # PPPSTATSRCS = pppstats.c diff --git a/mdk-stage1/ppp/pppstats/Makefile.sol2 b/mdk-stage1/ppp/pppstats/Makefile.sol2 index a6544e61b..6ae4c173f 100644 --- a/mdk-stage1/ppp/pppstats/Makefile.sol2 +++ b/mdk-stage1/ppp/pppstats/Makefile.sol2 @@ -1,6 +1,6 @@ # # pppstats Makefile for SVR4 systems -# $Id$ +# $Id: Makefile.sol2 195720 2001-06-11 11:44:34Z gc $ # include ../solaris/Makedefs diff --git a/mdk-stage1/ppp/pppstats/Makefile.sunos4 b/mdk-stage1/ppp/pppstats/Makefile.sunos4 index 2a036f28f..cfcfca541 100644 --- a/mdk-stage1/ppp/pppstats/Makefile.sunos4 +++ b/mdk-stage1/ppp/pppstats/Makefile.sunos4 @@ -1,6 +1,6 @@ # # pppstats makefile -# $Id$ +# $Id: Makefile.sunos4 195720 2001-06-11 11:44:34Z gc $ # include ../sunos4/Makedefs diff --git a/mdk-stage1/ppp/pppstats/pppstats.8 b/mdk-stage1/ppp/pppstats/pppstats.8 index 1ba8d5779..507202eb2 100644 --- a/mdk-stage1/ppp/pppstats/pppstats.8 +++ b/mdk-stage1/ppp/pppstats/pppstats.8 @@ -1,4 +1,4 @@ -.\" @(#) $Id$ +.\" @(#) $Id: pppstats.8 195720 2001-06-11 11:44:34Z gc $ .TH PPPSTATS 8 "26 June 1995" .SH NAME pppstats \- print PPP statistics diff --git a/mdk-stage1/ppp/pppstats/pppstats.c b/mdk-stage1/ppp/pppstats/pppstats.c index 77b803723..108638b06 100644 --- a/mdk-stage1/ppp/pppstats/pppstats.c +++ b/mdk-stage1/ppp/pppstats/pppstats.c @@ -36,7 +36,7 @@ #endif #ifndef lint -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: pppstats.c 195720 2001-06-11 11:44:34Z gc $"; #endif #include <stdio.h> diff --git a/mdk-stage1/ppp/solaris/Makedefs.sol2 b/mdk-stage1/ppp/solaris/Makedefs.sol2 index 1282c6e74..c13cb581f 100644 --- a/mdk-stage1/ppp/solaris/Makedefs.sol2 +++ b/mdk-stage1/ppp/solaris/Makedefs.sol2 @@ -1,7 +1,7 @@ # # Generic make definitions for Solaris 2 # -# $Id$ +# $Id: Makedefs.sol2 195720 2001-06-11 11:44:34Z gc $ # include ../solaris/Makedefs diff --git a/mdk-stage1/ppp/solaris/Makefile.sol2 b/mdk-stage1/ppp/solaris/Makefile.sol2 index 78628847b..d421c33a5 100644 --- a/mdk-stage1/ppp/solaris/Makefile.sol2 +++ b/mdk-stage1/ppp/solaris/Makefile.sol2 @@ -1,7 +1,7 @@ # # Makefile for STREAMS modules for Solaris 2. # -# $Id$ +# $Id: Makefile.sol2 195720 2001-06-11 11:44:34Z gc $ # include Makedefs.sol2 diff --git a/mdk-stage1/ppp/solaris/Makefile.sol2-64 b/mdk-stage1/ppp/solaris/Makefile.sol2-64 index 63e75fc54..4481cdf12 100644 --- a/mdk-stage1/ppp/solaris/Makefile.sol2-64 +++ b/mdk-stage1/ppp/solaris/Makefile.sol2-64 @@ -1,7 +1,7 @@ # # Makefile for 64-bit STREAMS modules for Solaris 2. # -# $Id$ +# $Id: Makefile.sol2-64 195720 2001-06-11 11:44:34Z gc $ # include Makedefs.sol2 diff --git a/mdk-stage1/ppp/solaris/Makefile.top b/mdk-stage1/ppp/solaris/Makefile.top index f1200b852..2236866bc 100644 --- a/mdk-stage1/ppp/solaris/Makefile.top +++ b/mdk-stage1/ppp/solaris/Makefile.top @@ -1,7 +1,7 @@ # # ppp top level makefile for SVR4 and Solaris 2 # -# $Id$ +# $Id: Makefile.top 195720 2001-06-11 11:44:34Z gc $ # include solaris/Makedefs diff --git a/mdk-stage1/ppp/solaris/ppp.c b/mdk-stage1/ppp/solaris/ppp.c index 44bf08dff..f6d8c93df 100644 --- a/mdk-stage1/ppp/solaris/ppp.c +++ b/mdk-stage1/ppp/solaris/ppp.c @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: ppp.c 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/solaris/ppp_ahdlc.c b/mdk-stage1/ppp/solaris/ppp_ahdlc.c index d0b961258..e3c4baa28 100644 --- a/mdk-stage1/ppp/solaris/ppp_ahdlc.c +++ b/mdk-stage1/ppp/solaris/ppp_ahdlc.c @@ -41,7 +41,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: ppp_ahdlc.c 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/solaris/ppp_comp.c b/mdk-stage1/ppp/solaris/ppp_comp.c index f6eef5ab1..941e9d8c5 100644 --- a/mdk-stage1/ppp/solaris/ppp_comp.c +++ b/mdk-stage1/ppp/solaris/ppp_comp.c @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: ppp_comp.c 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/solaris/ppp_comp_mod.c b/mdk-stage1/ppp/solaris/ppp_comp_mod.c index 83ff8e252..d22fbc81f 100644 --- a/mdk-stage1/ppp/solaris/ppp_comp_mod.c +++ b/mdk-stage1/ppp/solaris/ppp_comp_mod.c @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: ppp_comp_mod.c 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/solaris/ppp_mod.c b/mdk-stage1/ppp/solaris/ppp_mod.c index a4b1538a5..7a4f52add 100644 --- a/mdk-stage1/ppp/solaris/ppp_mod.c +++ b/mdk-stage1/ppp/solaris/ppp_mod.c @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: ppp_mod.c 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/sunos4/Makefile b/mdk-stage1/ppp/sunos4/Makefile index 701e24e14..e763b455e 100644 --- a/mdk-stage1/ppp/sunos4/Makefile +++ b/mdk-stage1/ppp/sunos4/Makefile @@ -1,7 +1,7 @@ # # Makefile for STREAMS modules for SunOS 4. # -# $Id$ +# $Id: Makefile 195720 2001-06-11 11:44:34Z gc $ # include Makedefs diff --git a/mdk-stage1/ppp/svr4/Makedefs.sol2 b/mdk-stage1/ppp/svr4/Makedefs.sol2 index e8b8d282e..61ad95551 100644 --- a/mdk-stage1/ppp/svr4/Makedefs.sol2 +++ b/mdk-stage1/ppp/svr4/Makedefs.sol2 @@ -1,7 +1,7 @@ # # Generic make definitions for Solaris 2 # -# $Id$ +# $Id: Makedefs.sol2 195720 2001-06-11 11:44:34Z gc $ # include ../svr4/Makedefs diff --git a/mdk-stage1/ppp/svr4/Makefile.sol2 b/mdk-stage1/ppp/svr4/Makefile.sol2 index 5b2ca8635..d1df99c1a 100644 --- a/mdk-stage1/ppp/svr4/Makefile.sol2 +++ b/mdk-stage1/ppp/svr4/Makefile.sol2 @@ -1,7 +1,7 @@ # # Makefile for STREAMS modules for Solaris 2. # -# $Id$ +# $Id: Makefile.sol2 195720 2001-06-11 11:44:34Z gc $ # include Makedefs.sol2 diff --git a/mdk-stage1/ppp/svr4/Makefile.sol2-64 b/mdk-stage1/ppp/svr4/Makefile.sol2-64 index 80c6b185e..ea0b3ed5b 100644 --- a/mdk-stage1/ppp/svr4/Makefile.sol2-64 +++ b/mdk-stage1/ppp/svr4/Makefile.sol2-64 @@ -1,7 +1,7 @@ # # Makefile for 64-bit STREAMS modules for Solaris 2. # -# $Id$ +# $Id: Makefile.sol2-64 195720 2001-06-11 11:44:34Z gc $ # include Makedefs.sol2 diff --git a/mdk-stage1/ppp/svr4/Makefile.svr4 b/mdk-stage1/ppp/svr4/Makefile.svr4 index 252c52428..6649a9055 100644 --- a/mdk-stage1/ppp/svr4/Makefile.svr4 +++ b/mdk-stage1/ppp/svr4/Makefile.svr4 @@ -1,7 +1,7 @@ # # Makefile for STREAMS modules for SVR4. # -# $Id$ +# $Id: Makefile.svr4 195720 2001-06-11 11:44:34Z gc $ # COPTS = -O diff --git a/mdk-stage1/ppp/svr4/Makefile.top b/mdk-stage1/ppp/svr4/Makefile.top index 253e48acb..f2e682d38 100644 --- a/mdk-stage1/ppp/svr4/Makefile.top +++ b/mdk-stage1/ppp/svr4/Makefile.top @@ -1,7 +1,7 @@ # # ppp top level makefile for SVR4 and Solaris 2 # -# $Id$ +# $Id: Makefile.top 195720 2001-06-11 11:44:34Z gc $ # include svr4/Makedefs diff --git a/mdk-stage1/ppp/svr4/ppp_comp_mod.c b/mdk-stage1/ppp/svr4/ppp_comp_mod.c index 83ff8e252..d22fbc81f 100644 --- a/mdk-stage1/ppp/svr4/ppp_comp_mod.c +++ b/mdk-stage1/ppp/svr4/ppp_comp_mod.c @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: ppp_comp_mod.c 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/ppp/svr4/ppp_mod.c b/mdk-stage1/ppp/svr4/ppp_mod.c index a4b1538a5..7a4f52add 100644 --- a/mdk-stage1/ppp/svr4/ppp_mod.c +++ b/mdk-stage1/ppp/svr4/ppp_mod.c @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: ppp_mod.c 195720 2001-06-11 11:44:34Z gc $ */ /* diff --git a/mdk-stage1/rp-pppoe/configs/pppoe.conf b/mdk-stage1/rp-pppoe/configs/pppoe.conf index 9f77b913c..6643f1778 100644 --- a/mdk-stage1/rp-pppoe/configs/pppoe.conf +++ b/mdk-stage1/rp-pppoe/configs/pppoe.conf @@ -14,7 +14,7 @@ # This file may be distributed under the terms of the GNU General # Public License. # -# $Id$ +# $Id: pppoe.conf 195724 2001-06-11 13:49:39Z gc $ #*********************************************************************** # When you configure a variable, DO NOT leave spaces around the "=" sign. diff --git a/mdk-stage1/rp-pppoe/doc/CHANGES b/mdk-stage1/rp-pppoe/doc/CHANGES index 9afce027d..c009c84ad 100644 --- a/mdk-stage1/rp-pppoe/doc/CHANGES +++ b/mdk-stage1/rp-pppoe/doc/CHANGES @@ -174,4 +174,4 @@ Changes from Version 1.7 to 1.8: - Made pppoe send a PADT frame if connection is terminated -$Id$ +$Id: CHANGES 195724 2001-06-11 13:49:39Z gc $ diff --git a/mdk-stage1/rp-pppoe/doc/HOW-TO-CONNECT b/mdk-stage1/rp-pppoe/doc/HOW-TO-CONNECT index 3e888af69..c2863f51d 100644 --- a/mdk-stage1/rp-pppoe/doc/HOW-TO-CONNECT +++ b/mdk-stage1/rp-pppoe/doc/HOW-TO-CONNECT @@ -1,4 +1,4 @@ -$Id$ +$Id: HOW-TO-CONNECT 195724 2001-06-11 13:49:39Z gc $ This package lets you connect a Linux machine to Sympatico HSE or Magma's high-speed service using a Nortel 1-meg modem. diff --git a/mdk-stage1/rp-pppoe/go b/mdk-stage1/rp-pppoe/go index 305ac9ee4..0bc2da42d 100755 --- a/mdk-stage1/rp-pppoe/go +++ b/mdk-stage1/rp-pppoe/go @@ -7,7 +7,7 @@ # # Copyright (C) 2000 Roaring Penguin Software Inc. # -# $Id$ +# $Id: go 195724 2001-06-11 13:49:39Z gc $ #*********************************************************************** # Figure out directory of script diff --git a/mdk-stage1/rp-pppoe/go-gui b/mdk-stage1/rp-pppoe/go-gui index ddce984fd..37e160217 100755 --- a/mdk-stage1/rp-pppoe/go-gui +++ b/mdk-stage1/rp-pppoe/go-gui @@ -7,7 +7,7 @@ # # Copyright (C) 2000 Roaring Penguin Software Inc. # -# $Id$ +# $Id: go-gui 195724 2001-06-11 13:49:39Z gc $ #*********************************************************************** # GUI only works on Linux diff --git a/mdk-stage1/rp-pppoe/gui/Makefile.in b/mdk-stage1/rp-pppoe/gui/Makefile.in index a9b0844c0..a4f95ae5a 100644 --- a/mdk-stage1/rp-pppoe/gui/Makefile.in +++ b/mdk-stage1/rp-pppoe/gui/Makefile.in @@ -10,7 +10,7 @@ # This program may be distributed according to the terms of the GNU # General Public License, version 2 or (at your option) any later version. # -# $Id$ +# $Id: Makefile.in 195724 2001-06-11 13:49:39Z gc $ #*********************************************************************** DEFINES= prefix=@prefix@ diff --git a/mdk-stage1/rp-pppoe/gui/pppoe-wrapper.1 b/mdk-stage1/rp-pppoe/gui/pppoe-wrapper.1 index 4fbf2bce2..8ffb8704e 100644 --- a/mdk-stage1/rp-pppoe/gui/pppoe-wrapper.1 +++ b/mdk-stage1/rp-pppoe/gui/pppoe-wrapper.1 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: pppoe-wrapper.1 195724 2001-06-11 13:49:39Z gc $ .TH PPPOE-WRAPPER 1 "26 February 2001" .UC 4 .SH NAME diff --git a/mdk-stage1/rp-pppoe/gui/tkpppoe.1 b/mdk-stage1/rp-pppoe/gui/tkpppoe.1 index 183476568..6239b7df5 100644 --- a/mdk-stage1/rp-pppoe/gui/tkpppoe.1 +++ b/mdk-stage1/rp-pppoe/gui/tkpppoe.1 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: tkpppoe.1 195724 2001-06-11 13:49:39Z gc $ .TH TKPPPOE 1 "26 February 2001" .UC 4 .SH NAME diff --git a/mdk-stage1/rp-pppoe/gui/tkpppoe.in b/mdk-stage1/rp-pppoe/gui/tkpppoe.in index 37dbf8cc1..9fb6d75ca 100755 --- a/mdk-stage1/rp-pppoe/gui/tkpppoe.in +++ b/mdk-stage1/rp-pppoe/gui/tkpppoe.in @@ -16,7 +16,7 @@ # #-------------------------------------------------------------- -# $Id$ +# $Id: tkpppoe.in 195724 2001-06-11 13:49:39Z gc $ # the next line restarts using wish \ umask 022; \ diff --git a/mdk-stage1/rp-pppoe/gui/wrapper.c b/mdk-stage1/rp-pppoe/gui/wrapper.c index e2b99662a..901ed9005 100644 --- a/mdk-stage1/rp-pppoe/gui/wrapper.c +++ b/mdk-stage1/rp-pppoe/gui/wrapper.c @@ -11,7 +11,7 @@ ***********************************************************************/ static char const RCSID[] = -"$Id$"; +"$Id: wrapper.c 195724 2001-06-11 13:49:39Z gc $"; #define _SVID_SOURCE 1 /* For putenv */ #define _POSIX_SOURCE 1 /* For fileno */ diff --git a/mdk-stage1/rp-pppoe/man/adsl-connect.8 b/mdk-stage1/rp-pppoe/man/adsl-connect.8 index 1b34a74e5..1ace558d0 100644 --- a/mdk-stage1/rp-pppoe/man/adsl-connect.8 +++ b/mdk-stage1/rp-pppoe/man/adsl-connect.8 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: adsl-connect.8 195724 2001-06-11 13:49:39Z gc $ .TH ADSL-CONNECT 8 "21 February 2000" .UC 4 .SH NAME diff --git a/mdk-stage1/rp-pppoe/man/adsl-setup.8 b/mdk-stage1/rp-pppoe/man/adsl-setup.8 index 9e78fa547..f4a620af8 100644 --- a/mdk-stage1/rp-pppoe/man/adsl-setup.8 +++ b/mdk-stage1/rp-pppoe/man/adsl-setup.8 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: adsl-setup.8 195724 2001-06-11 13:49:39Z gc $ .TH ADSL-SETUP 8 "21 February 2000" .UC 4 .SH NAME diff --git a/mdk-stage1/rp-pppoe/man/adsl-start.8 b/mdk-stage1/rp-pppoe/man/adsl-start.8 index 87250b381..13a23ba14 100644 --- a/mdk-stage1/rp-pppoe/man/adsl-start.8 +++ b/mdk-stage1/rp-pppoe/man/adsl-start.8 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: adsl-start.8 195724 2001-06-11 13:49:39Z gc $ .TH ADSL-START 8 "21 February 2000" .UC 4 .SH NAME diff --git a/mdk-stage1/rp-pppoe/man/adsl-status.8 b/mdk-stage1/rp-pppoe/man/adsl-status.8 index 2114d461e..44f2093e1 100644 --- a/mdk-stage1/rp-pppoe/man/adsl-status.8 +++ b/mdk-stage1/rp-pppoe/man/adsl-status.8 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: adsl-status.8 195724 2001-06-11 13:49:39Z gc $ .TH ADSL-STATUS 8 "16 March 2000" .UC 4 .SH NAME diff --git a/mdk-stage1/rp-pppoe/man/adsl-stop.8 b/mdk-stage1/rp-pppoe/man/adsl-stop.8 index 2ac7fef8e..776d95d12 100644 --- a/mdk-stage1/rp-pppoe/man/adsl-stop.8 +++ b/mdk-stage1/rp-pppoe/man/adsl-stop.8 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: adsl-stop.8 195724 2001-06-11 13:49:39Z gc $ .TH ADSL-STOP 8 "21 February 2000" .UC 4 .SH NAME diff --git a/mdk-stage1/rp-pppoe/man/pppoe-relay.8 b/mdk-stage1/rp-pppoe/man/pppoe-relay.8 index 5f79b09a1..6a458fbd6 100644 --- a/mdk-stage1/rp-pppoe/man/pppoe-relay.8 +++ b/mdk-stage1/rp-pppoe/man/pppoe-relay.8 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: pppoe-relay.8 195724 2001-06-11 13:49:39Z gc $ .TH PPPOE-RELAY 8 "26 January 2001" .\"" .UC 4 diff --git a/mdk-stage1/rp-pppoe/man/pppoe-server.8 b/mdk-stage1/rp-pppoe/man/pppoe-server.8 index aacf11f1f..8e7c3f794 100644 --- a/mdk-stage1/rp-pppoe/man/pppoe-server.8 +++ b/mdk-stage1/rp-pppoe/man/pppoe-server.8 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: pppoe-server.8 195724 2001-06-11 13:49:39Z gc $ .TH PPPOE-SERVER 8 "3 July 2000" .\"" .UC 4 diff --git a/mdk-stage1/rp-pppoe/man/pppoe-sniff.8 b/mdk-stage1/rp-pppoe/man/pppoe-sniff.8 index 431830a22..2568d77f6 100644 --- a/mdk-stage1/rp-pppoe/man/pppoe-sniff.8 +++ b/mdk-stage1/rp-pppoe/man/pppoe-sniff.8 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: pppoe-sniff.8 195724 2001-06-11 13:49:39Z gc $ .TH PPPOE-SNIFF 8 "3 July 2000" .\"" .UC 4 diff --git a/mdk-stage1/rp-pppoe/man/pppoe.8 b/mdk-stage1/rp-pppoe/man/pppoe.8 index 999c3d2ed..831245693 100644 --- a/mdk-stage1/rp-pppoe/man/pppoe.8 +++ b/mdk-stage1/rp-pppoe/man/pppoe.8 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: pppoe.8 195724 2001-06-11 13:49:39Z gc $ .TH PPPOE 8 "3 July 2000" .UC 4 .SH NAME diff --git a/mdk-stage1/rp-pppoe/man/pppoe.conf.5 b/mdk-stage1/rp-pppoe/man/pppoe.conf.5 index 731fd98d4..36c4a388e 100644 --- a/mdk-stage1/rp-pppoe/man/pppoe.conf.5 +++ b/mdk-stage1/rp-pppoe/man/pppoe.conf.5 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: pppoe.conf.5 195724 2001-06-11 13:49:39Z gc $ .\"" .TH PPPOE.CONF 5 "21 February 2000" .UC 4 diff --git a/mdk-stage1/rp-pppoe/scripts/adsl-connect.in b/mdk-stage1/rp-pppoe/scripts/adsl-connect.in index 85dfb3d8d..26b6f0507 100755 --- a/mdk-stage1/rp-pppoe/scripts/adsl-connect.in +++ b/mdk-stage1/rp-pppoe/scripts/adsl-connect.in @@ -8,7 +8,7 @@ # # Copyright (C) 2000 Roaring Penguin Software Inc. # -# $Id$ +# $Id: adsl-connect.in 195724 2001-06-11 13:49:39Z gc $ # # This file may be distributed under the terms of the GNU General # Public License. diff --git a/mdk-stage1/rp-pppoe/scripts/adsl-setup.in b/mdk-stage1/rp-pppoe/scripts/adsl-setup.in index a8c7fa039..98e922378 100755 --- a/mdk-stage1/rp-pppoe/scripts/adsl-setup.in +++ b/mdk-stage1/rp-pppoe/scripts/adsl-setup.in @@ -7,7 +7,7 @@ # # Copyright (C) 2000 Roaring Penguin Software Inc. # -# $Id$ +# $Id: adsl-setup.in 195724 2001-06-11 13:49:39Z gc $ #*********************************************************************** # From AUTOCONF diff --git a/mdk-stage1/rp-pppoe/scripts/adsl-start.in b/mdk-stage1/rp-pppoe/scripts/adsl-start.in index 33251a851..023809eb5 100755 --- a/mdk-stage1/rp-pppoe/scripts/adsl-start.in +++ b/mdk-stage1/rp-pppoe/scripts/adsl-start.in @@ -8,7 +8,7 @@ # # Copyright (C) 2000 Roaring Penguin Software Inc. # -# $Id$ +# $Id: adsl-start.in 195724 2001-06-11 13:49:39Z gc $ # # This file may be distributed under the terms of the GNU General # Public License. diff --git a/mdk-stage1/rp-pppoe/scripts/adsl-status b/mdk-stage1/rp-pppoe/scripts/adsl-status index 18b100ab2..e76a65014 100755 --- a/mdk-stage1/rp-pppoe/scripts/adsl-status +++ b/mdk-stage1/rp-pppoe/scripts/adsl-status @@ -7,7 +7,7 @@ # # Copyright (C) 2000-2001 Roaring Penguin Software Inc. # -# $Id$ +# $Id: adsl-status 195724 2001-06-11 13:49:39Z gc $ # # This file may be distributed under the terms of the GNU General # Public License. diff --git a/mdk-stage1/rp-pppoe/scripts/adsl-stop.in b/mdk-stage1/rp-pppoe/scripts/adsl-stop.in index af0867573..055d08a01 100755 --- a/mdk-stage1/rp-pppoe/scripts/adsl-stop.in +++ b/mdk-stage1/rp-pppoe/scripts/adsl-stop.in @@ -8,7 +8,7 @@ # # Copyright (C) 2000 Roaring Penguin Software Inc. # -# $Id$ +# $Id: adsl-stop.in 195724 2001-06-11 13:49:39Z gc $ # # This file may be distributed under the terms of the GNU General # Public License. diff --git a/mdk-stage1/rp-pppoe/src/Makefile.in b/mdk-stage1/rp-pppoe/src/Makefile.in index 8eee012cb..91322233c 100644 --- a/mdk-stage1/rp-pppoe/src/Makefile.in +++ b/mdk-stage1/rp-pppoe/src/Makefile.in @@ -10,7 +10,7 @@ # This program may be distributed according to the terms of the GNU # General Public License, version 2 or (at your option) any later version. # -# $Id$ +# $Id: Makefile.in 195724 2001-06-11 13:49:39Z gc $ #*********************************************************************** # Version is set ONLY IN THE MAKEFILE! Don't delete this! diff --git a/mdk-stage1/rp-pppoe/src/common.c b/mdk-stage1/rp-pppoe/src/common.c index b6e43996b..0e847fdfd 100644 --- a/mdk-stage1/rp-pppoe/src/common.c +++ b/mdk-stage1/rp-pppoe/src/common.c @@ -14,7 +14,7 @@ ***********************************************************************/ static char const RCSID[] = -"$Id$"; +"$Id: common.c 212191 2005-05-06 06:30:51Z rgarciasuarez $"; #include "pppoe.h" diff --git a/mdk-stage1/rp-pppoe/src/debug.c b/mdk-stage1/rp-pppoe/src/debug.c index 052dca6c7..c279e1197 100644 --- a/mdk-stage1/rp-pppoe/src/debug.c +++ b/mdk-stage1/rp-pppoe/src/debug.c @@ -14,7 +14,7 @@ ***********************************************************************/ static char const RCSID[] = -"$Id$"; +"$Id: debug.c 195724 2001-06-11 13:49:39Z gc $"; #include "pppoe.h" #include <sys/time.h> diff --git a/mdk-stage1/rp-pppoe/src/discovery.c b/mdk-stage1/rp-pppoe/src/discovery.c index fc3568db5..74eeacc3b 100644 --- a/mdk-stage1/rp-pppoe/src/discovery.c +++ b/mdk-stage1/rp-pppoe/src/discovery.c @@ -9,7 +9,7 @@ ***********************************************************************/ static char const RCSID[] = -"$Id$"; +"$Id: discovery.c 195724 2001-06-11 13:49:39Z gc $"; #include "pppoe.h" diff --git a/mdk-stage1/rp-pppoe/src/if.c b/mdk-stage1/rp-pppoe/src/if.c index fec09b273..07203b116 100644 --- a/mdk-stage1/rp-pppoe/src/if.c +++ b/mdk-stage1/rp-pppoe/src/if.c @@ -14,7 +14,7 @@ ***********************************************************************/ static char const RCSID[] = -"$Id$"; +"$Id: if.c 195724 2001-06-11 13:49:39Z gc $"; #include "pppoe.h" diff --git a/mdk-stage1/rp-pppoe/src/plugin.c b/mdk-stage1/rp-pppoe/src/plugin.c index d1097e291..aefa0ca6f 100644 --- a/mdk-stage1/rp-pppoe/src/plugin.c +++ b/mdk-stage1/rp-pppoe/src/plugin.c @@ -22,7 +22,7 @@ ***********************************************************************/ static char const RCSID[] = -"$Id$"; +"$Id: plugin.c 195724 2001-06-11 13:49:39Z gc $"; #define _GNU_SOURCE 1 #include "pppoe.h" diff --git a/mdk-stage1/rp-pppoe/src/ppp.c b/mdk-stage1/rp-pppoe/src/ppp.c index 72020a76c..ffd2c835e 100644 --- a/mdk-stage1/rp-pppoe/src/ppp.c +++ b/mdk-stage1/rp-pppoe/src/ppp.c @@ -14,7 +14,7 @@ ***********************************************************************/ static char const RCSID[] = -"$Id$"; +"$Id: ppp.c 195724 2001-06-11 13:49:39Z gc $"; #include "pppoe.h" diff --git a/mdk-stage1/rp-pppoe/src/pppoe-server.c b/mdk-stage1/rp-pppoe/src/pppoe-server.c index e43e63553..b53952b81 100644 --- a/mdk-stage1/rp-pppoe/src/pppoe-server.c +++ b/mdk-stage1/rp-pppoe/src/pppoe-server.c @@ -9,12 +9,12 @@ * This program may be distributed according to the terms of the GNU * General Public License, version 2 or (at your option) any later version. * -* $Id$ +* $Id: pppoe-server.c 195724 2001-06-11 13:49:39Z gc $ * ***********************************************************************/ static char const RCSID[] = -"$Id$"; +"$Id: pppoe-server.c 195724 2001-06-11 13:49:39Z gc $"; #include "config.h" diff --git a/mdk-stage1/rp-pppoe/src/pppoe-sniff.c b/mdk-stage1/rp-pppoe/src/pppoe-sniff.c index aa796547b..8a11b05c2 100644 --- a/mdk-stage1/rp-pppoe/src/pppoe-sniff.c +++ b/mdk-stage1/rp-pppoe/src/pppoe-sniff.c @@ -13,7 +13,7 @@ ***********************************************************************/ static char const RCSID[] = -"$Id$"; +"$Id: pppoe-sniff.c 195724 2001-06-11 13:49:39Z gc $"; #include "pppoe.h" diff --git a/mdk-stage1/rp-pppoe/src/pppoe.c b/mdk-stage1/rp-pppoe/src/pppoe.c index 26cb4b07b..8d383d38c 100644 --- a/mdk-stage1/rp-pppoe/src/pppoe.c +++ b/mdk-stage1/rp-pppoe/src/pppoe.c @@ -12,7 +12,7 @@ ***********************************************************************/ static char const RCSID[] = -"$Id$"; +"$Id: pppoe.c 224882 2007-07-16 22:03:12Z blino $"; #include "pppoe.h" diff --git a/mdk-stage1/rp-pppoe/src/pppoe.h b/mdk-stage1/rp-pppoe/src/pppoe.h index da300c17d..21e58ca99 100644 --- a/mdk-stage1/rp-pppoe/src/pppoe.h +++ b/mdk-stage1/rp-pppoe/src/pppoe.h @@ -9,7 +9,7 @@ * This program may be distributed according to the terms of the GNU * General Public License, version 2 or (at your option) any later version. * -* $Id$ +* $Id: pppoe.h 195724 2001-06-11 13:49:39Z gc $ * ***********************************************************************/ diff --git a/mdk-stage1/rp-pppoe/src/relay.c b/mdk-stage1/rp-pppoe/src/relay.c index 9738cb8a8..c42669b05 100644 --- a/mdk-stage1/rp-pppoe/src/relay.c +++ b/mdk-stage1/rp-pppoe/src/relay.c @@ -9,11 +9,11 @@ * This program may be distributed according to the terms of the GNU * General Public License, version 2 or (at your option) any later version. * -* $Id$ +* $Id: relay.c 195724 2001-06-11 13:49:39Z gc $ * ***********************************************************************/ static char const RCSID[] = -"$Id$"; +"$Id: relay.c 195724 2001-06-11 13:49:39Z gc $"; #define _GNU_SOURCE 1 /* For SA_RESTART */ diff --git a/mdk-stage1/rp-pppoe/src/relay.h b/mdk-stage1/rp-pppoe/src/relay.h index d438a657f..232357a31 100644 --- a/mdk-stage1/rp-pppoe/src/relay.h +++ b/mdk-stage1/rp-pppoe/src/relay.h @@ -9,7 +9,7 @@ * This program may be distributed according to the terms of the GNU * General Public License, version 2 or (at your option) any later version. * -* $Id$ +* $Id: relay.h 195724 2001-06-11 13:49:39Z gc $ * ***********************************************************************/ diff --git a/mdk-stage1/usb-resource/Makefile b/mdk-stage1/usb-resource/Makefile index 9c192920c..24dc14e40 100644 --- a/mdk-stage1/usb-resource/Makefile +++ b/mdk-stage1/usb-resource/Makefile @@ -1,6 +1,6 @@ #****************************************************************************** # - # $Id$ + # $Id: Makefile 253685 2009-03-06 14:27:29Z tv $ # # Guillaume Cottenceau (gc@mandriva.com) # diff --git a/perl-install/NEWS b/perl-install/NEWS index 865a00399..04322d5bb 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,12 @@ +- Change text to grey +- Remove mandriva occurencies +- Rename $mandrake_release and mandrake_release_info() functions +- cpufreq: add support for Athlon/Phenom II processors (#58477) + +Version 13.39 - 24 November 2010 +- fix use of arrays as a reference +- install static device symlinks under /lib/udev/devices (Andrey Borzenkov) + Version 13.35 - 22 June 2010 - add scrollbar to partitionning wizard if needed diff --git a/perl-install/PORTING b/perl-install/PORTING new file mode 100644 index 000000000..68f3d5e9f --- /dev/null +++ b/perl-install/PORTING @@ -0,0 +1,4 @@ +This file list the API changes done in mageia: + +The function mandrake_release_info() is now called mageia_release_info(). +The function mandrake_release is now called mageia_release(). diff --git a/perl-install/any.pm b/perl-install/any.pm index 48a610b27..c9fcbae66 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1,4 +1,4 @@ -package any; # $Id$ +package any; # $Id: any.pm 270668 2010-08-19 16:10:50Z nanardon $ use diagnostics; use strict; @@ -616,7 +616,7 @@ sub setupBootloader__entries { my @entries = @{$b->{entries}}; my ($index) = grep { $entries[$_]{label} eq $e->{label} } 0..$#entries; if ($index > 0) { - (@{$b->{entries}}->[$index - 1], @{$b->{entries}}->[$index]) = (@{$b->{entries}}->[$index], @{$b->{entries}}->[$index - 1]); + ($b->{entries}->[$index - 1], $b->{entries}->[$index]) = ($b->{entries}->[$index], $b->{entries}->[$index - 1]); } 1; }; @@ -626,7 +626,7 @@ sub setupBootloader__entries { my @entries = @{$b->{entries}}; my ($index) = grep { $entries[$_]{label} eq $e->{label} } 0..$#entries; if ($index < $#entries) { - (@{$b->{entries}}->[$index + 1], @{$b->{entries}}->[$index]) = (@{$b->{entries}}->[$index], @{$b->{entries}}->[$index + 1]); + ($b->{entries}->[$index + 1], $b->{entries}->[$index]) = ($b->{entries}->[$index], $b->{entries}->[$index + 1]); } 1; }; @@ -1130,7 +1130,7 @@ sub selectLanguage_install { my $non_utf8 = 0; add2hash($common, { cancel => '', focus_first => 1, - advanced_messages => formatAlaTeX(N("Mandriva Linux can support multiple languages. Select + advanced_messages => formatAlaTeX(N("Mageia Linux can support multiple languages. Select the languages you would like to install. They will be available when your installation is complete and you restart your system.")), advanced_label => N("Multi languages"), diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm index 25022963d..4e6ae2ce9 100644 --- a/perl-install/authentication.pm +++ b/perl-install/authentication.pm @@ -1,4 +1,4 @@ -package authentication; # $Id$ +package authentication; # $Id: authentication.pm 269894 2010-06-05 20:50:23Z tv $ use common; diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 52ecdc89f..e1e107db8 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1,4 +1,4 @@ -package bootloader; # $Id$ +package bootloader; # $Id: bootloader.pm 267511 2010-04-12 12:34:45Z cfergeau $ use diagnostics; use strict; @@ -43,9 +43,9 @@ sub vmlinuz2kernel_str { { basename => $basename, version => $version, - $version =~ /([\d.]*)-(\D.*)-((\d+|0\.rc\d+.*)(mdk|mdv|mnb))$/ ? #- eg: 2.6.22.5-server-1mdv + $version =~ /([\d.]*)-(\D.*)-((\d+|0\.rc\d+.*)mga)$/ ? #- eg: 2.6.22.5-server-1mdv (ext => $2, version_no_ext => "$1-$3") : - $version =~ /(.*md[kv])-?(.*)/ ? #- (old) eg: 2.6.17-13mdventerprise + $version =~ /(.*mga)-?(.*)/ ? #- (old) eg: 2.6.17-13mdventerprise (ext => $2, version_no_ext => $1) : (version_no_ext => $version), }; } @@ -1007,7 +1007,7 @@ sub suggest { { defaultos => "linux", entries => [], - 'init-message' => "Welcome to Mandriva Linux!", + 'init-message' => "Welcome to %s!", delay => 30, #- OpenFirmware delay timeout => 50, enableofboot => 1, @@ -1943,7 +1943,7 @@ sub ensure_pkg_is_installed { if ($main_method eq 'grub' || $main_method eq 'lilo') { $do_pkgs->ensure_binary_is_installed($main_method, $main_method, 1) or return 0; if ($bootloader->{method} eq 'grub-graphic') { - $do_pkgs->ensure_is_installed('mandriva-gfxboot-theme', '/usr/share/gfxboot/themes/Mandriva/boot/message', 1) or return 0; + $do_pkgs->ensure_is_installed('mageia-gfxboot-theme', '/usr/share/gfxboot/themes/Mageia/boot/message', 1) or return 0; } } 1; diff --git a/perl-install/bootsplash.pm b/perl-install/bootsplash.pm index 4ed2ea1bb..5539c0b98 100644 --- a/perl-install/bootsplash.pm +++ b/perl-install/bootsplash.pm @@ -8,7 +8,7 @@ my $themes_dir = "/usr/share/bootsplash/themes"; my $themes_config_dir = "/etc/bootsplash/themes"; my $sysconfig_file = "/etc/sysconfig/bootsplash"; my $bootsplash_scripts = "/usr/share/bootsplash/scripts"; -my $default_theme = 'Mandrivalinux'; +my $default_theme = 'Mageialinux'; our $default_thumbnail = '/usr/share/libDrakX/pixmaps/nosplash_thumb.png'; our @resolutions = uniq(map { "$_->{X}x$_->{Y}" } Xconfig::resolution_and_depth::bios_vga_modes()); diff --git a/perl-install/c.pm b/perl-install/c.pm index f1904ebc4..31d4863b3 100644 --- a/perl-install/c.pm +++ b/perl-install/c.pm @@ -1,4 +1,4 @@ -package c; # $Id$ +package c; # $Id: c.pm 210307 2004-12-13 15:56:00Z tvignaud $ use vars qw($AUTOLOAD); diff --git a/perl-install/c/Makefile.PL b/perl-install/c/Makefile.PL index 8cb2524c9..8cb2524c9 100644..100755 --- a/perl-install/c/Makefile.PL +++ b/perl-install/c/Makefile.PL diff --git a/perl-install/c/stuff.pm b/perl-install/c/stuff.pm index 37e0c9a3b..e9cdbc3bd 100644 --- a/perl-install/c/stuff.pm +++ b/perl-install/c/stuff.pm @@ -1,4 +1,4 @@ -package c::stuff; # $Id$ +package c::stuff; # $Id: stuff.pm 214710 2005-12-15 09:14:01Z prigaux $ use strict; use vars qw($VERSION @ISA); diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl index cd2c6bf03..cd2c6bf03 100644..100755 --- a/perl-install/c/stuff.xs.pl +++ b/perl-install/c/stuff.xs.pl diff --git a/perl-install/common.pm b/perl-install/common.pm index 3eb223cd5..2806e1103 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -1,4 +1,4 @@ -package common; # $Id$ +package common; # $Id: common.pm 245955 2008-09-18 14:19:04Z pixel $ use MDK::Common; use diagnostics; @@ -10,7 +10,7 @@ use run_program; use Exporter; our @ISA = qw(Exporter); -our @EXPORT = qw($SECTORSIZE N P N_ check_for_xserver files_exist formatTime MB formatXiB get_parent_uid is_running makedev mandrake_release mandrake_release_info removeXiBSuffix require_root_capability setVirtual set_alternative set_l10n_sort set_permissions to_utf8 translate unmakedev); +our @EXPORT = qw($SECTORSIZE N P N_ check_for_xserver files_exist formatTime MB formatXiB get_parent_uid is_running makedev mageia_release mageia_release_info removeXiBSuffix require_root_capability setVirtual set_alternative set_l10n_sort set_permissions to_utf8 translate unmakedev); # perl_checker: RE-EXPORT-ALL push @EXPORT, @MDK::Common::EXPORT; @@ -344,14 +344,14 @@ sub parse_release_file { sub release_file { my ($o_dir) = @_; - my @names = ('mandrakelinux-release', 'mandrake-release', 'conectiva-release', 'release', 'redhat-release', 'fedora-release', 'SuSE-release'); + my @names = ('mageia-release', 'mandrakelinux-release', 'mandrake-release', 'conectiva-release', 'release', 'redhat-release', 'fedora-release', 'SuSE-release'); find { -r "$o_dir$_" } ( (map { "/root/drakx/$_.upgrading" } @names), (map { "/etc/$_" } @names), ); } -sub mandrake_release_info() { +sub mageia_release_info() { parse_LDAP_namespace_structure(cat_('/etc/product.id')); } @@ -361,7 +361,7 @@ sub parse_LDAP_namespace_structure { \%h; } -sub mandrake_release { +sub mageia_release { my ($o_dir) = @_; my $f = release_file($o_dir); $f && chomp_(cat_("$o_dir$f")); diff --git a/perl-install/cpufreq.pm b/perl-install/cpufreq.pm index 54710fd05..17a39b25e 100644 --- a/perl-install/cpufreq.pm +++ b/perl-install/cpufreq.pm @@ -109,9 +109,11 @@ sub probe_powernow_k7() { sub probe_powernow_k8() { any { - get_vendor($_) eq "AMD" && - $_->{'cpu family'} == 15 && - ($_->{'power management'} =~ /\bfid\b/ || has_flag($_, 'fid')); # frequency ID control + get_vendor($_) eq "AMD" && ( + ( $_->{'cpu family'} == 15 && ($_->{'power management'} =~ /\bfid\b/ || has_flag($_, 'fid')) ) # frequency ID control) + || + ( $_->{'cpu family'} == 16 && ($_->{'power management'} =~ /\bhwpstate\b/ )) # support for Athlon/Phenom II processors (#58477)) + ); } get_cpus(); } diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 9818745c1..42f14aff6 100644 --- a/perl-install/detect_devices.pm +++ b/ |
