From 471cd34ea4ee6d7fe394845ad0ae002139e31afd Mon Sep 17 00:00:00 2001 From: Marja van Waes Date: Wed, 17 Apr 2013 17:54:03 +0000 Subject: updated and 2 new English files from Calenco --- Makefile | 9 +- NEWS | 8 + add_supplemental_media.html | 66 ++++++++ chooseDesktop.html | 2 +- configureNetwork.html | 50 ------ doPartitionDisks.html | 36 +++-- formatPartitions.html | 2 +- index.html | 22 ++- media_selection.html | 77 +++++++++ misc-params.html | 5 +- setRootPassword.html | 50 ------ setupBootloader.html | 94 +++++------ setupBootloaderAddEntry.html | 2 +- setupBootloaderExpert.html | 361 ------------------------------------------- setupYabootAddEntry.html | 47 ------ setupYabootGeneral.html | 47 ------ summary.html | 47 ------ 17 files changed, 231 insertions(+), 694 deletions(-) create mode 100644 add_supplemental_media.html delete mode 100644 configureNetwork.html create mode 100644 media_selection.html delete mode 100644 setRootPassword.html delete mode 100644 setupBootloaderExpert.html delete mode 100644 setupYabootAddEntry.html delete mode 100644 setupYabootGeneral.html delete mode 100644 summary.html diff --git a/Makefile b/Makefile index 29f1d63..0a13b87 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,12 @@ PACKAGE = drakx-installer-help VERSION = 3.3 HTML_FILES = acceptLicense.html \ + add_supplemental_media.html\ addUser.html \ ask_mntpoint_s.html \ chooseDesktop.html \ choosePackageGroups.html \ - choosePackages.html \ choosePackagesTree.html \ - configureNetwork.html \ configureServices.html \ configureTimezoneUTC.html \ configureX_card_list.html \ @@ -21,6 +20,7 @@ HTML_FILES = acceptLicense.html \ index.html \ installer.html \ installUpdates.html \ + media_selection.html\ minimal-install.html \ misc-params.html \ resizeFATChoose.html \ @@ -32,13 +32,8 @@ HTML_FILES = acceptLicense.html \ selectMouse.html \ setRootPassword.html \ setupBootloaderAddEntry.html \ - setupBootloaderBeginner.html \ - setupBootloaderExpert.html \ setupBootloader.html \ setupSCSI.html \ - setupX.html \ - setupYabootAddEntry.html \ - setupYabootGeneral.html \ summary.html \ takeOverHdChoose.html \ takeOverHdConfirm.html diff --git a/NEWS b/NEWS index 0dcea3e..88aff2f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ + + + +- Removed files: setupYabootAddEntry, setRootPassword, setupBootloaderBeginner, +choosePackages, setupBootloaderExpert, setupX, setupYabootGeneral, +configureNetwork, summary +- Added files: add_supplemental_media, media_selection, + * Thu Dec 27 2012 Kamil Rytarowski 3.3 - Calenco updates for all languages - New files: chooseDesktop, choosePackageGroups, choosePackagesTree, diff --git a/add_supplemental_media.html b/add_supplemental_media.html new file mode 100644 index 0000000..2a0be9a --- /dev/null +++ b/add_supplemental_media.html @@ -0,0 +1,66 @@ + + + + + Media Selection (Configure Supplemental Installation Media) + + + + + + +
+
+
+
+

Media Selection (Configure Supplemental Installation Media) +

+
+
+
+ + + + + + + + + +

This screen gives you the list of already recognized repositories. You + can add other sources for packages, like an optical disc or a remote + source. The source selection determines which packages will be available for + selection during the next steps. +

+ + +

For a network source, there are two steps to follow:

+ + +
+
    +
  1. + +

    Choosing and activation of the network, if not already up.

    + +
  2. +
  3. + +

    Selecting a mirror or specifying a URL (very first entry). By + selecting a mirror, you have access to the selection of all repositories + managed by Mageia, like the non-free , the tainted repositories and the + updates. With the URL, you can designate a specific repository or your + own NFS installation. +

    + +
  4. +
+
+ +
+ + diff --git a/chooseDesktop.html b/chooseDesktop.html index bb76dc3..dff9fa5 100644 --- a/chooseDesktop.html +++ b/chooseDesktop.html @@ -6,7 +6,7 @@ - + - -
-
-
-
-

configureNetwork -

-
-
-
- - - - - - - - - - -

This page is configureNetwork -

- - -

Clicking which help button leads to this page? -

- - -

.... -

- - - -
- - diff --git a/doPartitionDisks.html b/doPartitionDisks.html index fdb9112..f4b6907 100644 --- a/doPartitionDisks.html +++ b/doPartitionDisks.html @@ -28,13 +28,19 @@ - + + + + + + + @@ -170,21 +176,27 @@ - -

If you have a SSD (Solid State Drive) instead of a hard disk, at - the time this help was written, it was inadvisable to create the - partitions with this tool because they would not be aligned. The SSD - would work but with reduced speed and lifetime. Use a partitioning tool - such as Gparted instead with these partition alignment settings for each - partition : + +

Some newer drives are now using 4096 byte logical sectors, instead + of the previous standard of 512 byte logical sectors. Due to lack of + available hardware, the partitioning tool used in the installer has not + been tested with such a drive. Also some ssd drives now use an erase block + size over 1 MB. We suggest to pre-partition the drive, using an + alternative partitioning tool like gparted, if you own such a device, and + to use the following settings:

- -

Free space preceding (MiB) : 2

+ +

"Align to" "MiB"

+ + +

"Free space preceding (MiB)" "2"

- -

Round to cylinders : unchecked

+

Also make sure all partitions are created with an even number of + megabytes. +

+ diff --git a/formatPartitions.html b/formatPartitions.html index 5af30c8..d64dd92 100644 --- a/formatPartitions.html +++ b/formatPartitions.html @@ -7,7 +7,7 @@ - + +
+
+
+
+

Media Selection (Nonfree) +

+
+
+
+ + + + + + + + + + +

Here you have the list of available repositories. Not all repositories + are available, according to which media you use for installing. The + repositories selection determines which packages will be available for + selection during the next steps. +

+ + +
+
    +
  • + +

    The Core repository cannot be disabled as it + contains the base of the distribution. +

    + +
  • +
  • + +

    The Non-free repository includes packages + that are free-of-charge, i.e. Mageia may redistribute them, but they + contain closed-source software (hence the name - Nonfree). For example + this repository includes nVidia and ATI graphics card proprietary + drivers, firmware for various WiFi cards, etc. +

    + +
  • +
  • + +

    The Tainted repository includes packages + released under a free license. The main criteria for placing packages in + this repository is that they may infringe patents and copyright laws + in some countries, e.g. Multimedia codecs needed to play various + audio/video files; packages needed to play commercial video DVD, + etc. +

    + +
  • +
+
+ +
+ + diff --git a/misc-params.html b/misc-params.html index 380f41b..992e5a7 100644 --- a/misc-params.html +++ b/misc-params.html @@ -6,7 +6,7 @@ - + - -
-
-
-
-

setRootPassword -

-
-
-
- - - - - - - - - - -

This page is setRootPassword -

- - -

Clicking which help button leads to this page? -

- - -

.... -

- - - -
- - diff --git a/setupBootloader.html b/setupBootloader.html index 3f3ed49..5d113b5 100644 --- a/setupBootloader.html +++ b/setupBootloader.html @@ -17,13 +17,11 @@
-

Bootloader main - options +

Bootloader main options

- @@ -31,16 +29,16 @@ -

If you prefer - different bootloader settings to those chosen automatically by the - installer, you can change them here. +

If you prefer different + bootloader settings to those chosen automatically by the installer, you can + change them here.

-

You may already have - another operating system on your machine, in which case you need to decide - whether to add Mageia to your existing bootloader, or allow Mageia to create - a new one. +

You may already have another + operating system on your machine, in which case you need to decide whether + to add Mageia to your existing bootloader, or allow Mageia to create a new + one.

@@ -53,8 +51,8 @@ -

The Mageia - graphical menu is nice :) +

The Mageia graphical menus + are nice :)

@@ -63,11 +61,11 @@ -
+
-

Using the Mageia +

Using a Mageia bootloader

@@ -76,17 +74,15 @@ -

By default Mageia - writes a new GRUB bootloader into the MBR (Master Boot Record) of your +

By default, Mageia writes + a new GRUB (legacy) bootloader into the MBR (Master Boot Record) of your first hard drive. If you already have other operating systems installed, Mageia attempts to add them to your new Mageia boot menu.

-

This works - correctly in the majority of cases for Linux and - Windows® - systems. +

Mageia now also offers GRUB2 as an optional bootloader + in addition to GRUB legacy and Lilo.

@@ -99,24 +95,14 @@ -

Linux systems - which use the GRUB2 bootloader (e.g. more recent Debian/Ubuntu - derivatives) are not currently supported and will not be recognised. One - possible solution for this is to follow the steps explained here the section called “Adding a GRUB2 based system - manually” before installing Mageia next to such a - system, however there is no guarantee. +

Linux systems which use + the GRUB2 bootloader are not currently supported by GRUB (legacy) and + will not be recognised if the default GRUB bootloader is used.

-

If you are - already installing Mageia without having taken those steps, (and do not - already know the GRUB2 version and/or it's root partition) then install - the Mageia bootloader in the root partition for now (see next section), - and inspect your GRUB2 based system after rebooting at the end of the - installation. Note that you will not yet be able to boot Mageia, however - you will be able to use the Mageia install DVD to perform a quick - "upgrade install" at a later date to correctly install the bootloader to - the MBR. +

The best solution here is to use the GRUB2 bootloader + which is available at the Summary page during installation.

@@ -140,23 +126,23 @@ -

If you decide to - use an existing bootloader then you will need to remember to STOP at the - summary page during the installation and click the Bootloader +

If you decide to use an + existing bootloader then you will need to remember to STOP at the summary + page during the installation and click the Bootloader Configure button, which will allow you to change the bootloader install location.

-

Do not select a - device e.g."sda", or you will overwrite your existing MBR. You must select - the root partition that you chose during the partitioning phase earlier - e.g. sda7. +

Do not select a device + e.g."sda", or you will overwrite your existing MBR. You must select the + root partition that you chose during the partitioning phase earlier, e.g. + sda7.

-

To be clear, sda - is a device, sda7 is a partition. +

To be clear, sda is a + device, sda7 is a partition on that device.

@@ -169,8 +155,8 @@ -

Go to tty2 - with Ctrl+Alt+F2 and type df to check where your +

Go to tty2 with + Ctrl+Alt+F2 and type df to check where your / (root) partition is. Ctrl+Alt+F7 takes you back to the installer screen.

@@ -181,12 +167,12 @@
-

The exact - procedure for adding your Mageia system to an existing bootloader is - beyond the scope of this help, however in most cases it will involve - running the relevant bootloader installation program which should detect - and add it automatically. See the documentation for the operating system - in question. +

The exact procedure for + adding your Mageia system to an existing bootloader is beyond the scope of + this help, however in most cases it will involve running the relevant + bootloader installation program which should detect and add it + automatically. See the documentation for the operating system in + question.

@@ -205,8 +191,8 @@ -

If you have very - limited disk space for the / partition that contains +

If you have very limited + disk space for the / partition that contains /tmp, click on Advanced and check the box for Clean /tmp at each boot. This helps to maintain some free space. diff --git a/setupBootloaderAddEntry.html b/setupBootloaderAddEntry.html index 06e95ff..14cfa09 100644 --- a/setupBootloaderAddEntry.html +++ b/setupBootloaderAddEntry.html @@ -7,7 +7,7 @@ - - -

-
-
-
-

Bootloader expert use -

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

If you haven't done so - yet, please read the section called “Bootloader main - options” first. -

- - -
-
-
-
-

Adding a GRUB2 based system - manually -

-
-
-
- - - - -

A GRUB2 based system - may be added to the Mageia boot menu as follows: -

- - -
-
    -
  • - -

    Boot into the - system in question. In order to determine the GRUB2 version run the - following command in a terminal: -

    - - -

    sudo - grub-install --version

    - - -

    or if that - fails try: -

    - - -

    sudo - grub2-install --version

    - -
  • -
  • - -

    If this returns - "GNU GRUB version 0.97" (possibly with a custom suffix), then it is - using GRUB (otherwise called GRUB legacy) not GRUB2 and your system - should be correctly identified by Mageia during installation and added - automatically to the menu. -

    - -
  • -
  • - -

    If this returns - (GRUB) 1.98 or 1.99 or 2.xx, then you are using GRUB2. -

    - - -

    Make a note of - the version and enter this command to identify the root - partition: -

    - - -

    df -h - / |(read; awk '{print $1; exit}')

    - - -

    This will - output something like : -

    - - - - -

    /dev/sdb11

    - - -

    sdb11 is the - root partition - make a note of it. -

    - -
  • -
  • - -

    Now check that - the /boot folder is in the same partition by entering the following - command: -

    - - -

    df -h - /boot |(read; awk '{print $1; exit}')

    - - - - -

    If the /boot - partition is different to the root partition then make a note and use - the /boot partition in the "root" line when editing menu.lst - below. -

    - -
  • -
  • - -

    You can now - shut down the system and install Mageia. -

    - -
  • -
  • - -

    In your new - running Mageia system, open a terminal and as root edit the file - /boot/grub/menu.lst as follows: -

    - -
  • -
  • - -

    To become root - use: -

    - - -

    su - -

    - - -

    (enter root - password) -

    - -
  • -
  • - -

    To open the - file in an editor use: -

    - - -

    kwrite - /boot/grub/menu.lst

    - - -

    (replace - "kwrite" with "gedit" if you are using Gnome) -

    - -
  • -
  • - -

    Add the - following entry for your (e.g. Ubuntu) system, possibly as the second - stanza. The position the item appears in the menu will depend on its - position in the file: -

    - - -

    title - Ubuntu

    - - -

    root - (hd1,10)

    - - -

    kernel - /boot/grub/core.img

    - -
  • -
  • - -
    - - - - - - - - -
    [Note]
    - -

    In the second - line, "hd1" means the second hard drive, the "10" indicates the 11th - partition. Drives and partitions in Mageia's legacy GRUB count from - zero. -

    - - -

    Therefore: -

    - - -

    sdb11 = - (hd1,10)

    - - -

    sda1 - = (hd0,0)

    - -
    -
    - -
  • -
  • - -

    If the GRUB2 - version is 2.xx then change the last line to : -

    - - -

    kernel - /boot/grub/i386-pc/core.img

    - - -

    If you needed - to use "grub2-install" earlier then change "grub" - to "grub2" in the last line. -

    - - -

    If /boot was - on a separate partition, then remove "/boot" from - the last line. -

    - -
  • -
  • - -

    Save the file - and re-boot. You should now see your "Ubuntu" entry in the menu and be - able to boot from it. -

    - -
  • -
-
- -
- - -
-
-
-
-

Using an - existing GRUB2 bootloader -

-
-
-
- - - -

If you didn't read - the general part about using an existing bootloader yet, do so now. See - the section called “Using an - existing bootloader”

- - -
- - - - - - - - -
[Note]
- -

There is a known - bug in OS-prober used during GRUB2 installation in some versions - of Debian/Ubuntu that incorrectly creates grub.cfg when adding Mageia - (or Mandriva) systems. This is simple to work around and details of a - fix can be found in the Mageia forum. Search for "prober", the topic is - "grub problem", post #9 has the information. -

- - -

To make the fix - permanent so that it will survive an Ubuntu kernel update, the Mageia - entry should be added to /etc/grub.d/40_custom

- - -

Stop Press: The bug - is fixed in os-prober-1.53 released on 8th May 2012. So now, upgrading to - the new version in your GRUB2 installation is the preferred solution. -

- -
-
- -
- -
- - diff --git a/setupYabootAddEntry.html b/setupYabootAddEntry.html deleted file mode 100644 index 67b77a2..0000000 --- a/setupYabootAddEntry.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - setupYabootAddEntry - - - - - - -
-
-
-
-

setupYabootAddEntry -

-
-
-
- - - - - - - -

This page is setupYabootAddEntry -

- - -

Clicking which help button leads to this page? -

- - -

.... -

- - - -
- - diff --git a/setupYabootGeneral.html b/setupYabootGeneral.html deleted file mode 100644 index 941ab46..0000000 --- a/setupYabootGeneral.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - setupYabootGeneral - - - - - - -
-
-
-
-

setupYabootGeneral -

-
-
-
- - - - - - - -

This page is setupYabootGeneral -

- - -

Clicking which help button leads to this page? -

- - -

.... -

- - - -
- - diff --git a/summary.html b/summary.html deleted file mode 100644 index 3773518..0000000 --- a/summary.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - summary - - - - - - -
-
-
-
-

summary -

-
-
-
- - - - - - - -

This page is summary -

- - -

Clicking which help button leads to this page? -

- - -

.... -

- - - -
- - -- cgit v1.2.1