[SCM] live-manual branch, debian, updated. debian/3.0_a3-1
Ben Armstrong
synrg at debian.org
Wed May 18 16:58:43 UTC 2011
The following commit has been merged in the debian branch:
commit 6bf312de8eb27cf22f2d10ba153619a510342b14
Author: Ben Armstrong <synrg at debian.org>
Date: Thu Mar 17 18:04:46 2011 -0300
Restructuring and expanding The Basics to focus more on using images.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index f29cbeb..ca81b17 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
:license: 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 3 of the License, or (at your option) any later version.<br><br>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.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-03-13
+ :published: 2011-03-17
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index e385a53..a097a47 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -5,14 +5,14 @@
This chapter contains a brief overview of the build process and instructions
for using the three most commonly used image types. The most versatile image
type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
-portable storage device. In certain special cases, #{usb-hdd}# may be more
-suitable for USB devices. The chapter finishes with instructions for
-building and using a #{net}# type image, which is a bit more involved due to
-the setup required on the server. This is a slightly advanced topic for
-anyone who is not familiar already with netbooting, but is included here
-because once the setup is done, it is a very convenient way to test and
-deploy images for booting on the local network without the hassle of dealing
-with image media.
+portable storage device. In certain special cases, such as the use of
+persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter
+finishes with instructions for building and using a #{net}# type image,
+which is a bit more involved due to the setup required on the server. This
+is a slightly advanced topic for anyone who is not familiar already with
+netbooting, but is included here because once the setup is done, it is a
+very convenient way to test and deploy images for booting on the local
+network without the hassle of dealing with image media.
2~ What is a live system?
@@ -52,16 +52,16 @@ You can use live-build to build the system image from your specifications,
set up a Linux kernel, its initrd, and a bootloader to run them, all in one
media-dependant format (ISO9660 image, disk image, etc.).
-2~ First steps: building an ISO image
+2~ First steps: building an ISO hybrid image
-The following sequence of live-build commands will create a basic ISO hybrid
-image containing just the Debian standard system without X.org. It is
-suitable for burning to CD or DVD media, and also to copy onto a USB stick
-(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image,
-specifying ".iso" extension where ".img" is indicated).
+Regardless of the image type, you will need to perform the same basic steps
+to build an image each time. As a first example, execute the following
+sequence of live-build commands to create a basic ISO hybrid image
+containing just the Debian standard system without X.org. It is suitable for
+burning to CD or DVD media, and also to copy onto a USB stick.
-First, we run the #{lb config}# command which will create a "config/"
-hierarchy in the current directory for use by other commands:
+First, run the #{lb config}# command. This will create a "config/" hierarchy
+in the current directory for use by other commands:
code{
@@ -69,10 +69,11 @@ code{
}code
-By passing no parameters to #{lb config}#, we indicated that we wish to use
-the defaults (see {The lb config command}#lb-config).
+No parameters are passed to #{lb config}#, so defaults for all of its
+various options will be used. See {The lb config command}#lb-config for more
+details.
-Now that we have a "config/" hierarchy, we may build the image with the #{lb
+Now that the "config/" hierarchy exists, build the image with the #{lb
build}# command:
code{
@@ -82,55 +83,146 @@ code{
}code
This process can take a while, depending on the speed of your network
-connection (see {The lb build command}#lb-build).
+connection. When it is complete, there should be a #{binary-hybrid.iso}#
+image file, ready to use, in the current directory.
+
+2~ Using an ISO hybrid live image
-3~testing-iso-with-qemu Testing an ISO image with Qemu
+After either building or downloading an ISO hybrid image, which can be
+obtained at http://www.debian.org/CD/live/, the usual next step is to
+prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or
+a USB stick.
-Testing an ISO is simple:
+3~burning-iso-image Burning an ISO image to a physical medium
+
+Burning an ISO image is easy:
code{
- # apt-get install qemu
+ # apt-get install wodim
- $ qemu -cdrom binary.iso
+ $ wodim binary-hybrid.iso
}code
-3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
+3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick
-In order to test the ISO with virtualbox-ose:
+ISO images prepared with the #{isohybrid}# command, like the images produced
+by live-build's default #{iso-hybrid}# binary image type, can be copied to a
+USB stick and directly booted without further steps. Plug in a USB stick
+with a size larger than that of #{binary-hybrid.iso}# and determine which
+device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the
+device file of your key, such as #{/dev/sdb}#, not a partition, such as
+#{/dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s
+output after plugging in the stick, or better yet, #{ls -l
+/dev/disk/by-id}#.
-code{
+*{This will definitely overwrite any previous contents on your stick!}*
- # apt-get install virtualbox-ose virtualbox-ose-dkms
+Once you are certain you have the correct device name, use the #{dd}#
+command to copy the image to the stick as follows:
- $ virtualbox
+code{
+
+ $ dd if=binary-hybrid.iso of=${USBSTICK}
}code
-Create a new virtual machine, change the storage settings to use binary.iso
-as the CD/DVD device, and start the machine.
-Note: For live systems containing X.org that you want to test with
-virtualbox-ose, you may wish to include the VirtualBox X.org driver package,
-virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the
-resolution is limited to 800x600.
+3~ Booting the live media
+
+The first time you boot your live media, whether CD, DVD, USB key, or PXE
+boot, some setup in your computer's BIOS may be needed first. Since BIOSes
+vary greatly in features and key bindings, we cannot get into the topic in
+depth here. Some BIOSes provide a key to bring up a menu of boot devices at
+boot time, which is the easiest way if it is available on your
+system. Otherwise, you need to enter the BIOS configuration menu and change
+the boot order to place the boot device for the live system before your
+normal boot device.
+
+Once you've booted the media, you are presented with a boot menu. If you
+just press enter here, the system will boot using the default entry,
+#{Live}# and default options. For more information about boot options, see
+the "help" entry in the menu and also the #{live-boot}# and #{live-config}#
+man pages found within the live system.
+
+Assuming you've selected #{Live}# and booted a default desktop live image,
+after the boot messages scroll by, you should be automatically logged into
+the #{user}# account and see a desktop, ready to use. If you've booted a
+console-only image, such as #{standard}# or #{rescue}# flavour prebuilt
+images, you should be automatically logged in on the console to the #{user}#
+account and see a shell prompt, ready to use.
+
+2~ Using a virtual machine for testing
+
+It can be a great time-saver for the development of live images to run them
+in a virtual machine (VM). This is not without its caveats:
+
+_* Running a VM requires enough RAM for both the guest OS and the host and a
+CPU with hardware support for virtualization is recommended.
+
+_* There are some inherent limitations to running on a VM, e.g. poor video
+performance, limited choice of emulated hardware.
+
+_* When developing for specific hardware, there is no substitute for running
+on the hardware itself.
+
+_* Occasionally there are bugs that relate only to running in a VM. When in
+doubt, test your image directly on the hardware.
+
+Provided you can work within these constraints, survey the available VM
+software and choose one that is suitable for your needs.
+
+3~testing-iso-with-qemu Testing an ISO image with QEMU
+
+The most versatile VM in Debian is QEMU. If your processor has hardware
+support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}#
+package description briefly lists the requirements.
+
+First, install #{qemu-kvm}# if your processor supports it. If not, install
+#{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in
+the following examples. The #{qemu-utils}# package is also valuable for
+creating virtual disk images with #{qemu-img}#.
code{
- $ lb config --packages virtualbox-ose-guest-x11
+ # apt-get install qemu-kvm qemu-utils
}code
-3~burning-iso-image Burning an ISO image to a physical medium
+Booting an ISO image is simple:
-Burning an ISO image is easy:
+code{
+
+ $ kvm -cdrom binary-hybrid.iso
+
+}code
+
+See the man pages for more details.
+
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
+
+In order to test the ISO with virtualbox-ose:
code{
- # apt-get install wodim
+ # apt-get install virtualbox-ose virtualbox-ose-dkms
- $ wodim binary.iso
+ $ virtualbox
+
+}code
+
+Create a new virtual machine, change the storage settings to use
+binary-hybrid.iso as the CD/DVD device, and start the machine.
+
+Note: For live systems containing X.org that you want to test with
+#{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver
+package, #{virtualbox-ose-guest-x11}#, in your live-build
+configuration. Otherwise, the resolution is limited to 800x600.
+
+code{
+
+ $ lb config --packages virtualbox-ose-guest-x11
}code
@@ -173,6 +265,9 @@ code{
3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
+% FIXME: eliminate duplication with ISO hybrid, as these are virtually the
+same instructions!
+
The generated binary image contains a VFAT partition and the syslinux
bootloader, ready to be directly written on a USB stick. Plug in a USB stick
with a size larger than that of binary.img and type:
diff --git a/manual/de/user_overview.ssi b/manual/de/user_overview.ssi
index 4eeb593..9e81818 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/de/user_overview.ssi
@@ -121,8 +121,8 @@ A full list of options is available in the #{lb_config}# man page.
3~lb-build The #{lb build}# command
The #{lb build}# command reads in your configuration from the config/
-directory. It then runs the lower lower level commands needed to build your
-Live system.
+directory. It then runs the lower level commands needed to build your Live
+system.
3~lb-clean The #{lb clean}# command
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 0312db5..4d25f00 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
:license: 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 3 of the License, or (at your option) any later version.<br><br>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.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-03-13
+ :published: 2011-03-17
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index f554847..ab6ce8a 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -2,7 +2,7 @@
1~the-basics The basics
-This chapter contains a brief overview of the build process and instructions for using the three most commonly used image types. The most versatile image type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB portable storage device. In certain special cases, #{usb-hdd}# may be more suitable for USB devices. The chapter finishes with instructions for building and using a #{net}# type image, which is a bit more involved due to the setup required on the server. This is a slightly advanced topic for anyone who is not familiar already with netbooting, but is included here because once the setup is done, it is a very convenient way to test and deploy images for booting on the local network without the hassle of dealing with image media.
+This chapter contains a brief overview of the build process and instructions for using the three most commonly used image types. The most versatile image type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB portable storage device. In certain special cases, such as the use of persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter finishes with instructions for building and using a #{net}# type image, which is a bit more involved due to the setup required on the server. This is a slightly advanced topic for anyone who is not familiar already with netbooting, but is included here because once the setup is done, it is a very convenient way to test and deploy images for booting on the local network without the hassle of dealing with image media.
2~ What is a live system?
@@ -20,11 +20,11 @@ _* *{Bootloader}*: A small piece of code crafted to boot from the chosen media,
You can use live-build to build the system image from your specifications, set up a Linux kernel, its initrd, and a bootloader to run them, all in one media-dependant format (ISO9660 image, disk image, etc.).
-2~ First steps: building an ISO image
+2~ First steps: building an ISO hybrid image
-The following sequence of live-build commands will create a basic ISO hybrid image containing just the Debian standard system without X.org. It is suitable for burning to CD or DVD media, and also to copy onto a USB stick (as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, specifying ".iso" extension where ".img" is indicated).
+Regardless of the image type, you will need to perform the same basic steps to build an image each time. As a first example, execute the following sequence of live-build commands to create a basic ISO hybrid image containing just the Debian standard system without X.org. It is suitable for burning to CD or DVD media, and also to copy onto a USB stick.
-First, we run the #{lb config}# command which will create a "config/" hierarchy in the current directory for use by other commands:
+First, run the #{lb config}# command. This will create a "config/" hierarchy in the current directory for use by other commands:
code{
@@ -32,9 +32,9 @@ code{
}code
-By passing no parameters to #{lb config}#, we indicated that we wish to use the defaults (see {The lb config command}#lb-config).
+No parameters are passed to #{lb config}#, so defaults for all of its various options will be used. See {The lb config command}#lb-config for more details.
-Now that we have a "config/" hierarchy, we may build the image with the #{lb build}# command:
+Now that the "config/" hierarchy exists, build the image with the #{lb build}# command:
code{
@@ -42,51 +42,102 @@ code{
}code
-This process can take a while, depending on the speed of your network connection (see {The lb build command}#lb-build).
+This process can take a while, depending on the speed of your network connection. When it is complete, there should be a #{binary-hybrid.iso}# image file, ready to use, in the current directory.
-3~testing-iso-with-qemu Testing an ISO image with Qemu
+2~ Using an ISO hybrid live image
-Testing an ISO is simple:
+After either building or downloading an ISO hybrid image, which can be obtained at http://www.debian.org/CD/live/, the usual next step is to prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or a USB stick.
+
+3~burning-iso-image Burning an ISO image to a physical medium
+
+Burning an ISO image is easy:
code{
- # apt-get install qemu
+ # apt-get install wodim
- $ qemu -cdrom binary.iso
+ $ wodim binary-hybrid.iso
}code
-3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
+3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick
-In order to test the ISO with virtualbox-ose:
+ISO images prepared with the #{isohybrid}# command, like the images produced by live-build's default #{iso-hybrid}# binary image type, can be copied to a USB stick and directly booted without further steps. Plug in a USB stick with a size larger than that of #{binary-hybrid.iso}# and determine which device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#.
-code{
+*{This will definitely overwrite any previous contents on your stick!}*
- # apt-get install virtualbox-ose virtualbox-ose-dkms
+Once you are certain you have the correct device name, use the #{dd}# command to copy the image to the stick as follows:
- $ virtualbox
+code{
+
+ $ dd if=binary-hybrid.iso of=${USBSTICK}
}code
-Create a new virtual machine, change the storage settings to use binary.iso as the CD/DVD device, and start the machine.
-Note: For live systems containing X.org that you want to test with virtualbox-ose, you may wish to include the VirtualBox X.org driver package, virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
+3~ Booting the live media
+
+The first time you boot your live media, whether CD, DVD, USB key, or PXE boot, some setup in your computer's BIOS may be needed first. Since BIOSes vary greatly in features and key bindings, we cannot get into the topic in depth here. Some BIOSes provide a key to bring up a menu of boot devices at boot time, which is the easiest way if it is available on your system. Otherwise, you need to enter the BIOS configuration menu and change the boot order to place the boot device for the live system before your normal boot device.
+
+Once you've booted the media, you are presented with a boot menu. If you just press enter here, the system will boot using the default entry, #{Live}# and default options. For more information about boot options, see the "help" entry in the menu and also the #{live-boot}# and #{live-config}# man pages found within the live system.
+
+Assuming you've selected #{Live}# and booted a default desktop live image, after the boot messages scroll by, you should be automatically logged into the #{user}# account and see a desktop, ready to use. If you've booted a console-only image, such as #{standard}# or #{rescue}# flavour prebuilt images, you should be automatically logged in on the console to the #{user}# account and see a shell prompt, ready to use.
+
+2~ Using a virtual machine for testing
+
+It can be a great time-saver for the development of live images to run them in a virtual machine (VM). This is not without its caveats:
+
+_* Running a VM requires enough RAM for both the guest OS and the host and a CPU with hardware support for virtualization is recommended.
+
+_* There are some inherent limitations to running on a VM, e.g. poor video performance, limited choice of emulated hardware.
+
+_* When developing for specific hardware, there is no substitute for running on the hardware itself.
+
+_* Occasionally there are bugs that relate only to running in a VM. When in doubt, test your image directly on the hardware.
+
+Provided you can work within these constraints, survey the available VM software and choose one that is suitable for your needs.
+
+3~testing-iso-with-qemu Testing an ISO image with QEMU
+
+The most versatile VM in Debian is QEMU. If your processor has hardware support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# package description briefly lists the requirements.
+
+First, install #{qemu-kvm}# if your processor supports it. If not, install #{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in the following examples. The #{qemu-utils}# package is also valuable for creating virtual disk images with #{qemu-img}#.
code{
- $ lb config --packages virtualbox-ose-guest-x11
+ # apt-get install qemu-kvm qemu-utils
}code
-3~burning-iso-image Burning an ISO image to a physical medium
+Booting an ISO image is simple:
-Burning an ISO image is easy:
+code{
+
+ $ kvm -cdrom binary-hybrid.iso
+
+}code
+
+See the man pages for more details.
+
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
+
+In order to test the ISO with virtualbox-ose:
code{
- # apt-get install wodim
+ # apt-get install virtualbox-ose virtualbox-ose-dkms
+
+ $ virtualbox
+
+}code
- $ wodim binary.iso
+Create a new virtual machine, change the storage settings to use binary-hybrid.iso as the CD/DVD device, and start the machine.
+
+Note: For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
+
+code{
+
+ $ lb config --packages virtualbox-ose-guest-x11
}code
@@ -120,6 +171,8 @@ code{
3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
+% FIXME: eliminate duplication with ISO hybrid, as these are virtually the same instructions!
+
The generated binary image contains a VFAT partition and the syslinux bootloader, ready to be directly written on a USB stick. Plug in a USB stick with a size larger than that of binary.img and type:
code{
diff --git a/manual/en/user_overview.ssi b/manual/en/user_overview.ssi
index abb8656..a6bab2f 100644
--- a/manual/en/user_overview.ssi
+++ b/manual/en/user_overview.ssi
@@ -94,7 +94,7 @@ A full list of options is available in the #{lb_config}# man page.
3~lb-build The #{lb build}# command
-The #{lb build}# command reads in your configuration from the config/ directory. It then runs the lower lower level commands needed to build your Live system.
+The #{lb build}# command reads in your configuration from the config/ directory. It then runs the lower level commands needed to build your Live system.
3~lb-clean The #{lb clean}# command
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index 09379af..d3d1ce7 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Este programa es software libre: puede ser redistribuido y / o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> En los sistemas Debian, el texto completo de la GNU Licencia Pública General se pueden encontrar en / usr/share/common-licenses/GPL-3
@date:
- :published: 2011-03-13
+ :published: 2011-03-17
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/es/user_basics.ssi b/manual/es/user_basics.ssi
index a2b9be1..0679e29 100644
--- a/manual/es/user_basics.ssi
+++ b/manual/es/user_basics.ssi
@@ -2,19 +2,17 @@
1~the-basics Conceptos básicos
-Este capítulo contiene una breve descripción del proceso de creación de las
-imágenes en vivo y las instrucciones para el uso de los tres tipos de
-imágenes más utilizadas. El tipo de imagen más versátil, #{iso-hybrid}#, se
-puede utilizar en una máquina virtual, en medios ópticos u otros dispositivo
-de almacenamiento USB. En ciertos casos especiales, las imágenes
-#{usb-hdd}#, pueden ser más adecuadas para dispositivos USB. El capítulo
-termina con instrucciones para crear y usar una imagen de tipo #{red}#, que
-es un poco más complicado debido a la configuración necesaria en el
-servidor. Es un tema ligeramente avanzado para cualquier persona que no esté
-familiarizada con el arranque en red, pero se incluye aquí porque una vez
-que se realiza la instalación, es una forma muy conveniente para probar y
-desplegar imágenes de arranque en red local sin la molestia de tratar con
-los dispositivos de almacenamiento de la imagen.
+This chapter contains a brief overview of the build process and instructions
+for using the three most commonly used image types. The most versatile image
+type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
+portable storage device. In certain special cases, such as the use of
+persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter
+finishes with instructions for building and using a #{net}# type image,
+which is a bit more involved due to the setup required on the server. This
+is a slightly advanced topic for anyone who is not familiar already with
+netbooting, but is included here because once the setup is done, it is a
+very convenient way to test and deploy images for booting on the local
+network without the hassle of dealing with image media.
2~ ¿Qué es un sistema en vivo?
@@ -61,18 +59,16 @@ de arranque para ponerlos en funcionamiento, todo ello en un formato que
depende del medio de almacenamiento elegido (imagen ISO9660, imagen de
disco, etc.)
-2~ Primeros pasos: creación de una imagen ISO
+2~ First steps: building an ISO hybrid image
-La siguiente secuencia de comandos live-build creará una imagen ISO híbrida
-básica que contiene sólo el sistema estándar de Debian sin X.org. Es
-adecuada para grabarla en un CD o DVD y también para copiarla en un
-dispositivo USB (como se explica en {Copiar una imagen USB/HDD en un
-dispositivo USB}#copying-usb-hdd-image, especificando la extensión «.iso»
-donde se indica «.img»
+Regardless of the image type, you will need to perform the same basic steps
+to build an image each time. As a first example, execute the following
+sequence of live-build commands to create a basic ISO hybrid image
+containing just the Debian standard system without X.org. It is suitable for
+burning to CD or DVD media, and also to copy onto a USB stick.
-En primer lugar, se ejecuta el comando #{lb config}# que creará una
-jerarquía «config/» en el directorio actual que será usada por otros
-comandos:
+First, run the #{lb config}# command. This will create a "config/" hierarchy
+in the current directory for use by other commands:
code{
@@ -80,11 +76,12 @@ code{
}code
-Al no pasar ningún parámetro a #{lb config}#, se indica que se quiere
-utilizar los valores por defecto (ver{El comando lb config}#lb-config).
+No parameters are passed to #{lb config}#, so defaults for all of its
+various options will be used. See {The lb config command}#lb-config for more
+details.
-Ahora que tenemos un jerarquía «config/», podemos crear la imagen con el
-comando #{lb build}#:
+Now that the "config/" hierarchy exists, build the image with the #{lb
+build}# command:
code{
@@ -92,57 +89,147 @@ code{
}code
-Este proceso puede llevar un tiempo, dependiendo de la velocidad de su
-conexión de red (ver {El comando lb build}#lb-build).
+This process can take a while, depending on the speed of your network
+connection. When it is complete, there should be a #{binary-hybrid.iso}#
+image file, ready to use, in the current directory.
-3~testing-iso-with-qemu Probar una imagen ISO con Qemu
+2~ Using an ISO hybrid live image
-Probar un imagen ISO es sencillo:
+After either building or downloading an ISO hybrid image, which can be
+obtained at http://www.debian.org/CD/live/, the usual next step is to
+prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or
+a USB stick.
+
+3~burning-iso-image Grabar una imagen ISO a un medio físico.
+
+Grabar una imagen ISO es fácil:
code{
- # apt-get install qemu
+ # apt-get install wodim
- $ qemu -cdrom binary.iso
+ $ wodim binary-hybrid.iso
}code
-3~testing-iso-with-virtualbox Probar una imagen ISO con virtualbox-ose
+3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick
-Para probar una imagen ISO con virtualbox-ose:
+ISO images prepared with the #{isohybrid}# command, like the images produced
+by live-build's default #{iso-hybrid}# binary image type, can be copied to a
+USB stick and directly booted without further steps. Plug in a USB stick
+with a size larger than that of #{binary-hybrid.iso}# and determine which
+device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the
+device file of your key, such as #{/dev/sdb}#, not a partition, such as
+#{/dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s
+output after plugging in the stick, or better yet, #{ls -l
+/dev/disk/by-id}#.
-code{
+*{ATENCIÓN: Esto borrará definitivamente cualquier contenido anterior del dispositivo.}*
- # apt-get install virtualbox-ose virtualbox-ose-dkms
+Once you are certain you have the correct device name, use the #{dd}#
+command to copy the image to the stick as follows:
- $ virtualbox
+code{
+
+ $ dd if=binary-hybrid.iso of=${USBSTICK}
}code
-Crear una nueva máquina virtual, cambiar la configuración de almacenamiento
-para utilizar binary.iso como el dispositivo de CD/DVD y arrancar la
-máquina.
-Nota: Para probar los sistemas en vivo con soporte X.org en virtualbox-ose,
-se puede incluir el driver de VirtualBox X.org, virtualbox-ose-guest-x11, en
-la configuración de live-build. De lo contrario, la resolución se limita a
-800x600
+3~ Booting the live media
+
+The first time you boot your live media, whether CD, DVD, USB key, or PXE
+boot, some setup in your computer's BIOS may be needed first. Since BIOSes
+vary greatly in features and key bindings, we cannot get into the topic in
+depth here. Some BIOSes provide a key to bring up a menu of boot devices at
+boot time, which is the easiest way if it is available on your
+system. Otherwise, you need to enter the BIOS configuration menu and change
+the boot order to place the boot device for the live system before your
+normal boot device.
+
+Once you've booted the media, you are presented with a boot menu. If you
+just press enter here, the system will boot using the default entry,
+#{Live}# and default options. For more information about boot options, see
+the "help" entry in the menu and also the #{live-boot}# and #{live-config}#
+man pages found within the live system.
+
+Assuming you've selected #{Live}# and booted a default desktop live image,
+after the boot messages scroll by, you should be automatically logged into
+the #{user}# account and see a desktop, ready to use. If you've booted a
+console-only image, such as #{standard}# or #{rescue}# flavour prebuilt
+images, you should be automatically logged in on the console to the #{user}#
+account and see a shell prompt, ready to use.
+
+2~ Using a virtual machine for testing
+
+It can be a great time-saver for the development of live images to run them
+in a virtual machine (VM). This is not without its caveats:
+
+_* Running a VM requires enough RAM for both the guest OS and the host and a
+CPU with hardware support for virtualization is recommended.
+
+_* There are some inherent limitations to running on a VM, e.g. poor video
+performance, limited choice of emulated hardware.
+
+_* When developing for specific hardware, there is no substitute for running
+on the hardware itself.
+
+_* Occasionally there are bugs that relate only to running in a VM. When in
+doubt, test your image directly on the hardware.
+
+Provided you can work within these constraints, survey the available VM
+software and choose one that is suitable for your needs.
+
+3~testing-iso-with-qemu Testing an ISO image with QEMU
+
+The most versatile VM in Debian is QEMU. If your processor has hardware
+support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}#
+package description briefly lists the requirements.
+
+First, install #{qemu-kvm}# if your processor supports it. If not, install
+#{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in
+the following examples. The #{qemu-utils}# package is also valuable for
+creating virtual disk images with #{qemu-img}#.
code{
- $ lb config --packages virtualbox-ose-guest-x11
+ # apt-get install qemu-kvm qemu-utils
}code
-3~burning-iso-image Grabar una imagen ISO a un medio físico.
+Booting an ISO image is simple:
-Grabar una imagen ISO es fácil:
+code{
+
+ $ kvm -cdrom binary-hybrid.iso
+
+}code
+
+See the man pages for more details.
+
+3~testing-iso-with-virtualbox Probar una imagen ISO con virtualbox-ose
+
+Para probar una imagen ISO con virtualbox-ose:
code{
- # apt-get install wodim
+ # apt-get install virtualbox-ose virtualbox-ose-dkms
+
+ $ virtualbox
+
+}code
- $ wodim binary.iso
+Create a new virtual machine, change the storage settings to use
+binary-hybrid.iso as the CD/DVD device, and start the machine.
+
+Note: For live systems containing X.org that you want to test with
+#{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver
+package, #{virtualbox-ose-guest-x11}#, in your live-build
+configuration. Otherwise, the resolution is limited to 800x600.
+
+code{
+
+ $ lb config --packages virtualbox-ose-guest-x11
}code
@@ -186,6 +273,9 @@ code{
3~copying-usb-hdd-image Copiar una imagen USB/HDD a un dispositivo USB
+% FIXME: eliminate duplication with ISO hybrid, as these are virtually the
+same instructions!
+
La imagen binaria generada contiene una partición VFAT y el gestor de
arranque syslinux, lista para ser copiada directamente en un dispositivo
USB. Conecte una memoria USB de tamaño mayor que el del fichero binary.img y
diff --git a/manual/es/user_overview.ssi b/manual/es/user_overview.ssi
index 4dea3e9..b3f22aa 100644
--- a/manual/es/user_overview.ssi
+++ b/manual/es/user_overview.ssi
@@ -124,9 +124,9 @@ Una lista completa de opciones está disponible en la página del manual
3~lb-build El comando #{lb build}#
-El comando #{lb build}# lee la configuración del directorio config/. A
-continuación, ejecuta los comandos del nivel inferior más bajo necesarios
-para crear el sistema en vivo.
+The #{lb build}# command reads in your configuration from the config/
+directory. It then runs the lower level commands needed to build your Live
+system.
3~lb-clean El comando #{lb clean}#
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 0312db5..4d25f00 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
:license: 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 3 of the License, or (at your option) any later version.<br><br>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.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-03-13
+ :published: 2011-03-17
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index e385a53..a097a47 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -5,14 +5,14 @@
This chapter contains a brief overview of the build process and instructions
for using the three most commonly used image types. The most versatile image
type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
-portable storage device. In certain special cases, #{usb-hdd}# may be more
-suitable for USB devices. The chapter finishes with instructions for
-building and using a #{net}# type image, which is a bit more involved due to
-the setup required on the server. This is a slightly advanced topic for
-anyone who is not familiar already with netbooting, but is included here
-because once the setup is done, it is a very convenient way to test and
-deploy images for booting on the local network without the hassle of dealing
-with image media.
+portable storage device. In certain special cases, such as the use of
+persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter
+finishes with instructions for building and using a #{net}# type image,
+which is a bit more involved due to the setup required on the server. This
+is a slightly advanced topic for anyone who is not familiar already with
+netbooting, but is included here because once the setup is done, it is a
+very convenient way to test and deploy images for booting on the local
+network without the hassle of dealing with image media.
2~ What is a live system?
@@ -52,16 +52,16 @@ You can use live-build to build the system image from your specifications,
set up a Linux kernel, its initrd, and a bootloader to run them, all in one
media-dependant format (ISO9660 image, disk image, etc.).
-2~ First steps: building an ISO image
+2~ First steps: building an ISO hybrid image
-The following sequence of live-build commands will create a basic ISO hybrid
-image containing just the Debian standard system without X.org. It is
-suitable for burning to CD or DVD media, and also to copy onto a USB stick
-(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image,
-specifying ".iso" extension where ".img" is indicated).
+Regardless of the image type, you will need to perform the same basic steps
+to build an image each time. As a first example, execute the following
+sequence of live-build commands to create a basic ISO hybrid image
+containing just the Debian standard system without X.org. It is suitable for
+burning to CD or DVD media, and also to copy onto a USB stick.
-First, we run the #{lb config}# command which will create a "config/"
-hierarchy in the current directory for use by other commands:
+First, run the #{lb config}# command. This will create a "config/" hierarchy
+in the current directory for use by other commands:
code{
@@ -69,10 +69,11 @@ code{
}code
-By passing no parameters to #{lb config}#, we indicated that we wish to use
-the defaults (see {The lb config command}#lb-config).
+No parameters are passed to #{lb config}#, so defaults for all of its
+various options will be used. See {The lb config command}#lb-config for more
+details.
-Now that we have a "config/" hierarchy, we may build the image with the #{lb
+Now that the "config/" hierarchy exists, build the image with the #{lb
build}# command:
code{
@@ -82,55 +83,146 @@ code{
}code
This process can take a while, depending on the speed of your network
-connection (see {The lb build command}#lb-build).
+connection. When it is complete, there should be a #{binary-hybrid.iso}#
+image file, ready to use, in the current directory.
+
+2~ Using an ISO hybrid live image
-3~testing-iso-with-qemu Testing an ISO image with Qemu
+After either building or downloading an ISO hybrid image, which can be
+obtained at http://www.debian.org/CD/live/, the usual next step is to
+prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or
+a USB stick.
-Testing an ISO is simple:
+3~burning-iso-image Burning an ISO image to a physical medium
+
+Burning an ISO image is easy:
code{
- # apt-get install qemu
+ # apt-get install wodim
- $ qemu -cdrom binary.iso
+ $ wodim binary-hybrid.iso
}code
-3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
+3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick
-In order to test the ISO with virtualbox-ose:
+ISO images prepared with the #{isohybrid}# command, like the images produced
+by live-build's default #{iso-hybrid}# binary image type, can be copied to a
+USB stick and directly booted without further steps. Plug in a USB stick
+with a size larger than that of #{binary-hybrid.iso}# and determine which
+device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the
+device file of your key, such as #{/dev/sdb}#, not a partition, such as
+#{/dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s
+output after plugging in the stick, or better yet, #{ls -l
+/dev/disk/by-id}#.
-code{
+*{This will definitely overwrite any previous contents on your stick!}*
- # apt-get install virtualbox-ose virtualbox-ose-dkms
+Once you are certain you have the correct device name, use the #{dd}#
+command to copy the image to the stick as follows:
- $ virtualbox
+code{
+
+ $ dd if=binary-hybrid.iso of=${USBSTICK}
}code
-Create a new virtual machine, change the storage settings to use binary.iso
-as the CD/DVD device, and start the machine.
-Note: For live systems containing X.org that you want to test with
-virtualbox-ose, you may wish to include the VirtualBox X.org driver package,
-virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the
-resolution is limited to 800x600.
+3~ Booting the live media
+
+The first time you boot your live media, whether CD, DVD, USB key, or PXE
+boot, some setup in your computer's BIOS may be needed first. Since BIOSes
+vary greatly in features and key bindings, we cannot get into the topic in
+depth here. Some BIOSes provide a key to bring up a menu of boot devices at
+boot time, which is the easiest way if it is available on your
+system. Otherwise, you need to enter the BIOS configuration menu and change
+the boot order to place the boot device for the live system before your
+normal boot device.
+
+Once you've booted the media, you are presented with a boot menu. If you
+just press enter here, the system will boot using the default entry,
+#{Live}# and default options. For more information about boot options, see
+the "help" entry in the menu and also the #{live-boot}# and #{live-config}#
+man pages found within the live system.
+
+Assuming you've selected #{Live}# and booted a default desktop live image,
+after the boot messages scroll by, you should be automatically logged into
+the #{user}# account and see a desktop, ready to use. If you've booted a
+console-only image, such as #{standard}# or #{rescue}# flavour prebuilt
+images, you should be automatically logged in on the console to the #{user}#
+account and see a shell prompt, ready to use.
+
+2~ Using a virtual machine for testing
+
+It can be a great time-saver for the development of live images to run them
+in a virtual machine (VM). This is not without its caveats:
+
+_* Running a VM requires enough RAM for both the guest OS and the host and a
+CPU with hardware support for virtualization is recommended.
+
+_* There are some inherent limitations to running on a VM, e.g. poor video
+performance, limited choice of emulated hardware.
+
+_* When developing for specific hardware, there is no substitute for running
+on the hardware itself.
+
+_* Occasionally there are bugs that relate only to running in a VM. When in
+doubt, test your image directly on the hardware.
+
+Provided you can work within these constraints, survey the available VM
+software and choose one that is suitable for your needs.
+
+3~testing-iso-with-qemu Testing an ISO image with QEMU
+
+The most versatile VM in Debian is QEMU. If your processor has hardware
+support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}#
+package description briefly lists the requirements.
+
+First, install #{qemu-kvm}# if your processor supports it. If not, install
+#{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in
+the following examples. The #{qemu-utils}# package is also valuable for
+creating virtual disk images with #{qemu-img}#.
code{
- $ lb config --packages virtualbox-ose-guest-x11
+ # apt-get install qemu-kvm qemu-utils
}code
-3~burning-iso-image Burning an ISO image to a physical medium
+Booting an ISO image is simple:
-Burning an ISO image is easy:
+code{
+
+ $ kvm -cdrom binary-hybrid.iso
+
+}code
+
+See the man pages for more details.
+
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
+
+In order to test the ISO with virtualbox-ose:
code{
- # apt-get install wodim
+ # apt-get install virtualbox-ose virtualbox-ose-dkms
- $ wodim binary.iso
+ $ virtualbox
+
+}code
+
+Create a new virtual machine, change the storage settings to use
+binary-hybrid.iso as the CD/DVD device, and start the machine.
+
+Note: For live systems containing X.org that you want to test with
+#{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver
+package, #{virtualbox-ose-guest-x11}#, in your live-build
+configuration. Otherwise, the resolution is limited to 800x600.
+
+code{
+
+ $ lb config --packages virtualbox-ose-guest-x11
}code
@@ -173,6 +265,9 @@ code{
3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
+% FIXME: eliminate duplication with ISO hybrid, as these are virtually the
+same instructions!
+
The generated binary image contains a VFAT partition and the syslinux
bootloader, ready to be directly written on a USB stick. Plug in a USB stick
with a size larger than that of binary.img and type:
diff --git a/manual/fr/user_overview.ssi b/manual/fr/user_overview.ssi
index 4eeb593..9e81818 100644
--- a/manual/fr/user_overview.ssi
+++ b/manual/fr/user_overview.ssi
@@ -121,8 +121,8 @@ A full list of options is available in the #{lb_config}# man page.
3~lb-build The #{lb build}# command
The #{lb build}# command reads in your configuration from the config/
-directory. It then runs the lower lower level commands needed to build your
-Live system.
+directory. It then runs the lower level commands needed to build your Live
+system.
3~lb-clean The #{lb clean}# command
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index a2b7259..b7a29f1 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Sui sistemi Debian, il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
- :published: 2011-03-13
+ :published: 2011-03-17
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index c7789c3..b398c57 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -2,19 +2,17 @@
1~the-basics Nozioni di base
-Questo capitolo contiene una breve panoramica del processo di generazione e
-le istruzioni per utilizzare i tre tipi di immagine più comunemente
-utilizzati. La tipologia di immagine più versatile, #{iso-hybrid}#, può
-essere usata su una macchina virtuale, supporto ottico o dispositivo di
-archiviazione portatile USB. In alcuni casi particolari, la #{usb-hdd}#
-potrebbe essere più adatta per i dispositivi USB. Il capitolo termina con le
-istruzioni per costruire e usare un'immagine di tipo #{net}#, che è un poco
-più complessa a causa del setup richiesto sul server. Si tratta di un
-argomento leggermente avanzato per chi non ha familiarità con l'avvio da
-rete, ma è incluso qui perché, una volta che il setup è stato fatto, è un
-modo molto comodo per collaudare e distribuire immagini facendo il boot
-nella rete locale senza la seccatura di doversi occupare dei mezzi di
-divulgazione dell'immagine.
+This chapter contains a brief overview of the build process and instructions
+for using the three most commonly used image types. The most versatile image
+type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
+portable storage device. In certain special cases, such as the use of
+persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter
+finishes with instructions for building and using a #{net}# type image,
+which is a bit more involved due to the setup required on the server. This
+is a slightly advanced topic for anyone who is not familiar already with
+netbooting, but is included here because once the setup is done, it is a
+very convenient way to test and deploy images for booting on the local
+network without the hassle of dealing with image media.
2~ Che cos'è un sistema live?
@@ -58,18 +56,16 @@ proprie specifiche, scegliere un kernel Linux, il suo initrd ed un
bootloader per avviarli, tutto in un unico formato che dipende dal mezzo
(immagini ISO9660, immagine disco, ecc.)
-2~ Primi passi: creare un'immagine ISO
+2~ First steps: building an ISO hybrid image
-La seguente sequenza di comandi di live-build creerà un'immagine ISO ibrida
-di base contenente soltanto il sistema Debian standard senza X.org. È adatta
-per essere masterizzata su CD o DVD e anche per essere copiata su una penna
-USB (come per {Copiare un'immagine USB/HDD su una penna
-USB}#copying-usb-hdd-image, specificando l'estensione ".iso" dove è indicato
-".img").
+Regardless of the image type, you will need to perform the same basic steps
+to build an image each time. As a first example, execute the following
+sequence of live-build commands to create a basic ISO hybrid image
+containing just the Debian standard system without X.org. It is suitable for
+burning to CD or DVD media, and also to copy onto a USB stick.
-In primo luogo eseguire il comando #{lb config}#, il quale creerà una
-gerarchia "config/" nella directory corrente e che verrà utilizzata da altri
-comandi:
+First, run the #{lb config}# command. This will create a "config/" hierarchy
+in the current directory for use by other commands:
code{
@@ -77,12 +73,12 @@ code{
}code
-Non passando alcun parametro a #{lb config}#, si indica che si intende
-utilizzare le impostazione predefinite (vedere {Il comando lb
-config}#lb-config).
+No parameters are passed to #{lb config}#, so defaults for all of its
+various options will be used. See {The lb config command}#lb-config for more
+details.
-Ora che si ha una gerarchia "config/" si può generare l'immagine con il
-comando #{lb build}#:
+Now that the "config/" hierarchy exists, build the image with the #{lb
+build}# command:
code{
@@ -90,57 +86,147 @@ code{
}code
-Questo processo può richiedere tempo, a seconda della velocità della
-connessione di rete (vedere {Il comando lb build}#lb-build).
+This process can take a while, depending on the speed of your network
+connection. When it is complete, there should be a #{binary-hybrid.iso}#
+image file, ready to use, in the current directory.
-3~testing-iso-with-qemu Provare un'immagine ISO con Qemu
+2~ Using an ISO hybrid live image
-Collaudare una ISO è semplice:
+After either building or downloading an ISO hybrid image, which can be
+obtained at http://www.debian.org/CD/live/, the usual next step is to
+prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or
+a USB stick.
+
+3~burning-iso-image Masterizzare un'immagine ISO su un supporto fisico
+
+Masterizzare un'immagine ISO è semplice:
code{
- # apt-get install qemu
+ # apt-get install wodim
- $ qemu -cdrom binary.iso
+ $ wodim binary-hybrid.iso
}code
-3~testing-iso-with-virtualbox Provare un'immagine ISO con virtualbox-ose
+3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick
-Per provare la ISO con virtualbox-ose:
+ISO images prepared with the #{isohybrid}# command, like the images produced
+by live-build's default #{iso-hybrid}# binary image type, can be copied to a
+USB stick and directly booted without further steps. Plug in a USB stick
+with a size larger than that of #{binary-hybrid.iso}# and determine which
+device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the
+device file of your key, such as #{/dev/sdb}#, not a partition, such as
+#{/dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s
+output after plugging in the stick, or better yet, #{ls -l
+/dev/disk/by-id}#.
-code{
+*{Questo sovrascriverà definitivamente qualsiasi dato esistente sulla chiavetta!}*
- # apt-get install virtualbox-ose virtualbox-ose-dkms
+Once you are certain you have the correct device name, use the #{dd}#
+command to copy the image to the stick as follows:
- $ virtualbox
+code{
+
+ $ dd if=binary-hybrid.iso of=${USBSTICK}
}code
-Creare una nuova macchina virtuale, modificare le impostazione di
-archiviazione in modo da usare binary.iso come dispositivo CD/DVD, ed
-avviare la macchina.
-Nota: per sistemi live contenenti X.org che si vogliono provare con
-virtualbox-ose, si può voler includere il pacchetto dei driver per X.org di
-VirtualBox, virtualbox-ose-guest-x11, nella configurazione di
-live-build. Altrimenti, la risoluzione è limitata a 800x600.
+3~ Booting the live media
+
+The first time you boot your live media, whether CD, DVD, USB key, or PXE
+boot, some setup in your computer's BIOS may be needed first. Since BIOSes
+vary greatly in features and key bindings, we cannot get into the topic in
+depth here. Some BIOSes provide a key to bring up a menu of boot devices at
+boot time, which is the easiest way if it is available on your
+system. Otherwise, you need to enter the BIOS configuration menu and change
+the boot order to place the boot device for the live system before your
+normal boot device.
+
+Once you've booted the media, you are presented with a boot menu. If you
+just press enter here, the system will boot using the default entry,
+#{Live}# and default options. For more information about boot options, see
+the "help" entry in the menu and also the #{live-boot}# and #{live-config}#
+man pages found within the live system.
+
+Assuming you've selected #{Live}# and booted a default desktop live image,
+after the boot messages scroll by, you should be automatically logged into
+the #{user}# account and see a desktop, ready to use. If you've booted a
+console-only image, such as #{standard}# or #{rescue}# flavour prebuilt
+images, you should be automatically logged in on the console to the #{user}#
+account and see a shell prompt, ready to use.
+
+2~ Using a virtual machine for testing
+
+It can be a great time-saver for the development of live images to run them
+in a virtual machine (VM). This is not without its caveats:
+
+_* Running a VM requires enough RAM for both the guest OS and the host and a
+CPU with hardware support for virtualization is recommended.
+
+_* There are some inherent limitations to running on a VM, e.g. poor video
+performance, limited choice of emulated hardware.
+
+_* When developing for specific hardware, there is no substitute for running
+on the hardware itself.
+
+_* Occasionally there are bugs that relate only to running in a VM. When in
+doubt, test your image directly on the hardware.
+
+Provided you can work within these constraints, survey the available VM
+software and choose one that is suitable for your needs.
+
+3~testing-iso-with-qemu Testing an ISO image with QEMU
+
+The most versatile VM in Debian is QEMU. If your processor has hardware
+support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}#
+package description briefly lists the requirements.
+
+First, install #{qemu-kvm}# if your processor supports it. If not, install
+#{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in
+the following examples. The #{qemu-utils}# package is also valuable for
+creating virtual disk images with #{qemu-img}#.
code{
- $ lb config --packages virtualbox-ose-guest-x11
+ # apt-get install qemu-kvm qemu-utils
}code
-3~burning-iso-image Masterizzare un'immagine ISO su un supporto fisico
+Booting an ISO image is simple:
-Masterizzare un'immagine ISO è semplice:
+code{
+
+ $ kvm -cdrom binary-hybrid.iso
+
+}code
+
+See the man pages for more details.
+
+3~testing-iso-with-virtualbox Provare un'immagine ISO con virtualbox-ose
+
+Per provare la ISO con virtualbox-ose:
code{
- # apt-get install wodim
+ # apt-get install virtualbox-ose virtualbox-ose-dkms
+
+ $ virtualbox
+
+}code
- $ wodim binary.iso
+Create a new virtual machine, change the storage settings to use
+binary-hybrid.iso as the CD/DVD device, and start the machine.
+
+Note: For live systems containing X.org that you want to test with
+#{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver
+package, #{virtualbox-ose-guest-x11}#, in your live-build
+configuration. Otherwise, the resolution is limited to 800x600.
+
+code{
+
+ $ lb config --packages virtualbox-ose-guest-x11
}code
@@ -183,6 +269,9 @@ code{
3~copying-usb-hdd-image Copiare un'immagine USB/HDD su una penna USB
+% FIXME: eliminate duplication with ISO hybrid, as these are virtually the
+same instructions!
+
L'immagine binaria generata contiene una partizione VFAT e il bootloader
syslinux, pronti per essere scritti direttamente su una penna USB. Inserire
una chiavetta USB con una dimensione maggiore di quella di binary.img e
diff --git a/manual/it/user_overview.ssi b/manual/it/user_overview.ssi
index 758ca8c..b2010d9 100644
--- a/manual/it/user_overview.ssi
+++ b/manual/it/user_overview.ssi
@@ -123,9 +123,9 @@ Una lista completa delle opzioni è disponibile nel manuale di #{lb_config}#.
3~lb-build Il comando #{lb build}#
-Il comando #{lb build}# legge la configurazione dalla directory #{config/}#
-ed esegue ad un livello inferiore i comandi necessari a costruire il sistema
-live.
+The #{lb build}# command reads in your configuration from the config/
+directory. It then runs the lower level commands needed to build your Live
+system.
3~lb-clean Il comando #{lb clean}#
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 8158ee3..494e72d 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-13 14:58+0100\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-13\n"
+" :published: 2011-03-17\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index 939295f..6536403 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-02 08:01-0400\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,21 +19,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
+#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
+#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
+#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
+#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
+#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
+#: en/user_basics.ssi:343 en/user_basics.ssi:368
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -83,21 +84,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
+#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
+#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
+#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
+#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
+#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
+#: en/user_basics.ssi:354 en/user_basics.ssi:393
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -160,14 +162,14 @@ msgid ""
"This chapter contains a brief overview of the build process and instructions "
"for using the three most commonly used image types. The most versatile image "
"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
-"portable storage device. In certain special cases, #{usb-hdd}# may be more "
-"suitable for USB devices. The chapter finishes with instructions for "
-"building and using a #{net}# type image, which is a bit more involved due to "
-"the setup required on the server. This is a slightly advanced topic for "
-"anyone who is not familiar already with netbooting, but is included here "
-"because once the setup is done, it is a very convenient way to test and "
-"deploy images for booting on the local network without the hassle of dealing "
-"with image media."
+"portable storage device. In certain special cases, such as the use of "
+"persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter "
+"finishes with instructions for building and using a #{net}# type image, "
+"which is a bit more involved due to the setup required on the server. This "
+"is a slightly advanced topic for anyone who is not familiar already with "
+"netbooting, but is included here because once the setup is done, it is a "
+"very convenient way to test and deploy images for booting on the local "
+"network without the hassle of dealing with image media."
msgstr ""
#. type: Plain text
@@ -240,23 +242,23 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:24
-msgid "2~ First steps: building an ISO image"
+msgid "2~ First steps: building an ISO hybrid image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:26
msgid ""
-"The following sequence of live-build commands will create a basic ISO hybrid "
-"image containing just the Debian standard system without X.org. It is "
-"suitable for burning to CD or DVD media, and also to copy onto a USB stick "
-"(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
-"specifying \".iso\" extension where \".img\" is indicated)."
+"Regardless of the image type, you will need to perform the same basic steps "
+"to build an image each time. As a first example, execute the following "
+"sequence of live-build commands to create a basic ISO hybrid image "
+"containing just the Debian standard system without X.org. It is suitable for "
+"burning to CD or DVD media, and also to copy onto a USB stick."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:28
msgid ""
-"First, we run the #{lb config}# command which will create a \"config/\" "
+"First, run the #{lb config}# command. This will create a \"config/\" "
"hierarchy in the current directory for use by other commands:"
msgstr ""
@@ -269,19 +271,20 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:36
msgid ""
-"By passing no parameters to #{lb config}#, we indicated that we wish to use "
-"the defaults (see {The lb config command}#lb-config)."
+"No parameters are passed to #{lb config}#, so defaults for all of its "
+"various options will be used. See {The lb config command}#lb-config for more "
+"details."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:38
msgid ""
-"Now that we have a \"config/\" hierarchy, we may build the image with the #"
-"{lb build}# command:"
+"Now that the \"config/\" hierarchy exists, build the image with the #{lb "
+"build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_basics.ssi:42 en/user_basics.ssi:169 en/user_basics.ssi:255
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -291,104 +294,264 @@ msgstr ""
#: en/user_basics.ssi:46
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection (see {The lb build command}#lb-build)."
+"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"image file, ready to use, in the current directory."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:48
-msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
+msgid "2~ Using an ISO hybrid live image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "Testing an ISO is simple:"
+msgid ""
+"After either building or downloading an ISO hybrid image, which can be "
+"obtained at http://www.debian.org/CD/live/, the usual next step is to "
+"prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or "
+"a USB stick."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:54 en/user_basics.ssi:142
-#, no-wrap
-msgid " # apt-get install qemu\n"
+#: en/user_basics.ssi:52
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:54
+msgid "Burning an ISO image is easy:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56
+#: en/user_basics.ssi:58
#, no-wrap
-msgid " $ qemu -cdrom binary.iso\n"
+msgid " # apt-get install wodim\n"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:60
-msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
+#, no-wrap
+msgid " $ wodim binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:62
-msgid "In order to test the ISO with virtualbox-ose:"
+#: en/user_basics.ssi:64
+msgid "3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:66
-#, no-wrap
-msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
+msgid ""
+"ISO images prepared with the #{isohybrid}# command, like the images produced "
+"by live-build's default #{iso-hybrid}# binary image type, can be copied to a "
+"USB stick and directly booted without further steps. Plug in a USB stick "
+"with a size larger than that of #{binary-hybrid.iso}# and determine which "
+"device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the "
+"device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/"
+"dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s "
+"output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:68
+#: en/user_basics.ssi:68 en/user_basics.ssi:187
#, no-wrap
-msgid " $ virtualbox\n"
+msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:70
msgid ""
-"Create a new virtual machine, change the storage settings to use binary.iso "
-"as the CD/DVD device, and start the machine."
+"Once you are certain you have the correct device name, use the #{dd}# "
+"command to copy the image to the stick as follows:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:74
+#, no-wrap
+msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:79
+msgid "3~ Booting the live media"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:81
+msgid ""
+"The first time you boot your live media, whether CD, DVD, USB key, or PXE "
+"boot, some setup in your computer's BIOS may be needed first. Since BIOSes "
+"vary greatly in features and key bindings, we cannot get into the topic in "
+"depth here. Some BIOSes provide a key to bring up a menu of boot devices at "
+"boot time, which is the easiest way if it is available on your system. "
+"Otherwise, you need to enter the BIOS configuration menu and change the boot "
+"order to place the boot device for the live system before your normal boot "
+"device."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:83
+msgid ""
+"Once you've booted the media, you are presented with a boot menu. If you "
+"just press enter here, the system will boot using the default entry, #{Live}"
+"# and default options. For more information about boot options, see the "
+"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
+"man pages found within the live system."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:85
+msgid ""
+"Assuming you've selected #{Live}# and booted a default desktop live image, "
+"after the boot messages scroll by, you should be automatically logged into "
+"the #{user}# account and see a desktop, ready to use. If you've booted a "
+"console-only image, such as #{standard}# or #{rescue}# flavour prebuilt "
+"images, you should be automatically logged in on the console to the #{user}# "
+"account and see a shell prompt, ready to use."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:87
+msgid "2~ Using a virtual machine for testing"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:89
+msgid ""
+"It can be a great time-saver for the development of live images to run them "
+"in a virtual machine (VM). This is not without its caveats:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:91
+msgid ""
+"_* Running a VM requires enough RAM for both the guest OS and the host and a "
+"CPU with hardware support for virtualization is recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:93
+msgid ""
+"_* There are some inherent limitations to running on a VM, e.g. poor video "
+"performance, limited choice of emulated hardware."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:95
+msgid ""
+"_* When developing for specific hardware, there is no substitute for running "
+"on the hardware itself."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:97
+msgid ""
+"_* Occasionally there are bugs that relate only to running in a VM. When in "
+"doubt, test your image directly on the hardware."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:99
+msgid ""
+"Provided you can work within these constraints, survey the available VM "
+"software and choose one that is suitable for your needs."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:101
+msgid "3~testing-iso-with-qemu Testing an ISO image with QEMU"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:103
+msgid ""
+"The most versatile VM in Debian is QEMU. If your processor has hardware "
+"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"package description briefly lists the requirements."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:105
msgid ""
-"Note: For live systems containing X.org that you want to test with "
-"virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
-"virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the "
-"resolution is limited to 800x600."
+"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
+"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The #{qemu-utils}# package is also valuable for "
+"creating virtual disk images with #{qemu-img}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:78
+#: en/user_basics.ssi:109
#, no-wrap
-msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
+msgid " # apt-get install qemu-kvm qemu-utils\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:82
-msgid "3~burning-iso-image Burning an ISO image to a physical medium"
+#: en/user_basics.ssi:113
+msgid "Booting an ISO image is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:84
-msgid "Burning an ISO image is easy:"
+#: en/user_basics.ssi:117
+#, no-wrap
+msgid " $ kvm -cdrom binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:88
+#: en/user_basics.ssi:121
+msgid "See the man pages for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:123
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:125
+msgid "In order to test the ISO with virtualbox-ose:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:129
#, no-wrap
-msgid " # apt-get install wodim\n"
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:131
+#, no-wrap
+msgid " $ virtualbox\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:135
+msgid ""
+"Create a new virtual machine, change the storage settings to use binary-"
+"hybrid.iso as the CD/DVD device, and start the machine."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:137
+msgid ""
+"Note: For live systems containing X.org that you want to test with #"
+"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
+"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
+"Otherwise, the resolution is limited to 800x600."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:141
#, no-wrap
-msgid " $ wodim binary.iso\n"
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:145
msgid "2~ Building a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:147
msgid ""
"The following sequence of commands will create a basic USB/HDD image "
"containing just the Debian standard system without X.org. It is suitable for "
@@ -400,7 +563,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:149
msgid ""
"Note: if you created an ISO image with the previous example, you will need "
"to clean up your working directory with the #{lb clean}# command (see {The "
@@ -408,36 +571,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#: en/user_basics.ssi:153 en/user_basics.ssi:237
#, no-wrap
msgid " # lb clean --binary\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:106
+#: en/user_basics.ssi:157
msgid ""
"Run the #{lb config}# command with the parameters to configure the #{config/}"
"# hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:110
+#: en/user_basics.ssi:161
#, no-wrap
msgid " $ lb config -b usb-hdd\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:114 en/user_basics.ssi:198
+#: en/user_basics.ssi:165 en/user_basics.ssi:251
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:122
+#: en/user_basics.ssi:173
msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:175
+msgid ""
+"% FIXME: eliminate duplication with ISO hybrid, as these are virtually the "
+"same instructions!"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:177
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
"bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -445,13 +615,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:128
+#: en/user_basics.ssi:181
#, no-wrap
msgid " $ dd if=binary.img of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:132
+#: en/user_basics.ssi:185
msgid ""
"where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
"a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -460,36 +630,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:134
-#, no-wrap
-msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:189
msgid ""
"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:191
msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:195
+#, no-wrap
+msgid " # apt-get install qemu\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:197
#, no-wrap
msgid " $ qemu -hda binary.img\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:201
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:203
msgid ""
"If you want to use the remaining free space after you have installed the "
"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -498,13 +668,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:207
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:211
msgid ""
"After the creation of the partition, where #{${PARTITION}}# is the name of "
"the partition, like #{/dev/sdb2}#, you have to create a filesystem on it. "
@@ -512,35 +682,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:215
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:219
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:223
#, no-wrap
msgid " # mkfs.vfat -F 32\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:227
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:229
msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:231
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -548,27 +718,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:233
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:241
msgid ""
"Run the #{lb config}# command as follows to configure your image for "
"netbooting:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:192
+#: en/user_basics.ssi:245
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:249
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
"serve the filesystem image to the client, so the files must be served via "
@@ -579,7 +749,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:259
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -590,7 +760,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:261
msgid ""
"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
@@ -599,19 +769,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:263
msgid ""
"We must now configure three services on the server to enable netboot: the "
"DHCP server, the TFTP server and the NFS server."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:265
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:267
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -619,26 +789,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:269
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:220
+#: en/user_basics.ssi:273
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:275
#, no-wrap
msgid " ddns-update-style none;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:225
+#: en/user_basics.ssi:278
#, no-wrap
msgid ""
" option domain-name \"example.org\";\n"
@@ -646,7 +816,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:281
#, no-wrap
msgid ""
" default-lease-time 600;\n"
@@ -654,13 +824,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:283
#, no-wrap
msgid " log-facility local7;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:236
+#: en/user_basics.ssi:289
#, no-wrap
msgid ""
" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
@@ -671,17 +841,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:293
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:295
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:297
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
@@ -689,23 +859,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:248
+#: en/user_basics.ssi:301
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:252
+#: en/user_basics.ssi:305
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:254
+#: en/user_basics.ssi:307
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:256
+#: en/user_basics.ssi:309
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -713,37 +883,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:258
+#: en/user_basics.ssi:311
msgid "You need to install the #{nfs-kernel-server}# package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:260
+#: en/user_basics.ssi:313
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to #{/etc/exports}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:264
+#: en/user_basics.ssi:317
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:268
+#: en/user_basics.ssi:321
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:272
+#: en/user_basics.ssi:325
#, no-wrap
msgid " # exportfs -rv\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:276
+#: en/user_basics.ssi:329
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. For more information, see the "
@@ -754,40 +924,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:278
+#: en/user_basics.ssi:331
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:280
+#: en/user_basics.ssi:333
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:282
+#: en/user_basics.ssi:335
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:284
+#: en/user_basics.ssi:337
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:286
+#: en/user_basics.ssi:339
msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:288
+#: en/user_basics.ssi:341
msgid "Edit #{/etc/qemu-ifup}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:352
#, no-wrap
msgid ""
" #!/bin/sh\n"
@@ -801,40 +971,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:303
+#: en/user_basics.ssi:356
msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:358
msgid ""
"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:360
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:309
+#: en/user_basics.ssi:362
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:311
+#: en/user_basics.ssi:364
msgid ""
"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
"inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:313
+#: en/user_basics.ssi:366
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:321
+#: en/user_basics.ssi:374
#, no-wrap
msgid ""
" #!/usr/bin/vmware\n"
@@ -845,7 +1015,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:327
+#: en/user_basics.ssi:380
#, no-wrap
msgid ""
" ide0:0.present = \"FALSE\"\n"
@@ -856,7 +1026,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:383
#, no-wrap
msgid ""
" ethernet0.present = \"TRUE\"\n"
@@ -864,7 +1034,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:333
+#: en/user_basics.ssi:386
#, no-wrap
msgid ""
" displayName = \"Test Boot PXE\"\n"
@@ -872,7 +1042,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:391
#, no-wrap
msgid ""
" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
@@ -882,19 +1052,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:395
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:397
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:398
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/de/user_overview.ssi.po
index bf97303..cef45ab 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/de/user_overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-02-28 12:48-0400\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,21 +19,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
+#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
+#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
+#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
+#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
+#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
+#: en/user_basics.ssi:343 en/user_basics.ssi:368
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -83,21 +84,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
+#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
+#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
+#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
+#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
+#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
+#: en/user_basics.ssi:354 en/user_basics.ssi:393
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -362,8 +364,8 @@ msgstr ""
#: en/user_overview.ssi:98
msgid ""
"The #{lb build}# command reads in your configuration from the config/ "
-"directory. It then runs the lower lower level commands needed to build your "
-"Live system."
+"directory. It then runs the lower level commands needed to build your Live "
+"system."
msgstr ""
#. type: Plain text
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index a8141fc..2be3126 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-03-13 14:58+0100\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2011-03-12 08:00-0000\n"
"Last-Translator: José Luis Zabalza <jlz.3008 at gmail.com>\n"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -49,10 +49,13 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:13
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "@date:\n"
+#| " :published: 2011-03-13\n"
msgid ""
"@date:\n"
-" :published: 2011-03-13\n"
+" :published: 2011-03-17\n"
msgstr ""
"@date:\n"
" :published: 2011-03-13\n"
diff --git a/manual/po/es/user_basics.ssi.po b/manual/po/es/user_basics.ssi.po
index 05e836f..99f02b7 100644
--- a/manual/po/es/user_basics.ssi.po
+++ b/manual/po/es/user_basics.ssi.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-03-02 08:01-0400\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2011-03-11 19:32+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -24,21 +24,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
+#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
+#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
+#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
+#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
+#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
+#: en/user_basics.ssi:343 en/user_basics.ssi:368
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -88,21 +89,22 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
+#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
+#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
+#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
+#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
+#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
+#: en/user_basics.ssi:354 en/user_basics.ssi:393
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -161,18 +163,31 @@ msgstr "1~the-basics Conceptos básicos"
#. type: Plain text
#: en/user_basics.ssi:6
+#, fuzzy
+#| msgid ""
+#| "This chapter contains a brief overview of the build process and "
+#| "instructions for using the three most commonly used image types. The most "
+#| "versatile image type, #{iso-hybrid}#, may be used on a virtual machine, "
+#| "optical media or USB portable storage device. In certain special cases, #"
+#| "{usb-hdd}# may be more suitable for USB devices. The chapter finishes "
+#| "with instructions for building and using a #{net}# type image, which is a "
+#| "bit more involved due to the setup required on the server. This is a "
+#| "slightly advanced topic for anyone who is not familiar already with "
+#| "netbooting, but is included here because once the setup is done, it is a "
+#| "very convenient way to test and deploy images for booting on the local "
+#| "network without the hassle of dealing with image media."
msgid ""
"This chapter contains a brief overview of the build process and instructions "
"for using the three most commonly used image types. The most versatile image "
"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
-"portable storage device. In certain special cases, #{usb-hdd}# may be more "
-"suitable for USB devices. The chapter finishes with instructions for "
-"building and using a #{net}# type image, which is a bit more involved due to "
-"the setup required on the server. This is a slightly advanced topic for "
-"anyone who is not familiar already with netbooting, but is included here "
-"because once the setup is done, it is a very convenient way to test and "
-"deploy images for booting on the local network without the hassle of dealing "
-"with image media."
+"portable storage device. In certain special cases, such as the use of "
+"persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter "
+"finishes with instructions for building and using a #{net}# type image, "
+"which is a bit more involved due to the setup required on the server. This "
+"is a slightly advanced topic for anyone who is not familiar already with "
+"netbooting, but is included here because once the setup is done, it is a "
+"very convenient way to test and deploy images for booting on the local "
+"network without the hassle of dealing with image media."
msgstr ""
"Este capítulo contiene una breve descripción del proceso de creación de las "
"imágenes en vivo y las instrucciones para el uso de los tres tipos de "
@@ -293,17 +308,26 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:24
-msgid "2~ First steps: building an ISO image"
+#, fuzzy
+#| msgid "2~ First steps: building an ISO image"
+msgid "2~ First steps: building an ISO hybrid image"
msgstr "2~ Primeros pasos: creación de una imagen ISO"
#. type: Plain text
#: en/user_basics.ssi:26
+#, fuzzy
+#| msgid ""
+#| "The following sequence of live-build commands will create a basic ISO "
+#| "hybrid image containing just the Debian standard system without X.org. It "
+#| "is suitable for burning to CD or DVD media, and also to copy onto a USB "
+#| "stick (as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-"
+#| "image, specifying \".iso\" extension where \".img\" is indicated)."
msgid ""
-"The following sequence of live-build commands will create a basic ISO hybrid "
-"image containing just the Debian standard system without X.org. It is "
-"suitable for burning to CD or DVD media, and also to copy onto a USB stick "
-"(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
-"specifying \".iso\" extension where \".img\" is indicated)."
+"Regardless of the image type, you will need to perform the same basic steps "
+"to build an image each time. As a first example, execute the following "
+"sequence of live-build commands to create a basic ISO hybrid image "
+"containing just the Debian standard system without X.org. It is suitable for "
+"burning to CD or DVD media, and also to copy onto a USB stick."
msgstr ""
"La siguiente secuencia de comandos live-build creará una imagen ISO híbrida "
"básica que contiene sólo el sistema estándar de Debian sin X.org. Es "
@@ -314,8 +338,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:28
+#, fuzzy
+#| msgid ""
+#| "First, we run the #{lb config}# command which will create a \"config/\" "
+#| "hierarchy in the current directory for use by other commands:"
msgid ""
-"First, we run the #{lb config}# command which will create a \"config/\" "
+"First, run the #{lb config}# command. This will create a \"config/\" "
"hierarchy in the current directory for use by other commands:"
msgstr ""
"En primer lugar, se ejecuta el comando #{lb config}# que creará una "
@@ -330,24 +358,33 @@ msgstr " $ lb config\n"
#. type: Plain text
#: en/user_basics.ssi:36
+#, fuzzy
+#| msgid ""
+#| "By passing no parameters to #{lb config}#, we indicated that we wish to "
+#| "use the defaults (see {The lb config command}#lb-config)."
msgid ""
-"By passing no parameters to #{lb config}#, we indicated that we wish to use "
-"the defaults (see {The lb config command}#lb-config)."
+"No parameters are passed to #{lb config}#, so defaults for all of its "
+"various options will be used. See {The lb config command}#lb-config for more "
+"details."
msgstr ""
"Al no pasar ningún parámetro a #{lb config}#, se indica que se quiere "
"utilizar los valores por defecto (ver{El comando lb config}#lb-config)."
#. type: Plain text
#: en/user_basics.ssi:38
+#, fuzzy
+#| msgid ""
+#| "Now that we have a \"config/\" hierarchy, we may build the image with the "
+#| "#{lb build}# command:"
msgid ""
-"Now that we have a \"config/\" hierarchy, we may build the image with the #"
-"{lb build}# command:"
+"Now that the \"config/\" hierarchy exists, build the image with the #{lb "
+"build}# command:"
msgstr ""
"Ahora que tenemos un jerarquía «config/», podemos crear la imagen con el "
"comando #{lb build}#:"
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_basics.ssi:42 en/user_basics.ssi:169 en/user_basics.ssi:255
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -355,74 +392,282 @@ msgstr " # lb build\n"
#. type: Plain text
#: en/user_basics.ssi:46
+#, fuzzy
+#| msgid ""
+#| "This process can take a while, depending on the speed of your network "
+#| "connection (see {The lb build command}#lb-build)."
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection (see {The lb build command}#lb-build)."
+"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"image file, ready to use, in the current directory."
msgstr ""
"Este proceso puede llevar un tiempo, dependiendo de la velocidad de su "
"conexión de red (ver {El comando lb build}#lb-build)."
#. type: Plain text
#: en/user_basics.ssi:48
-msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
-msgstr "3~testing-iso-with-qemu Probar una imagen ISO con Qemu"
+msgid "2~ Using an ISO hybrid live image"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "Testing an ISO is simple:"
-msgstr "Probar un imagen ISO es sencillo:"
+msgid ""
+"After either building or downloading an ISO hybrid image, which can be "
+"obtained at http://www.debian.org/CD/live/, the usual next step is to "
+"prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or "
+"a USB stick."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:52
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
+msgstr "3~burning-iso-image Grabar una imagen ISO a un medio físico."
#. type: Plain text
-#: en/user_basics.ssi:54 en/user_basics.ssi:142
+#: en/user_basics.ssi:54
+msgid "Burning an ISO image is easy:"
+msgstr "Grabar una imagen ISO es fácil:"
+
+#. type: Plain text
+#: en/user_basics.ssi:58
#, no-wrap
-msgid " # apt-get install qemu\n"
-msgstr " # apt-get install qemu\n"
+msgid " # apt-get install wodim\n"
+msgstr " # apt-get install wodim\n"
#. type: Plain text
-#: en/user_basics.ssi:56
+#: en/user_basics.ssi:60
+#, fuzzy, no-wrap
+#| msgid " $ wodim binary.iso\n"
+msgid " $ wodim binary-hybrid.iso\n"
+msgstr " $ wodim binary.iso\n"
+
+#. type: Plain text
+#: en/user_basics.ssi:64
+#, fuzzy
+#| msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
+msgid "3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick"
+msgstr "3~copying-usb-hdd-image Copiar una imagen USB/HDD a un dispositivo USB"
+
+#. type: Plain text
+#: en/user_basics.ssi:66
+msgid ""
+"ISO images prepared with the #{isohybrid}# command, like the images produced "
+"by live-build's default #{iso-hybrid}# binary image type, can be copied to a "
+"USB stick and directly booted without further steps. Plug in a USB stick "
+"with a size larger than that of #{binary-hybrid.iso}# and determine which "
+"device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the "
+"device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/"
+"dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s "
+"output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:68 en/user_basics.ssi:187
#, no-wrap
-msgid " $ qemu -cdrom binary.iso\n"
+msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
+msgstr "*{ATENCIÓN: Esto borrará definitivamente cualquier contenido anterior del dispositivo.}*\n"
+
+#. type: Plain text
+#: en/user_basics.ssi:70
+msgid ""
+"Once you are certain you have the correct device name, use the #{dd}# "
+"command to copy the image to the stick as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:74
+#, fuzzy, no-wrap
+#| msgid " $ dd if=binary.img of=${USBSTICK}\n"
+msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgstr " $ dd if=binary.img of=${USBSTICK}\n"
+
+#. type: Plain text
+#: en/user_basics.ssi:79
+#, fuzzy
+#| msgid "2~ Customizing the live user"
+msgid "3~ Booting the live media"
+msgstr "2~ Personalización del usuario por defecto del sistema en vivo"
+
+#. type: Plain text
+#: en/user_basics.ssi:81
+msgid ""
+"The first time you boot your live media, whether CD, DVD, USB key, or PXE "
+"boot, some setup in your computer's BIOS may be needed first. Since BIOSes "
+"vary greatly in features and key bindings, we cannot get into the topic in "
+"depth here. Some BIOSes provide a key to bring up a menu of boot devices at "
+"boot time, which is the easiest way if it is available on your system. "
+"Otherwise, you need to enter the BIOS configuration menu and change the boot "
+"order to place the boot device for the live system before your normal boot "
+"device."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:83
+msgid ""
+"Once you've booted the media, you are presented with a boot menu. If you "
+"just press enter here, the system will boot using the default entry, #{Live}"
+"# and default options. For more information about boot options, see the "
+"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
+"man pages found within the live system."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:85
+msgid ""
+"Assuming you've selected #{Live}# and booted a default desktop live image, "
+"after the boot messages scroll by, you should be automatically logged into "
+"the #{user}# account and see a desktop, ready to use. If you've booted a "
+"console-only image, such as #{standard}# or #{rescue}# flavour prebuilt "
+"images, you should be automatically logged in on the console to the #{user}# "
+"account and see a shell prompt, ready to use."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:87
+msgid "2~ Using a virtual machine for testing"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:89
+msgid ""
+"It can be a great time-saver for the development of live images to run them "
+"in a virtual machine (VM). This is not without its caveats:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:91
+msgid ""
+"_* Running a VM requires enough RAM for both the guest OS and the host and a "
+"CPU with hardware support for virtualization is recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:93
+msgid ""
+"_* There are some inherent limitations to running on a VM, e.g. poor video "
+"performance, limited choice of emulated hardware."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:95
+msgid ""
+"_* When developing for specific hardware, there is no substitute for running "
+"on the hardware itself."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:97
+msgid ""
+"_* Occasionally there are bugs that relate only to running in a VM. When in "
+"doubt, test your image directly on the hardware."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:99
+msgid ""
+"Provided you can work within these constraints, survey the available VM "
+"software and choose one that is suitable for your needs."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:101
+#, fuzzy
+#| msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
+msgid "3~testing-iso-with-qemu Testing an ISO image with QEMU"
+msgstr "3~testing-iso-with-qemu Probar una imagen ISO con Qemu"
+
+#. type: Plain text
+#: en/user_basics.ssi:103
+msgid ""
+"The most versatile VM in Debian is QEMU. If your processor has hardware "
+"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"package description briefly lists the requirements."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:105
+msgid ""
+"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
+"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The #{qemu-utils}# package is also valuable for "
+"creating virtual disk images with #{qemu-img}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:109
+#, fuzzy, no-wrap
+#| msgid " # apt-get install qemu\n"
+msgid " # apt-get install qemu-kvm qemu-utils\n"
+msgstr " # apt-get install qemu\n"
+
+#. type: Plain text
+#: en/user_basics.ssi:113
+#, fuzzy
+#| msgid "Testing an ISO is simple:"
+msgid "Booting an ISO image is simple:"
+msgstr "Probar un imagen ISO es sencillo:"
+
+#. type: Plain text
+#: en/user_basics.ssi:117
+#, fuzzy, no-wrap
+#| msgid " $ qemu -cdrom binary.iso\n"
+msgid " $ kvm -cdrom binary-hybrid.iso\n"
msgstr " $ qemu -cdrom binary.iso\n"
#. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:121
+msgid "See the man pages for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:123
msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
"3~testing-iso-with-virtualbox Probar una imagen ISO con virtualbox-ose"
#. type: Plain text
-#: en/user_basics.ssi:62
+#: en/user_basics.ssi:125
msgid "In order to test the ISO with virtualbox-ose:"
msgstr "Para probar una imagen ISO con virtualbox-ose:"
#. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:129
#, no-wrap
msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
msgstr " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
#. type: Plain text
-#: en/user_basics.ssi:68
+#: en/user_basics.ssi:131
#, no-wrap
msgid " $ virtualbox\n"
msgstr " $ virtualbox\n"
#. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:135
+#, fuzzy
+#| msgid ""
+#| "Create a new virtual machine, change the storage settings to use binary."
+#| "iso as the CD/DVD device, and start the machine."
msgid ""
-"Create a new virtual machine, change the storage settings to use binary.iso "
-"as the CD/DVD device, and start the machine."
+"Create a new virtual machine, change the storage settings to use binary-"
+"hybrid.iso as the CD/DVD device, and start the machine."
msgstr ""
"Crear una nueva máquina virtual, cambiar la configuración de almacenamiento "
"para utilizar binary.iso como el dispositivo de CD/DVD y arrancar la máquina."
#. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:137
+#, fuzzy
+#| msgid ""
+#| "Note: For live systems containing X.org that you want to test with "
+#| "virtualbox-ose, you may wish to include the VirtualBox X.org driver "
+#| "package, virtualbox-ose-guest-x11, in your live-build configuration. "
+#| "Otherwise, the resolution is limited to 800x600."
msgid ""
-"Note: For live systems containing X.org that you want to test with "
-"virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
-"virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the "
-"resolution is limited to 800x600."
+"Note: For live systems containing X.org that you want to test with #"
+"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
+"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
+"Otherwise, the resolution is limited to 800x600."
msgstr ""
"Nota: Para probar los sistemas en vivo con soporte X.org en virtualbox-ose, "
"se puede incluir el driver de VirtualBox X.org, virtualbox-ose-guest-x11, en "
@@ -430,40 +675,18 @@ msgstr ""
"800x600"
#. type: Plain text
-#: en/user_basics.ssi:78
+#: en/user_basics.ssi:141
#, no-wrap
msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
msgstr " $ lb config --packages virtualbox-ose-guest-x11\n"
#. type: Plain text
-#: en/user_basics.ssi:82
-msgid "3~burning-iso-image Burning an ISO image to a physical medium"
-msgstr "3~burning-iso-image Grabar una imagen ISO a un medio físico."
-
-#. type: Plain text
-#: en/user_basics.ssi:84
-msgid "Burning an ISO image is easy:"
-msgstr "Grabar una imagen ISO es fácil:"
-
-#. type: Plain text
-#: en/user_basics.ssi:88
-#, no-wrap
-msgid " # apt-get install wodim\n"
-msgstr " # apt-get install wodim\n"
-
-#. type: Plain text
-#: en/user_basics.ssi:90
-#, no-wrap
-msgid " $ wodim binary.iso\n"
-msgstr " $ wodim binary.iso\n"
-
-#. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:145
msgid "2~ Building a USB/HDD image"
msgstr "2~ Crear una imagen USB/HDD"
#. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:147
msgid ""
"The following sequence of commands will create a basic USB/HDD image "
"containing just the Debian standard system without X.org. It is suitable for "
@@ -483,7 +706,7 @@ msgstr ""
"para una partición con persistencia."
#. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:149
msgid ""
"Note: if you created an ISO image with the previous example, you will need "
"to clean up your working directory with the #{lb clean}# command (see {The "
@@ -494,13 +717,13 @@ msgstr ""
"lb clean}#lb-clean):"
#. type: Plain text
-#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#: en/user_basics.ssi:153 en/user_basics.ssi:237
#, no-wrap
msgid " # lb clean --binary\n"
msgstr " # lb clean --binary\n"
#. type: Plain text
-#: en/user_basics.ssi:106
+#: en/user_basics.ssi:157
msgid ""
"Run the #{lb config}# command with the parameters to configure the #{config/}"
"# hierarchy to create a USB/HDD image type:"
@@ -509,23 +732,30 @@ msgstr ""
"jerarquía #{config/}# para crear una imágen USB/HDD:"
#. type: Plain text
-#: en/user_basics.ssi:110
+#: en/user_basics.ssi:161
#, no-wrap
msgid " $ lb config -b usb-hdd\n"
msgstr " $ lb config -b usb-hdd\n"
#. type: Plain text
-#: en/user_basics.ssi:114 en/user_basics.ssi:198
+#: en/user_basics.ssi:165 en/user_basics.ssi:251
msgid "Now build the image with the #{lb build}# command:"
msgstr "Crear ahora la imagen con el comando #{lb build}#:"
#. type: Plain text
-#: en/user_basics.ssi:122
+#: en/user_basics.ssi:173
msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
msgstr "3~copying-usb-hdd-image Copiar una imagen USB/HDD a un dispositivo USB"
#. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:175
+msgid ""
+"% FIXME: eliminate duplication with ISO hybrid, as these are virtually the "
+"same instructions!"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:177
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
"bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -537,13 +767,13 @@ msgstr ""
"teclee:"
#. type: Plain text
-#: en/user_basics.ssi:128
+#: en/user_basics.ssi:181
#, no-wrap
msgid " $ dd if=binary.img of=${USBSTICK}\n"
msgstr " $ dd if=binary.img of=${USBSTICK}\n"
#. type: Plain text
-#: en/user_basics.ssi:132
+#: en/user_basics.ssi:185
msgid ""
"where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
"a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -557,13 +787,7 @@ msgstr ""
"orden #{ls -l /dev/disk/by-id}#."
#. type: Plain text
-#: en/user_basics.ssi:134
-#, no-wrap
-msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
-msgstr "*{ATENCIÓN: Esto borrará definitivamente cualquier contenido anterior del dispositivo.}*\n"
-
-#. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:189
msgid ""
"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
@@ -573,23 +797,29 @@ msgstr ""
"tipo #{iso}#."
#. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:191
msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
msgstr "3~testing-usb-hdd-with-qemu Probar una imágen USB/HDD con Qemu"
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:195
+#, no-wrap
+msgid " # apt-get install qemu\n"
+msgstr " # apt-get install qemu\n"
+
+#. type: Plain text
+#: en/user_basics.ssi:197
#, no-wrap
msgid " $ qemu -hda binary.img\n"
msgstr " $ qemu -hda binary.img\n"
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:201
msgid "3~ Using the space left on a USB stick"
msgstr "3~ Cómo usar el espacio que queda libre en el dispositivo USB"
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:203
msgid ""
"If you want to use the remaining free space after you have installed the "
"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -602,13 +832,13 @@ msgstr ""
"partición será usada por el sistema Debian en vivo."
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:207
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
msgstr " # gparted ${USBSTICK}\n"
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:211
msgid ""
"After the creation of the partition, where #{${PARTITION}}# is the name of "
"the partition, like #{/dev/sdb2}#, you have to create a filesystem on it. "
@@ -619,35 +849,35 @@ msgstr ""
"ficheros en él. Una opción posible sería ext4."
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:215
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
msgstr " # mkfs.ext4 ${PARTITION}\n"
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:219
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr "Si se desea usar los datos de esta partición con Windows, usar FAT32."
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:223
#, no-wrap
msgid " # mkfs.vfat -F 32\n"
msgstr " # mkfs.vfat -F 32\n"
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:227
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr "*{Recordar: Cada vez que se instale una nueva binary.img en el dispositivo, todos los datos del dispositivo se perderán debido a que la tabla de particiones se sobrescribe con el contenido de la imagen.}*\n"
#. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:229
msgid "2~building-netboot-image Building a netboot image"
msgstr "2~building-netboot-image Creación de una imagen de arranque en red"
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:231
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -658,7 +888,7 @@ msgstr ""
"para el arranque en red."
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:233
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
@@ -667,7 +897,7 @@ msgstr ""
"limpiar el directorio de trabajo con el comando #{lb clean}#:"
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:241
msgid ""
"Run the #{lb config}# command as follows to configure your image for "
"netbooting:"
@@ -676,13 +906,13 @@ msgstr ""
"imagen de arranque en red:"
#. type: Plain text
-#: en/user_basics.ssi:192
+#: en/user_basics.ssi:245
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
msgstr " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:249
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
"serve the filesystem image to the client, so the files must be served via "
@@ -700,7 +930,7 @@ msgstr ""
"los valores adecuados para la red y el servidor deseados."
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:259
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -718,7 +948,7 @@ msgstr ""
"sistema operativo como Linux."
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:261
msgid ""
"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
@@ -731,7 +961,7 @@ msgstr ""
"arranque pxelinux en #{tftpboot/debian-live/i386}#."
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:263
msgid ""
"We must now configure three services on the server to enable netboot: the "
"DHCP server, the TFTP server and the NFS server."
@@ -740,12 +970,12 @@ msgstr ""
"red: el servidor DHCP, el servidor TFTP y el servidor NFS."
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:265
msgid "3~ DHCP server"
msgstr "3~ Servidor DHCP"
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:267
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -756,7 +986,7 @@ msgstr ""
"arranque PXE."
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:269
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
@@ -766,19 +996,19 @@ msgstr ""
"dhcp/dhcpd.conf}#:"
#. type: Plain text
-#: en/user_basics.ssi:220
+#: en/user_basics.ssi:273
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
msgstr " # /etc/dhcp/dhcpd.conf - fichero de configuración para isc-dhcp-server\n"
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:275
#, no-wrap
msgid " ddns-update-style none;\n"
msgstr " ddns-update-style none;\n"
#. type: Plain text
-#: en/user_basics.ssi:225
+#: en/user_basics.ssi:278
#, no-wrap
msgid ""
" option domain-name \"example.org\";\n"
@@ -788,7 +1018,7 @@ msgstr ""
" option domain-name-servers ns1.example.org, ns2.example.org;\n"
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:281
#, no-wrap
msgid ""
" default-lease-time 600;\n"
@@ -798,13 +1028,13 @@ msgstr ""
" max-lease-time 7200;\n"
#. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:283
#, no-wrap
msgid " log-facility local7;\n"
msgstr " log-facility local7;\n"
#. type: Plain text
-#: en/user_basics.ssi:236
+#: en/user_basics.ssi:289
#, no-wrap
msgid ""
" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
@@ -820,18 +1050,18 @@ msgstr ""
"}\n"
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:293
msgid "3~ TFTP server"
msgstr "3~ Servidor TFTP"
#. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:295
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
"Se encarga de suministrar el kernel y el Disco RAM inicial para el sistema."
#. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:297
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
@@ -843,23 +1073,23 @@ msgstr ""
"#, se debe ejecutar el siguiente comando con privilegios de superusuario:"
#. type: Plain text
-#: en/user_basics.ssi:248
+#: en/user_basics.ssi:301
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
msgstr " # dpkg-reconfigure -plow tftpd-hpa\n"
#. type: Plain text
-#: en/user_basics.ssi:252
+#: en/user_basics.ssi:305
msgid "and fill in the new tftp server directory when being asked about it."
msgstr "y llenar el directorio del nuevo servidor tftp cuando sea requerido."
#. type: Plain text
-#: en/user_basics.ssi:254
+#: en/user_basics.ssi:307
msgid "3~ NFS server"
msgstr "3~ Servidor NFS "
#. type: Plain text
-#: en/user_basics.ssi:256
+#: en/user_basics.ssi:309
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -870,12 +1100,12 @@ msgstr ""
"través de un servidor NFS."
#. type: Plain text
-#: en/user_basics.ssi:258
+#: en/user_basics.ssi:311
msgid "You need to install the #{nfs-kernel-server}# package."
msgstr "Se debe instalar el paquete #{nfs-kernel-server}#."
#. type: Plain text
-#: en/user_basics.ssi:260
+#: en/user_basics.ssi:313
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to #{/etc/exports}#:"
@@ -885,13 +1115,13 @@ msgstr ""
"exports}#:"
#. type: Plain text
-#: en/user_basics.ssi:264
+#: en/user_basics.ssi:317
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
msgstr " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
#. type: Plain text
-#: en/user_basics.ssi:268
+#: en/user_basics.ssi:321
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
@@ -899,13 +1129,13 @@ msgstr ""
"comando:"
#. type: Plain text
-#: en/user_basics.ssi:272
+#: en/user_basics.ssi:325
#, no-wrap
msgid " # exportfs -rv\n"
msgstr " # exportfs -rv\n"
#. type: Plain text
-#: en/user_basics.ssi:276
+#: en/user_basics.ssi:329
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. For more information, see the "
@@ -923,12 +1153,12 @@ msgstr ""
"similares."
#. type: Plain text
-#: en/user_basics.ssi:278
+#: en/user_basics.ssi:331
msgid "3~ Netboot testing HowTo"
msgstr "3~ Cómo probar el arranque en red"
#. type: Plain text
-#: en/user_basics.ssi:280
+#: en/user_basics.ssi:333
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
@@ -938,7 +1168,7 @@ msgstr ""
"proceso mucho más lento."
#. type: Plain text
-#: en/user_basics.ssi:282
+#: en/user_basics.ssi:335
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
@@ -946,22 +1176,22 @@ msgstr ""
"dos soluciones."
#. type: Plain text
-#: en/user_basics.ssi:284
+#: en/user_basics.ssi:337
msgid "3~ Qemu"
msgstr "3~ Qemu"
#. type: Plain text
-#: en/user_basics.ssi:286
+#: en/user_basics.ssi:339
msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
#. type: Plain text
-#: en/user_basics.ssi:288
+#: en/user_basics.ssi:341
msgid "Edit #{/etc/qemu-ifup}#:"
msgstr "Se debe editar el fichero #{/etc/qemu-ifup}#:"
#. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:352
#, no-wrap
msgid ""
" #!/bin/sh\n"
@@ -983,29 +1213,29 @@ msgstr ""
" sleep 2\n"
#. type: Plain text
-#: en/user_basics.ssi:303
+#: en/user_basics.ssi:356
msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr "Obtener o crear un #{grub-floppy-netboot}# (en el svn)."
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:358
msgid ""
"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
"Lanzar #{qemu}# con \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:360
msgid "3~ VMWare Player"
msgstr "3~ VMWare Player"
#. type: Plain text
-#: en/user_basics.ssi:309
+#: en/user_basics.ssi:362
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr "_* Instalar VMWare Player (Edición gratuita \"free as in beer\")"
#. type: Plain text
-#: en/user_basics.ssi:311
+#: en/user_basics.ssi:364
msgid ""
"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
"inside"
@@ -1014,12 +1244,12 @@ msgstr ""
"{pxe.vwx}#"
#. type: Plain text
-#: en/user_basics.ssi:313
+#: en/user_basics.ssi:366
msgid "_* Paste this text inside:"
msgstr "_* Copiar este texto dentro:"
#. type: Plain text
-#: en/user_basics.ssi:321
+#: en/user_basics.ssi:374
#, no-wrap
msgid ""
" #!/usr/bin/vmware\n"
@@ -1035,7 +1265,7 @@ msgstr ""
" MemAllowAutoScaleDown = \"FALSE\"\n"
#. type: Plain text
-#: en/user_basics.ssi:327
+#: en/user_basics.ssi:380
#, no-wrap
msgid ""
" ide0:0.present = \"FALSE\"\n"
@@ -1051,7 +1281,7 @@ msgstr ""
" tools.remindInstall = \"FALSE\"\n"
#. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:383
#, no-wrap
msgid ""
" ethernet0.present = \"TRUE\"\n"
@@ -1061,7 +1291,7 @@ msgstr ""
" ethernet0.addressType = \"generated\"\n"
#. type: Plain text
-#: en/user_basics.ssi:333
+#: en/user_basics.ssi:386
#, no-wrap
msgid ""
" displayName = \"Test Boot PXE\"\n"
@@ -1071,7 +1301,7 @@ msgstr ""
" guestOS = \"other\"\n"
#. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:391
#, no-wrap
msgid ""
" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
@@ -1085,7 +1315,7 @@ msgstr ""
" ethernet0.generatedAddressOffset = \"0\"\n"
#. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:395
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
@@ -1094,7 +1324,7 @@ msgstr ""
"cambiar el limite de memoria a 256)"
#. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:397
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
@@ -1102,7 +1332,7 @@ msgstr ""
"este fichero)."
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:398
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
"_* Mientras esté en ejecución solo hay que pulsar espacio si surge esa "
diff --git a/manual/po/es/user_overview.ssi.po b/manual/po/es/user_overview.ssi.po
index c45b656..f5cdc8c 100644
--- a/manual/po/es/user_overview.ssi.po
+++ b/manual/po/es/user_overview.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-02-28 12:48-0400\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2011-03-02 05:13-0000\n"
"Last-Translator: José Luis Zabalza <jlz.3008 at gmail.com>\n"
"Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -20,21 +20,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
+#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
+#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
+#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
+#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
+#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
+#: en/user_basics.ssi:343 en/user_basics.ssi:368
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -84,21 +85,22 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
+#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
+#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
+#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
+#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
+#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
+#: en/user_basics.ssi:354 en/user_basics.ssi:393
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -439,10 +441,15 @@ msgstr "3~lb-build El comando #{lb build}#"
#. type: Plain text
#: en/user_overview.ssi:98
+#, fuzzy
+#| msgid ""
+#| "The #{lb build}# command reads in your configuration from the config/ "
+#| "directory. It then runs the lower lower level commands needed to build "
+#| "your Live system."
msgid ""
"The #{lb build}# command reads in your configuration from the config/ "
-"directory. It then runs the lower lower level commands needed to build your "
-"Live system."
+"directory. It then runs the lower level commands needed to build your Live "
+"system."
msgstr ""
"El comando #{lb build}# lee la configuración del directorio config/. A "
"continuación, ejecuta los comandos del nivel inferior más bajo necesarios "
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index a687785..630c529 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-13 14:58+0100\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2010-10-21 07:06-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-13\n"
+" :published: 2011-03-17\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index 9623e0f..dce918d 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-02 08:01-0400\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,21 +19,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
+#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
+#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
+#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
+#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
+#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
+#: en/user_basics.ssi:343 en/user_basics.ssi:368
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -83,21 +84,22 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
+#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
+#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
+#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
+#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
+#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
+#: en/user_basics.ssi:354 en/user_basics.ssi:393
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -160,14 +162,14 @@ msgid ""
"This chapter contains a brief overview of the build process and instructions "
"for using the three most commonly used image types. The most versatile image "
"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
-"portable storage device. In certain special cases, #{usb-hdd}# may be more "
-"suitable for USB devices. The chapter finishes with instructions for "
-"building and using a #{net}# type image, which is a bit more involved due to "
-"the setup required on the server. This is a slightly advanced topic for "
-"anyone who is not familiar already with netbooting, but is included here "
-"because once the setup is done, it is a very convenient way to test and "
-"deploy images for booting on the local network without the hassle of dealing "
-"with image media."
+"portable storage device. In certain special cases, such as the use of "
+"persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter "
+"finishes with instructions for building and using a #{net}# type image, "
+"which is a bit more involved due to the setup required on the server. This "
+"is a slightly advanced topic for anyone who is not familiar already with "
+"netbooting, but is included here because once the setup is done, it is a "
+"very convenient way to test and deploy images for booting on the local "
+"network without the hassle of dealing with image media."
msgstr ""
#. type: Plain text
@@ -240,23 +242,23 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:24
-msgid "2~ First steps: building an ISO image"
+msgid "2~ First steps: building an ISO hybrid image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:26
msgid ""
-"The following sequence of live-build commands will create a basic ISO hybrid "
-"image containing just the Debian standard system without X.org. It is "
-"suitable for burning to CD or DVD media, and also to copy onto a USB stick "
-"(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
-"specifying \".iso\" extension where \".img\" is indicated)."
+"Regardless of the image type, you will need to perform the same basic steps "
+"to build an image each time. As a first example, execute the following "
+"sequence of live-build commands to create a basic ISO hybrid image "
+"containing just the Debian standard system without X.org. It is suitable for "
+"burning to CD or DVD media, and also to copy onto a USB stick."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:28
msgid ""
-"First, we run the #{lb config}# command which will create a \"config/\" "
+"First, run the #{lb config}# command. This will create a \"config/\" "
"hierarchy in the current directory for use by other commands:"
msgstr ""
@@ -269,19 +271,20 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:36
msgid ""
-"By passing no parameters to #{lb config}#, we indicated that we wish to use "
-"the defaults (see {The lb config command}#lb-config)."
+"No parameters are passed to #{lb config}#, so defaults for all of its "
+"various options will be used. See {The lb config command}#lb-config for more "
+"details."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:38
msgid ""
-"Now that we have a \"config/\" hierarchy, we may build the image with the #"
-"{lb build}# command:"
+"Now that the \"config/\" hierarchy exists, build the image with the #{lb "
+"build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_basics.ssi:42 en/user_basics.ssi:169 en/user_basics.ssi:255
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -291,104 +294,264 @@ msgstr ""
#: en/user_basics.ssi:46
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection (see {The lb build command}#lb-build)."
+"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"image file, ready to use, in the current directory."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:48
-msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
+msgid "2~ Using an ISO hybrid live image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "Testing an ISO is simple:"
+msgid ""
+"After either building or downloading an ISO hybrid image, which can be "
+"obtained at http://www.debian.org/CD/live/, the usual next step is to "
+"prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or "
+"a USB stick."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:54 en/user_basics.ssi:142
-#, no-wrap
-msgid " # apt-get install qemu\n"
+#: en/user_basics.ssi:52
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:54
+msgid "Burning an ISO image is easy:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56
+#: en/user_basics.ssi:58
#, no-wrap
-msgid " $ qemu -cdrom binary.iso\n"
+msgid " # apt-get install wodim\n"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:60
-msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
+#, no-wrap
+msgid " $ wodim binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:62
-msgid "In order to test the ISO with virtualbox-ose:"
+#: en/user_basics.ssi:64
+msgid "3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:66
-#, no-wrap
-msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
+msgid ""
+"ISO images prepared with the #{isohybrid}# command, like the images produced "
+"by live-build's default #{iso-hybrid}# binary image type, can be copied to a "
+"USB stick and directly booted without further steps. Plug in a USB stick "
+"with a size larger than that of #{binary-hybrid.iso}# and determine which "
+"device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the "
+"device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/"
+"dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s "
+"output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:68
+#: en/user_basics.ssi:68 en/user_basics.ssi:187
#, no-wrap
-msgid " $ virtualbox\n"
+msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:70
msgid ""
-"Create a new virtual machine, change the storage settings to use binary.iso "
-"as the CD/DVD device, and start the machine."
+"Once you are certain you have the correct device name, use the #{dd}# "
+"command to copy the image to the stick as follows:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:74
+#, no-wrap
+msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:79
+msgid "3~ Booting the live media"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:81
+msgid ""
+"The first time you boot your live media, whether CD, DVD, USB key, or PXE "
+"boot, some setup in your computer's BIOS may be needed first. Since BIOSes "
+"vary greatly in features and key bindings, we cannot get into the topic in "
+"depth here. Some BIOSes provide a key to bring up a menu of boot devices at "
+"boot time, which is the easiest way if it is available on your system. "
+"Otherwise, you need to enter the BIOS configuration menu and change the boot "
+"order to place the boot device for the live system before your normal boot "
+"device."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:83
+msgid ""
+"Once you've booted the media, you are presented with a boot menu. If you "
+"just press enter here, the system will boot using the default entry, #{Live}"
+"# and default options. For more information about boot options, see the "
+"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
+"man pages found within the live system."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:85
+msgid ""
+"Assuming you've selected #{Live}# and booted a default desktop live image, "
+"after the boot messages scroll by, you should be automatically logged into "
+"the #{user}# account and see a desktop, ready to use. If you've booted a "
+"console-only image, such as #{standard}# or #{rescue}# flavour prebuilt "
+"images, you should be automatically logged in on the console to the #{user}# "
+"account and see a shell prompt, ready to use."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:87
+msgid "2~ Using a virtual machine for testing"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:89
+msgid ""
+"It can be a great time-saver for the development of live images to run them "
+"in a virtual machine (VM). This is not without its caveats:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:91
+msgid ""
+"_* Running a VM requires enough RAM for both the guest OS and the host and a "
+"CPU with hardware support for virtualization is recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:93
+msgid ""
+"_* There are some inherent limitations to running on a VM, e.g. poor video "
+"performance, limited choice of emulated hardware."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:95
+msgid ""
+"_* When developing for specific hardware, there is no substitute for running "
+"on the hardware itself."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:97
+msgid ""
+"_* Occasionally there are bugs that relate only to running in a VM. When in "
+"doubt, test your image directly on the hardware."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:99
+msgid ""
+"Provided you can work within these constraints, survey the available VM "
+"software and choose one that is suitable for your needs."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:101
+msgid "3~testing-iso-with-qemu Testing an ISO image with QEMU"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:103
+msgid ""
+"The most versatile VM in Debian is QEMU. If your processor has hardware "
+"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"package description briefly lists the requirements."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:105
msgid ""
-"Note: For live systems containing X.org that you want to test with "
-"virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
-"virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the "
-"resolution is limited to 800x600."
+"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
+"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The #{qemu-utils}# package is also valuable for "
+"creating virtual disk images with #{qemu-img}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:78
+#: en/user_basics.ssi:109
#, no-wrap
-msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
+msgid " # apt-get install qemu-kvm qemu-utils\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:82
-msgid "3~burning-iso-image Burning an ISO image to a physical medium"
+#: en/user_basics.ssi:113
+msgid "Booting an ISO image is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:84
-msgid "Burning an ISO image is easy:"
+#: en/user_basics.ssi:117
+#, no-wrap
+msgid " $ kvm -cdrom binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:88
+#: en/user_basics.ssi:121
+msgid "See the man pages for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:123
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:125
+msgid "In order to test the ISO with virtualbox-ose:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:129
#, no-wrap
-msgid " # apt-get install wodim\n"
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:131
+#, no-wrap
+msgid " $ virtualbox\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:135
+msgid ""
+"Create a new virtual machine, change the storage settings to use binary-"
+"hybrid.iso as the CD/DVD device, and start the machine."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:137
+msgid ""
+"Note: For live systems containing X.org that you want to test with #"
+"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
+"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
+"Otherwise, the resolution is limited to 800x600."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:141
#, no-wrap
-msgid " $ wodim binary.iso\n"
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:145
msgid "2~ Building a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:147
msgid ""
"The following sequence of commands will create a basic USB/HDD image "
"containing just the Debian standard system without X.org. It is suitable for "
@@ -400,7 +563,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:149
msgid ""
"Note: if you created an ISO image with the previous example, you will need "
"to clean up your working directory with the #{lb clean}# command (see {The "
@@ -408,36 +571,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#: en/user_basics.ssi:153 en/user_basics.ssi:237
#, no-wrap
msgid " # lb clean --binary\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:106
+#: en/user_basics.ssi:157
msgid ""
"Run the #{lb config}# command with the parameters to configure the #{config/}"
"# hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:110
+#: en/user_basics.ssi:161
#, no-wrap
msgid " $ lb config -b usb-hdd\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:114 en/user_basics.ssi:198
+#: en/user_basics.ssi:165 en/user_basics.ssi:251
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:122
+#: en/user_basics.ssi:173
msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:175
+msgid ""
+"% FIXME: eliminate duplication with ISO hybrid, as these are virtually the "
+"same instructions!"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:177
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
"bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -445,13 +615,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:128
+#: en/user_basics.ssi:181
#, no-wrap
msgid " $ dd if=binary.img of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:132
+#: en/user_basics.ssi:185
msgid ""
"where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
"a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -460,36 +630,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:134
-#, no-wrap
-msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:189
msgid ""
"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:191
msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:195
+#, no-wrap
+msgid " # apt-get install qemu\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:197
#, no-wrap
msgid " $ qemu -hda binary.img\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:201
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:203
msgid ""
"If you want to use the remaining free space after you have installed the "
"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -498,13 +668,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:207
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:211
msgid ""
"After the creation of the partition, where #{${PARTITION}}# is the name of "
"the partition, like #{/dev/sdb2}#, you have to create a filesystem on it. "
@@ -512,35 +682,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:215
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:219
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:223
#, no-wrap
msgid " # mkfs.vfat -F 32\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:227
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:229
msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:231
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -548,27 +718,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:233
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:241
msgid ""
"Run the #{lb config}# command as follows to configure your image for "
"netbooting:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:192
+#: en/user_basics.ssi:245
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:249
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
"serve the filesystem image to the client, so the files must be served via "
@@ -579,7 +749,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:259
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -590,7 +760,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:261
msgid ""
"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
@@ -599,19 +769,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:263
msgid ""
"We must now configure three services on the server to enable netboot: the "
"DHCP server, the TFTP server and the NFS server."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:265
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:267
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -619,26 +789,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:269
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:220
+#: en/user_basics.ssi:273
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:275
#, no-wrap
msgid " ddns-update-style none;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:225
+#: en/user_basics.ssi:278
#, no-wrap
msgid ""
" option domain-name \"example.org\";\n"
@@ -646,7 +816,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:281
#, no-wrap
msgid ""
" default-lease-time 600;\n"
@@ -654,13 +824,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:283
#, no-wrap
msgid " log-facility local7;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:236
+#: en/user_basics.ssi:289
#, no-wrap
msgid ""
" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
@@ -671,17 +841,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:293
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:295
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:297
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
@@ -689,23 +859,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:248
+#: en/user_basics.ssi:301
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:252
+#: en/user_basics.ssi:305
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:254
+#: en/user_basics.ssi:307
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:256
+#: en/user_basics.ssi:309
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -713,37 +883,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:258
+#: en/user_basics.ssi:311
msgid "You need to install the #{nfs-kernel-server}# package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:260
+#: en/user_basics.ssi:313
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to #{/etc/exports}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:264
+#: en/user_basics.ssi:317
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:268
+#: en/user_basics.ssi:321
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:272
+#: en/user_basics.ssi:325
#, no-wrap
msgid " # exportfs -rv\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:276
+#: en/user_basics.ssi:329
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. For more information, see the "
@@ -754,40 +924,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:278
+#: en/user_basics.ssi:331
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:280
+#: en/user_basics.ssi:333
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:282
+#: en/user_basics.ssi:335
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:284
+#: en/user_basics.ssi:337
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:286
+#: en/user_basics.ssi:339
msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:288
+#: en/user_basics.ssi:341
msgid "Edit #{/etc/qemu-ifup}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:352
#, no-wrap
msgid ""
" #!/bin/sh\n"
@@ -801,40 +971,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:303
+#: en/user_basics.ssi:356
msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:358
msgid ""
"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:360
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:309
+#: en/user_basics.ssi:362
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:311
+#: en/user_basics.ssi:364
msgid ""
"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
"inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:313
+#: en/user_basics.ssi:366
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:321
+#: en/user_basics.ssi:374
#, no-wrap
msgid ""
" #!/usr/bin/vmware\n"
@@ -845,7 +1015,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:327
+#: en/user_basics.ssi:380
#, no-wrap
msgid ""
" ide0:0.present = \"FALSE\"\n"
@@ -856,7 +1026,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:383
#, no-wrap
msgid ""
" ethernet0.present = \"TRUE\"\n"
@@ -864,7 +1034,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:333
+#: en/user_basics.ssi:386
#, no-wrap
msgid ""
" displayName = \"Test Boot PXE\"\n"
@@ -872,7 +1042,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:391
#, no-wrap
msgid ""
" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
@@ -882,19 +1052,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:395
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:397
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:398
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/fr/user_overview.ssi.po b/manual/po/fr/user_overview.ssi.po
index 01f63a4..588bfdb 100644
--- a/manual/po/fr/user_overview.ssi.po
+++ b/manual/po/fr/user_overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-02-28 12:48-0400\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2010-10-21 07:06-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,21 +19,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
+#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
+#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
+#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
+#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
+#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
+#: en/user_basics.ssi:343 en/user_basics.ssi:368
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -83,21 +84,22 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
+#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
+#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
+#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
+#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
+#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
+#: en/user_basics.ssi:354 en/user_basics.ssi:393
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -362,8 +364,8 @@ msgstr ""
#: en/user_overview.ssi:98
msgid ""
"The #{lb build}# command reads in your configuration from the config/ "
-"directory. It then runs the lower lower level commands needed to build your "
-"Live system."
+"directory. It then runs the lower level commands needed to build your Live "
+"system."
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index b0e7f0f..814c2c3 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-13 14:58+0100\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2011-03-11 10:33+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-13\n"
+" :published: 2011-03-17\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index d33c04b..4ef738c 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/it/user_basics.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-02 08:01-0400\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2011-03-11 10:56+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -21,21 +21,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
+#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
+#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
+#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
+#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
+#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
+#: en/user_basics.ssi:343 en/user_basics.ssi:368
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -85,21 +86,22 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
+#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
+#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
+#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
+#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
+#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
+#: en/user_basics.ssi:354 en/user_basics.ssi:393
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -158,18 +160,31 @@ msgstr "1~the-basics Nozioni di base"
#. type: Plain text
#: en/user_basics.ssi:6
+#, fuzzy
+#| msgid ""
+#| "This chapter contains a brief overview of the build process and "
+#| "instructions for using the three most commonly used image types. The most "
+#| "versatile image type, #{iso-hybrid}#, may be used on a virtual machine, "
+#| "optical media or USB portable storage device. In certain special cases, #"
+#| "{usb-hdd}# may be more suitable for USB devices. The chapter finishes "
+#| "with instructions for building and using a #{net}# type image, which is a "
+#| "bit more involved due to the setup required on the server. This is a "
+#| "slightly advanced topic for anyone who is not familiar already with "
+#| "netbooting, but is included here because once the setup is done, it is a "
+#| "very convenient way to test and deploy images for booting on the local "
+#| "network without the hassle of dealing with image media."
msgid ""
"This chapter contains a brief overview of the build process and instructions "
"for using the three most commonly used image types. The most versatile image "
"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
-"portable storage device. In certain special cases, #{usb-hdd}# may be more "
-"suitable for USB devices. The chapter finishes with instructions for "
-"building and using a #{net}# type image, which is a bit more involved due to "
-"the setup required on the server. This is a slightly advanced topic for "
-"anyone who is not familiar already with netbooting, but is included here "
-"because once the setup is done, it is a very convenient way to test and "
-"deploy images for booting on the local network without the hassle of dealing "
-"with image media."
+"portable storage device. In certain special cases, such as the use of "
+"persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter "
+"finishes with instructions for building and using a #{net}# type image, "
+"which is a bit more involved due to the setup required on the server. This "
+"is a slightly advanced topic for anyone who is not familiar already with "
+"netbooting, but is included here because once the setup is done, it is a "
+"very convenient way to test and deploy images for booting on the local "
+"network without the hassle of dealing with image media."
msgstr ""
"Questo capitolo contiene una breve panoramica del processo di generazione e "
"le istruzioni per utilizzare i tre tipi di immagine più comunemente "
@@ -287,17 +302,26 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:24
-msgid "2~ First steps: building an ISO image"
+#, fuzzy
+#| msgid "2~ First steps: building an ISO image"
+msgid "2~ First steps: building an ISO hybrid image"
msgstr "2~ Primi passi: creare un'immagine ISO"
#. type: Plain text
#: en/user_basics.ssi:26
+#, fuzzy
+#| msgid ""
+#| "The following sequence of live-build commands will create a basic ISO "
+#| "hybrid image containing just the Debian standard system without X.org. It "
+#| "is suitable for burning to CD or DVD media, and also to copy onto a USB "
+#| "stick (as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-"
+#| "image, specifying \".iso\" extension where \".img\" is indicated)."
msgid ""
-"The following sequence of live-build commands will create a basic ISO hybrid "
-"image containing just the Debian standard system without X.org. It is "
-"suitable for burning to CD or DVD media, and also to copy onto a USB stick "
-"(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
-"specifying \".iso\" extension where \".img\" is indicated)."
+"Regardless of the image type, you will need to perform the same basic steps "
+"to build an image each time. As a first example, execute the following "
+"sequence of live-build commands to create a basic ISO hybrid image "
+"containing just the Debian standard system without X.org. It is suitable for "
+"burning to CD or DVD media, and also to copy onto a USB stick."
msgstr ""
"La seguente sequenza di comandi di live-build creerà un'immagine ISO ibrida "
"di base contenente soltanto il sistema Debian standard senza X.org. È adatta "
@@ -307,8 +331,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:28
+#, fuzzy
+#| msgid ""
+#| "First, we run the #{lb config}# command which will create a \"config/\" "
+#| "hierarchy in the current directory for use by other commands:"
msgid ""
-"First, we run the #{lb config}# command which will create a \"config/\" "
+"First, run the #{lb config}# command. This will create a \"config/\" "
"hierarchy in the current directory for use by other commands:"
msgstr ""
"In primo luogo eseguire il comando #{lb config}#, il quale creerà una "
@@ -323,9 +351,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:36
+#, fuzzy
+#| msgid ""
+#| "By passing no parameters to #{lb config}#, we indicated that we wish to "
+#| "use the defaults (see {The lb config command}#lb-config)."
msgid ""
-"By passing no parameters to #{lb config}#, we indicated that we wish to use "
-"the defaults (see {The lb config command}#lb-config)."
+"No parameters are passed to #{lb config}#, so defaults for all of its "
+"various options will be used. See {The lb config command}#lb-config for more "
+"details."
msgstr ""
"Non passando alcun parametro a #{lb config}#, si indica che si intende "
"utilizzare le impostazione predefinite (vedere {Il comando lb config}#lb-"
@@ -333,15 +366,19 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:38
+#, fuzzy
+#| msgid ""
+#| "Now that we have a \"config/\" hierarchy, we may build the image with the "
+#| "#{lb build}# command:"
msgid ""
-"Now that we have a \"config/\" hierarchy, we may build the image with the #"
-"{lb build}# command:"
+"Now that the \"config/\" hierarchy exists, build the image with the #{lb "
+"build}# command:"
msgstr ""
"Ora che si ha una gerarchia \"config/\" si può generare l'immagine con il "
"comando #{lb build}#:"
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_basics.ssi:42 en/user_basics.ssi:169 en/user_basics.ssi:255
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -349,75 +386,279 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:46
+#, fuzzy
+#| msgid ""
+#| "This process can take a while, depending on the speed of your network "
+#| "connection (see {The lb build command}#lb-build)."
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection (see {The lb build command}#lb-build)."
+"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"image file, ready to use, in the current directory."
msgstr ""
"Questo processo può richiedere tempo, a seconda della velocità della "
"connessione di rete (vedere {Il comando lb build}#lb-build)."
#. type: Plain text
#: en/user_basics.ssi:48
-msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
-msgstr "3~testing-iso-with-qemu Provare un'immagine ISO con Qemu"
+msgid "2~ Using an ISO hybrid live image"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "Testing an ISO is simple:"
-msgstr "Collaudare una ISO è semplice:"
+msgid ""
+"After either building or downloading an ISO hybrid image, which can be "
+"obtained at http://www.debian.org/CD/live/, the usual next step is to "
+"prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or "
+"a USB stick."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:52
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
+msgstr "3~burning-iso-image Masterizzare un'immagine ISO su un supporto fisico"
#. type: Plain text
-#: en/user_basics.ssi:54 en/user_basics.ssi:142
+#: en/user_basics.ssi:54
+msgid "Burning an ISO image is easy:"
+msgstr "Masterizzare un'immagine ISO è semplice:"
+
+#. type: Plain text
+#: en/user_basics.ssi:58
#, no-wrap
-msgid " # apt-get install qemu\n"
+msgid " # apt-get install wodim\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56
+#: en/user_basics.ssi:60
#, no-wrap
-msgid " $ qemu -cdrom binary.iso\n"
+msgid " $ wodim binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:64
+#, fuzzy
+#| msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
+msgid "3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick"
+msgstr "3~copying-usb-hdd-image Copiare un'immagine USB/HDD su una penna USB"
+
+#. type: Plain text
+#: en/user_basics.ssi:66
+msgid ""
+"ISO images prepared with the #{isohybrid}# command, like the images produced "
+"by live-build's default #{iso-hybrid}# binary image type, can be copied to a "
+"USB stick and directly booted without further steps. Plug in a USB stick "
+"with a size larger than that of #{binary-hybrid.iso}# and determine which "
+"device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the "
+"device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/"
+"dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s "
+"output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:68 en/user_basics.ssi:187
+#, no-wrap
+msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
+msgstr "*{Questo sovrascriverà definitivamente qualsiasi dato esistente sulla chiavetta!}*\n"
+
+#. type: Plain text
+#: en/user_basics.ssi:70
+msgid ""
+"Once you are certain you have the correct device name, use the #{dd}# "
+"command to copy the image to the stick as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:74
+#, no-wrap
+msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:79
+#, fuzzy
+#| msgid "2~ Customizing the live user"
+msgid "3~ Booting the live media"
+msgstr "2~ Personalizzare l'utente live"
+
+#. type: Plain text
+#: en/user_basics.ssi:81
+msgid ""
+"The first time you boot your live media, whether CD, DVD, USB key, or PXE "
+"boot, some setup in your computer's BIOS may be needed first. Since BIOSes "
+"vary greatly in features and key bindings, we cannot get into the topic in "
+"depth here. Some BIOSes provide a key to bring up a menu of boot devices at "
+"boot time, which is the easiest way if it is available on your system. "
+"Otherwise, you need to enter the BIOS configuration menu and change the boot "
+"order to place the boot device for the live system before your normal boot "
+"device."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:83
+msgid ""
+"Once you've booted the media, you are presented with a boot menu. If you "
+"just press enter here, the system will boot using the default entry, #{Live}"
+"# and default options. For more information about boot options, see the "
+"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
+"man pages found within the live system."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:85
+msgid ""
+"Assuming you've selected #{Live}# and booted a default desktop live image, "
+"after the boot messages scroll by, you should be automatically logged into "
+"the #{user}# account and see a desktop, ready to use. If you've booted a "
+"console-only image, such as #{standard}# or #{rescue}# flavour prebuilt "
+"images, you should be automatically logged in on the console to the #{user}# "
+"account and see a shell prompt, ready to use."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:87
+msgid "2~ Using a virtual machine for testing"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:89
+msgid ""
+"It can be a great time-saver for the development of live images to run them "
+"in a virtual machine (VM). This is not without its caveats:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:91
+msgid ""
+"_* Running a VM requires enough RAM for both the guest OS and the host and a "
+"CPU with hardware support for virtualization is recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:93
+msgid ""
+"_* There are some inherent limitations to running on a VM, e.g. poor video "
+"performance, limited choice of emulated hardware."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:95
+msgid ""
+"_* When developing for specific hardware, there is no substitute for running "
+"on the hardware itself."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:97
+msgid ""
+"_* Occasionally there are bugs that relate only to running in a VM. When in "
+"doubt, test your image directly on the hardware."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:99
+msgid ""
+"Provided you can work within these constraints, survey the available VM "
+"software and choose one that is suitable for your needs."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:101
+#, fuzzy
+#| msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
+msgid "3~testing-iso-with-qemu Testing an ISO image with QEMU"
+msgstr "3~testing-iso-with-qemu Provare un'immagine ISO con Qemu"
+
+#. type: Plain text
+#: en/user_basics.ssi:103
+msgid ""
+"The most versatile VM in Debian is QEMU. If your processor has hardware "
+"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"package description briefly lists the requirements."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:105
+msgid ""
+"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
+"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The #{qemu-utils}# package is also valuable for "
+"creating virtual disk images with #{qemu-img}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:109
+#, no-wrap
+msgid " # apt-get install qemu-kvm qemu-utils\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:113
+#, fuzzy
+#| msgid "Testing an ISO is simple:"
+msgid "Booting an ISO image is simple:"
+msgstr "Collaudare una ISO è semplice:"
+
+#. type: Plain text
+#: en/user_basics.ssi:117
+#, no-wrap
+msgid " $ kvm -cdrom binary-hybrid.iso\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:121
+msgid "See the man pages for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:123
msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
"3~testing-iso-with-virtualbox Provare un'immagine ISO con virtualbox-ose"
#. type: Plain text
-#: en/user_basics.ssi:62
+#: en/user_basics.ssi:125
msgid "In order to test the ISO with virtualbox-ose:"
msgstr "Per provare la ISO con virtualbox-ose:"
#. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:129
#, no-wrap
msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:68
+#: en/user_basics.ssi:131
#, no-wrap
msgid " $ virtualbox\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:135
+#, fuzzy
+#| msgid ""
+#| "Create a new virtual machine, change the storage settings to use binary."
+#| "iso as the CD/DVD device, and start the machine."
msgid ""
-"Create a new virtual machine, change the storage settings to use binary.iso "
-"as the CD/DVD device, and start the machine."
+"Create a new virtual machine, change the storage settings to use binary-"
+"hybrid.iso as the CD/DVD device, and start the machine."
msgstr ""
"Creare una nuova macchina virtuale, modificare le impostazione di "
"archiviazione in modo da usare binary.iso come dispositivo CD/DVD, ed "
"avviare la macchina."
#. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:137
+#, fuzzy
+#| msgid ""
+#| "Note: For live systems containing X.org that you want to test with "
+#| "virtualbox-ose, you may wish to include the VirtualBox X.org driver "
+#| "package, virtualbox-ose-guest-x11, in your live-build configuration. "
+#| "Otherwise, the resolution is limited to 800x600."
msgid ""
-"Note: For live systems containing X.org that you want to test with "
-"virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
-"virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the "
-"resolution is limited to 800x600."
+"Note: For live systems containing X.org that you want to test with #"
+"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
+"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
+"Otherwise, the resolution is limited to 800x600."
msgstr ""
"Nota: per sistemi live contenenti X.org che si vogliono provare con "
"virtualbox-ose, si può voler includere il pacchetto dei driver per X.org di "
@@ -425,40 +666,18 @@ msgstr ""
"Altrimenti, la risoluzione è limitata a 800x600."
#. type: Plain text
-#: en/user_basics.ssi:78
+#: en/user_basics.ssi:141
#, no-wrap
msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:82
-msgid "3~burning-iso-image Burning an ISO image to a physical medium"
-msgstr "3~burning-iso-image Masterizzare un'immagine ISO su un supporto fisico"
-
-#. type: Plain text
-#: en/user_basics.ssi:84
-msgid "Burning an ISO image is easy:"
-msgstr "Masterizzare un'immagine ISO è semplice:"
-
-#. type: Plain text
-#: en/user_basics.ssi:88
-#, no-wrap
-msgid " # apt-get install wodim\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:90
-#, no-wrap
-msgid " $ wodim binary.iso\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:145
msgid "2~ Building a USB/HDD image"
msgstr "2~ Creare un'immagine USB/HDD"
#. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:147
msgid ""
"The following sequence of commands will create a basic USB/HDD image "
"containing just the Debian standard system without X.org. It is suitable for "
@@ -477,7 +696,7 @@ msgstr ""
"partizione persistente, allora occorre un'immagine USB/HDD."
#. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:149
msgid ""
"Note: if you created an ISO image with the previous example, you will need "
"to clean up your working directory with the #{lb clean}# command (see {The "
@@ -488,13 +707,13 @@ msgstr ""
"comando lb clean}#lb-clean):"
#. type: Plain text
-#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#: en/user_basics.ssi:153 en/user_basics.ssi:237
#, no-wrap
msgid " # lb clean --binary\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:106
+#: en/user_basics.ssi:157
msgid ""
"Run the #{lb config}# command with the parameters to configure the #{config/}"
"# hierarchy to create a USB/HDD image type:"
@@ -503,23 +722,30 @@ msgstr ""
"struttura #{config/}# per creare un'immagine di tipo USB/HDD:"
#. type: Plain text
-#: en/user_basics.ssi:110
+#: en/user_basics.ssi:161
#, no-wrap
msgid " $ lb config -b usb-hdd\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:114 en/user_basics.ssi:198
+#: en/user_basics.ssi:165 en/user_basics.ssi:251
msgid "Now build the image with the #{lb build}# command:"
msgstr "Si crei ora l'immagine con il comando #{lb build}#:"
#. type: Plain text
-#: en/user_basics.ssi:122
+#: en/user_basics.ssi:173
msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
msgstr "3~copying-usb-hdd-image Copiare un'immagine USB/HDD su una penna USB"
#. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:175
+msgid ""
+"% FIXME: eliminate duplication with ISO hybrid, as these are virtually the "
+"same instructions!"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:177
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
"bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -531,13 +757,13 @@ msgstr ""
"digitare:"
#. type: Plain text
-#: en/user_basics.ssi:128
+#: en/user_basics.ssi:181
#, no-wrap
msgid " $ dd if=binary.img of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:132
+#: en/user_basics.ssi:185
msgid ""
"where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
"a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -550,13 +776,7 @@ msgstr ""
"meglio ancora #{ls -l /dev/disk/by-id}#."
#. type: Plain text
-#: en/user_basics.ssi:134
-#, no-wrap
-msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
-msgstr "*{Questo sovrascriverà definitivamente qualsiasi dato esistente sulla chiavetta!}*\n"
-
-#. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:189
msgid ""
"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
@@ -566,23 +786,29 @@ msgstr ""
"per le immagini di tipo #{iso}#."
#. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:191
msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
msgstr "3~testing-usb-hdd-with-qemu Provare un'immagine USB/HDD con Qemu"
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:195
+#, no-wrap
+msgid " # apt-get install qemu\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:197
#, no-wrap
msgid " $ qemu -hda binary.img\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:201
msgid "3~ Using the space left on a USB stick"
msgstr "3~ Usare lo spazio rimanente su una penna USB"
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:203
msgid ""
"If you want to use the remaining free space after you have installed the "
"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -595,13 +821,13 @@ msgstr ""
"verrà utilizzata dal sistema Debian Live."
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:207
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:211
msgid ""
"After the creation of the partition, where #{${PARTITION}}# is the name of "
"the partition, like #{/dev/sdb2}#, you have to create a filesystem on it. "
@@ -612,35 +838,35 @@ msgstr ""
"filesystem. Una scelta possibile potrebbe essere ext4."
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:215
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:219
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr "Usare FAT32 se si vuole usare questa partizione dati con Windows."
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:223
#, no-wrap
msgid " # mkfs.vfat -F 32\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:227
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr "*{Ricorda: ogni volta che si installa un nuovo file binary.img sulla penna, tutti i dati sulla chiavetta saranno persi perché la tabella delle partizioni viene sovrascritta con i contenuti dell'immagine.}*\n"
#. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:229
msgid "2~building-netboot-image Building a netboot image"
msgstr "2~building-netboot-image Creare un'immagine netboot"
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:231
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -651,7 +877,7 @@ msgstr ""
"tramite rete."
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:233
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
@@ -660,7 +886,7 @@ msgstr ""
"la directory di lavoro con il comando #{lb clean}#:"
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:241
msgid ""
"Run the #{lb config}# command as follows to configure your image for "
"netbooting:"
@@ -669,13 +895,13 @@ msgstr ""
"config}# come segue:"
#. type: Plain text
-#: en/user_basics.ssi:192
+#: en/user_basics.ssi:245
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:249
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
"serve the filesystem image to the client, so the files must be served via "
@@ -692,7 +918,7 @@ msgstr ""
"valori adeguati alla propria rete."
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:259
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -710,7 +936,7 @@ msgstr ""
"come Linux."
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:261
msgid ""
"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
@@ -723,7 +949,7 @@ msgstr ""
"pxelinux in #{tftpboot/debian-live/i386}#."
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:263
msgid ""
"We must now configure three services on the server to enable netboot: the "
"DHCP server, the TFTP server and the NFS server."
@@ -732,12 +958,12 @@ msgstr ""
"server DHCP, TFTP e NFS."
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:265
msgid "3~ DHCP server"
msgstr "3~ Server DHCP"
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:267
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -748,7 +974,7 @@ msgstr ""
"posizione del bootloader PXE."
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:269
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
@@ -757,19 +983,19 @@ msgstr ""
"di configurazione #{/etc/dhcp/dhcpd.conf}#:"
#. type: Plain text
-#: en/user_basics.ssi:220
+#: en/user_basics.ssi:273
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:275
#, no-wrap
msgid " ddns-update-style none;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:225
+#: en/user_basics.ssi:278
#, no-wrap
msgid ""
" option domain-name \"example.org\";\n"
@@ -777,7 +1003,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:281
#, no-wrap
msgid ""
" default-lease-time 600;\n"
@@ -785,13 +1011,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:283
#, no-wrap
msgid " log-facility local7;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:236
+#: en/user_basics.ssi:289
#, no-wrap
msgid ""
" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
@@ -802,18 +1028,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:293
msgid "3~ TFTP server"
msgstr "3~ Server TFTP"
#. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:295
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
"Fornisce al sistema il kernel e il ramdisk iniziale in fase di esecuzione."
#. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:297
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
@@ -825,23 +1051,23 @@ msgstr ""
"seguente comando come utente root:"
#. type: Plain text
-#: en/user_basics.ssi:248
+#: en/user_basics.ssi:301
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:252
+#: en/user_basics.ssi:305
msgid "and fill in the new tftp server directory when being asked about it."
msgstr "e inserire la nuova directory del server tftp quando viene richiesto."
#. type: Plain text
-#: en/user_basics.ssi:254
+#: en/user_basics.ssi:307
msgid "3~ NFS server"
msgstr "3~ Server NFS"
#. type: Plain text
-#: en/user_basics.ssi:256
+#: en/user_basics.ssi:309
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -852,12 +1078,12 @@ msgstr ""
"tramite un server NFS."
#. type: Plain text
-#: en/user_basics.ssi:258
+#: en/user_basics.ssi:311
msgid "You need to install the #{nfs-kernel-server}# package."
msgstr "Bisogna installare il pacchetto #{nfs-kernel-server}#."
#. type: Plain text
-#: en/user_basics.ssi:260
+#: en/user_basics.ssi:313
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to #{/etc/exports}#:"
@@ -866,25 +1092,25 @@ msgstr ""
"una riga come la seguente in #{/etc/exports}#:"
#. type: Plain text
-#: en/user_basics.ssi:264
+#: en/user_basics.ssi:317
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:268
+#: en/user_basics.ssi:321
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr "e comunicare il nuovo export al server NFS con il seguente comando:"
#. type: Plain text
-#: en/user_basics.ssi:272
+#: en/user_basics.ssi:325
#, no-wrap
msgid " # exportfs -rv\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:276
+#: en/user_basics.ssi:329
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. For more information, see the "
@@ -901,12 +1127,12 @@ msgstr ""
"considerato che il procedimento è molto simile."
#. type: Plain text
-#: en/user_basics.ssi:278
+#: en/user_basics.ssi:331
msgid "3~ Netboot testing HowTo"
msgstr "3~ Come provare una netboot"
#. type: Plain text
-#: en/user_basics.ssi:280
+#: en/user_basics.ssi:333
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
@@ -916,7 +1142,7 @@ msgstr ""
"in termini di tempo."
#. type: Plain text
-#: en/user_basics.ssi:282
+#: en/user_basics.ssi:335
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
@@ -924,22 +1150,22 @@ msgstr ""
"soluzioni."
#. type: Plain text
-#: en/user_basics.ssi:284
+#: en/user_basics.ssi:337
msgid "3~ Qemu"
msgstr "3~ Qemu"
#. type: Plain text
-#: en/user_basics.ssi:286
+#: en/user_basics.ssi:339
msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr "_* Installare #{qemu}#, #{bridge-utils}#, #{sudo}#."
#. type: Plain text
-#: en/user_basics.ssi:288
+#: en/user_basics.ssi:341
msgid "Edit #{/etc/qemu-ifup}#:"
msgstr "Modificare #{/etc/qemu-ifup}#:"
#. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:352
#, no-wrap
msgid ""
" #!/bin/sh\n"
@@ -953,29 +1179,29 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:303
+#: en/user_basics.ssi:356
msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr "Procurarsi o compilare #{grub-floppy-netboot}# (su svn)."
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:358
msgid ""
"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
"Lanciare #{qemu}# con \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:360
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:309
+#: en/user_basics.ssi:362
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr "_* Installare VMWare Player (edizione \"free as in beer\")"
#. type: Plain text
-#: en/user_basics.ssi:311
+#: en/user_basics.ssi:364
msgid ""
"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
"inside"
@@ -984,12 +1210,12 @@ msgstr ""
"chiamato #{pxe.vwx}#"
#. type: Plain text
-#: en/user_basics.ssi:313
+#: en/user_basics.ssi:366
msgid "_* Paste this text inside:"
msgstr "_* Vi si copi dentro questo testo:"
#. type: Plain text
-#: en/user_basics.ssi:321
+#: en/user_basics.ssi:374
#, no-wrap
msgid ""
" #!/usr/bin/vmware\n"
@@ -1000,7 +1226,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:327
+#: en/user_basics.ssi:380
#, no-wrap
msgid ""
" ide0:0.present = \"FALSE\"\n"
@@ -1011,7 +1237,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:383
#, no-wrap
msgid ""
" ethernet0.present = \"TRUE\"\n"
@@ -1019,7 +1245,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:333
+#: en/user_basics.ssi:386
#, no-wrap
msgid ""
" displayName = \"Test Boot PXE\"\n"
@@ -1027,7 +1253,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:391
#, no-wrap
msgid ""
" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
@@ -1037,7 +1263,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:395
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
@@ -1046,7 +1272,7 @@ msgstr ""
"portando a 256 il limite della memoria)"
#. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:397
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
@@ -1054,7 +1280,7 @@ msgstr ""
"selezionare questo file)."
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:398
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
"_* Se viene posta qualche strana domanda durante l'esecuzione premere il "
diff --git a/manual/po/it/user_overview.ssi.po b/manual/po/it/user_overview.ssi.po
index 5367a80..39601d6 100644
--- a/manual/po/it/user_overview.ssi.po
+++ b/manual/po/it/user_overview.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-02-28 12:48-0400\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2011-03-11 11:27+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -20,21 +20,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
+#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
+#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
+#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
+#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
+#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
+#: en/user_basics.ssi:343 en/user_basics.ssi:368
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -84,21 +85,22 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
+#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
+#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
+#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
+#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
+#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
+#: en/user_basics.ssi:354 en/user_basics.ssi:393
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -405,10 +407,15 @@ msgstr "3~lb-build Il comando #{lb build}#"
#. type: Plain text
#: en/user_overview.ssi:98
+#, fuzzy
+#| msgid ""
+#| "The #{lb build}# command reads in your configuration from the config/ "
+#| "directory. It then runs the lower lower level commands needed to build "
+#| "your Live system."
msgid ""
"The #{lb build}# command reads in your configuration from the config/ "
-"directory. It then runs the lower lower level commands needed to build your "
-"Live system."
+"directory. It then runs the lower level commands needed to build your Live "
+"system."
msgstr ""
"Il comando #{lb build}# legge la configurazione dalla directory #{config/}# "
"ed esegue ad un livello inferiore i comandi necessari a costruire il sistema "
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index aedfb49..86bbc32 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-13 14:58+0100\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-13\n"
+" :published: 2011-03-17\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 231b558..3655077 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-02 08:01-0400\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,21 +19,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
+#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
+#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
+#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
+#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
+#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
+#: en/user_basics.ssi:343 en/user_basics.ssi:368
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -83,21 +84,22 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
+#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
+#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
+#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
+#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
+#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
+#: en/user_basics.ssi:354 en/user_basics.ssi:393
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -160,14 +162,14 @@ msgid ""
"This chapter contains a brief overview of the build process and instructions "
"for using the three most commonly used image types. The most versatile image "
"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
-"portable storage device. In certain special cases, #{usb-hdd}# may be more "
-"suitable for USB devices. The chapter finishes with instructions for "
-"building and using a #{net}# type image, which is a bit more involved due to "
-"the setup required on the server. This is a slightly advanced topic for "
-"anyone who is not familiar already with netbooting, but is included here "
-"because once the setup is done, it is a very convenient way to test and "
-"deploy images for booting on the local network without the hassle of dealing "
-"with image media."
+"portable storage device. In certain special cases, such as the use of "
+"persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter "
+"finishes with instructions for building and using a #{net}# type image, "
+"which is a bit more involved due to the setup required on the server. This "
+"is a slightly advanced topic for anyone who is not familiar already with "
+"netbooting, but is included here because once the setup is done, it is a "
+"very convenient way to test and deploy images for booting on the local "
+"network without the hassle of dealing with image media."
msgstr ""
#. type: Plain text
@@ -240,23 +242,23 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:24
-msgid "2~ First steps: building an ISO image"
+msgid "2~ First steps: building an ISO hybrid image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:26
msgid ""
-"The following sequence of live-build commands will create a basic ISO hybrid "
-"image containing just the Debian standard system without X.org. It is "
-"suitable for burning to CD or DVD media, and also to copy onto a USB stick "
-"(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
-"specifying \".iso\" extension where \".img\" is indicated)."
+"Regardless of the image type, you will need to perform the same basic steps "
+"to build an image each time. As a first example, execute the following "
+"sequence of live-build commands to create a basic ISO hybrid image "
+"containing just the Debian standard system without X.org. It is suitable for "
+"burning to CD or DVD media, and also to copy onto a USB stick."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:28
msgid ""
-"First, we run the #{lb config}# command which will create a \"config/\" "
+"First, run the #{lb config}# command. This will create a \"config/\" "
"hierarchy in the current directory for use by other commands:"
msgstr ""
@@ -269,19 +271,20 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:36
msgid ""
-"By passing no parameters to #{lb config}#, we indicated that we wish to use "
-"the defaults (see {The lb config command}#lb-config)."
+"No parameters are passed to #{lb config}#, so defaults for all of its "
+"various options will be used. See {The lb config command}#lb-config for more "
+"details."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:38
msgid ""
-"Now that we have a \"config/\" hierarchy, we may build the image with the #"
-"{lb build}# command:"
+"Now that the \"config/\" hierarchy exists, build the image with the #{lb "
+"build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_basics.ssi:42 en/user_basics.ssi:169 en/user_basics.ssi:255
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -291,104 +294,264 @@ msgstr ""
#: en/user_basics.ssi:46
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection (see {The lb build command}#lb-build)."
+"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"image file, ready to use, in the current directory."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:48
-msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
+msgid "2~ Using an ISO hybrid live image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "Testing an ISO is simple:"
+msgid ""
+"After either building or downloading an ISO hybrid image, which can be "
+"obtained at http://www.debian.org/CD/live/, the usual next step is to "
+"prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or "
+"a USB stick."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:54 en/user_basics.ssi:142
-#, no-wrap
-msgid " # apt-get install qemu\n"
+#: en/user_basics.ssi:52
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:54
+msgid "Burning an ISO image is easy:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56
+#: en/user_basics.ssi:58
#, no-wrap
-msgid " $ qemu -cdrom binary.iso\n"
+msgid " # apt-get install wodim\n"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:60
-msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
+#, no-wrap
+msgid " $ wodim binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:62
-msgid "In order to test the ISO with virtualbox-ose:"
+#: en/user_basics.ssi:64
+msgid "3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:66
-#, no-wrap
-msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
+msgid ""
+"ISO images prepared with the #{isohybrid}# command, like the images produced "
+"by live-build's default #{iso-hybrid}# binary image type, can be copied to a "
+"USB stick and directly booted without further steps. Plug in a USB stick "
+"with a size larger than that of #{binary-hybrid.iso}# and determine which "
+"device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the "
+"device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/"
+"dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s "
+"output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:68
+#: en/user_basics.ssi:68 en/user_basics.ssi:187
#, no-wrap
-msgid " $ virtualbox\n"
+msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:70
msgid ""
-"Create a new virtual machine, change the storage settings to use binary.iso "
-"as the CD/DVD device, and start the machine."
+"Once you are certain you have the correct device name, use the #{dd}# "
+"command to copy the image to the stick as follows:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:74
+#, no-wrap
+msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:79
+msgid "3~ Booting the live media"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:81
+msgid ""
+"The first time you boot your live media, whether CD, DVD, USB key, or PXE "
+"boot, some setup in your computer's BIOS may be needed first. Since BIOSes "
+"vary greatly in features and key bindings, we cannot get into the topic in "
+"depth here. Some BIOSes provide a key to bring up a menu of boot devices at "
+"boot time, which is the easiest way if it is available on your system. "
+"Otherwise, you need to enter the BIOS configuration menu and change the boot "
+"order to place the boot device for the live system before your normal boot "
+"device."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:83
+msgid ""
+"Once you've booted the media, you are presented with a boot menu. If you "
+"just press enter here, the system will boot using the default entry, #{Live}"
+"# and default options. For more information about boot options, see the "
+"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
+"man pages found within the live system."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:85
+msgid ""
+"Assuming you've selected #{Live}# and booted a default desktop live image, "
+"after the boot messages scroll by, you should be automatically logged into "
+"the #{user}# account and see a desktop, ready to use. If you've booted a "
+"console-only image, such as #{standard}# or #{rescue}# flavour prebuilt "
+"images, you should be automatically logged in on the console to the #{user}# "
+"account and see a shell prompt, ready to use."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:87
+msgid "2~ Using a virtual machine for testing"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:89
+msgid ""
+"It can be a great time-saver for the development of live images to run them "
+"in a virtual machine (VM). This is not without its caveats:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:91
+msgid ""
+"_* Running a VM requires enough RAM for both the guest OS and the host and a "
+"CPU with hardware support for virtualization is recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:93
+msgid ""
+"_* There are some inherent limitations to running on a VM, e.g. poor video "
+"performance, limited choice of emulated hardware."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:95
+msgid ""
+"_* When developing for specific hardware, there is no substitute for running "
+"on the hardware itself."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:97
+msgid ""
+"_* Occasionally there are bugs that relate only to running in a VM. When in "
+"doubt, test your image directly on the hardware."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:99
+msgid ""
+"Provided you can work within these constraints, survey the available VM "
+"software and choose one that is suitable for your needs."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:101
+msgid "3~testing-iso-with-qemu Testing an ISO image with QEMU"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:103
+msgid ""
+"The most versatile VM in Debian is QEMU. If your processor has hardware "
+"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"package description briefly lists the requirements."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:105
msgid ""
-"Note: For live systems containing X.org that you want to test with "
-"virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
-"virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the "
-"resolution is limited to 800x600."
+"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
+"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The #{qemu-utils}# package is also valuable for "
+"creating virtual disk images with #{qemu-img}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:78
+#: en/user_basics.ssi:109
#, no-wrap
-msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
+msgid " # apt-get install qemu-kvm qemu-utils\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:82
-msgid "3~burning-iso-image Burning an ISO image to a physical medium"
+#: en/user_basics.ssi:113
+msgid "Booting an ISO image is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:84
-msgid "Burning an ISO image is easy:"
+#: en/user_basics.ssi:117
+#, no-wrap
+msgid " $ kvm -cdrom binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:88
+#: en/user_basics.ssi:121
+msgid "See the man pages for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:123
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:125
+msgid "In order to test the ISO with virtualbox-ose:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:129
#, no-wrap
-msgid " # apt-get install wodim\n"
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:131
+#, no-wrap
+msgid " $ virtualbox\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:135
+msgid ""
+"Create a new virtual machine, change the storage settings to use binary-"
+"hybrid.iso as the CD/DVD device, and start the machine."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:137
+msgid ""
+"Note: For live systems containing X.org that you want to test with #"
+"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
+"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
+"Otherwise, the resolution is limited to 800x600."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:141
#, no-wrap
-msgid " $ wodim binary.iso\n"
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:145
msgid "2~ Building a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:147
msgid ""
"The following sequence of commands will create a basic USB/HDD image "
"containing just the Debian standard system without X.org. It is suitable for "
@@ -400,7 +563,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:149
msgid ""
"Note: if you created an ISO image with the previous example, you will need "
"to clean up your working directory with the #{lb clean}# command (see {The "
@@ -408,36 +571,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#: en/user_basics.ssi:153 en/user_basics.ssi:237
#, no-wrap
msgid " # lb clean --binary\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:106
+#: en/user_basics.ssi:157
msgid ""
"Run the #{lb config}# command with the parameters to configure the #{config/}"
"# hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:110
+#: en/user_basics.ssi:161
#, no-wrap
msgid " $ lb config -b usb-hdd\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:114 en/user_basics.ssi:198
+#: en/user_basics.ssi:165 en/user_basics.ssi:251
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:122
+#: en/user_basics.ssi:173
msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:175
+msgid ""
+"% FIXME: eliminate duplication with ISO hybrid, as these are virtually the "
+"same instructions!"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:177
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
"bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -445,13 +615,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:128
+#: en/user_basics.ssi:181
#, no-wrap
msgid " $ dd if=binary.img of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:132
+#: en/user_basics.ssi:185
msgid ""
"where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
"a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -460,36 +630,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:134
-#, no-wrap
-msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:189
msgid ""
"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:191
msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:195
+#, no-wrap
+msgid " # apt-get install qemu\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:197
#, no-wrap
msgid " $ qemu -hda binary.img\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:201
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:203
msgid ""
"If you want to use the remaining free space after you have installed the "
"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -498,13 +668,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:207
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:211
msgid ""
"After the creation of the partition, where #{${PARTITION}}# is the name of "
"the partition, like #{/dev/sdb2}#, you have to create a filesystem on it. "
@@ -512,35 +682,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:215
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:219
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:223
#, no-wrap
msgid " # mkfs.vfat -F 32\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:227
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:229
msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:231
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -548,27 +718,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:233
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:241
msgid ""
"Run the #{lb config}# command as follows to configure your image for "
"netbooting:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:192
+#: en/user_basics.ssi:245
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:249
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
"serve the filesystem image to the client, so the files must be served via "
@@ -579,7 +749,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:259
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -590,7 +760,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:261
msgid ""
"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
@@ -599,19 +769,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:263
msgid ""
"We must now configure three services on the server to enable netboot: the "
"DHCP server, the TFTP server and the NFS server."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:265
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:267
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -619,26 +789,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:269
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:220
+#: en/user_basics.ssi:273
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:275
#, no-wrap
msgid " ddns-update-style none;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:225
+#: en/user_basics.ssi:278
#, no-wrap
msgid ""
" option domain-name \"example.org\";\n"
@@ -646,7 +816,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:281
#, no-wrap
msgid ""
" default-lease-time 600;\n"
@@ -654,13 +824,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:283
#, no-wrap
msgid " log-facility local7;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:236
+#: en/user_basics.ssi:289
#, no-wrap
msgid ""
" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
@@ -671,17 +841,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:293
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:295
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:297
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
@@ -689,23 +859,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:248
+#: en/user_basics.ssi:301
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:252
+#: en/user_basics.ssi:305
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:254
+#: en/user_basics.ssi:307
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:256
+#: en/user_basics.ssi:309
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -713,37 +883,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:258
+#: en/user_basics.ssi:311
msgid "You need to install the #{nfs-kernel-server}# package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:260
+#: en/user_basics.ssi:313
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to #{/etc/exports}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:264
+#: en/user_basics.ssi:317
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:268
+#: en/user_basics.ssi:321
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:272
+#: en/user_basics.ssi:325
#, no-wrap
msgid " # exportfs -rv\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:276
+#: en/user_basics.ssi:329
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. For more information, see the "
@@ -754,40 +924,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:278
+#: en/user_basics.ssi:331
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:280
+#: en/user_basics.ssi:333
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:282
+#: en/user_basics.ssi:335
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:284
+#: en/user_basics.ssi:337
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:286
+#: en/user_basics.ssi:339
msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:288
+#: en/user_basics.ssi:341
msgid "Edit #{/etc/qemu-ifup}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:352
#, no-wrap
msgid ""
" #!/bin/sh\n"
@@ -801,40 +971,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:303
+#: en/user_basics.ssi:356
msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:358
msgid ""
"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:360
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:309
+#: en/user_basics.ssi:362
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:311
+#: en/user_basics.ssi:364
msgid ""
"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
"inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:313
+#: en/user_basics.ssi:366
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:321
+#: en/user_basics.ssi:374
#, no-wrap
msgid ""
" #!/usr/bin/vmware\n"
@@ -845,7 +1015,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:327
+#: en/user_basics.ssi:380
#, no-wrap
msgid ""
" ide0:0.present = \"FALSE\"\n"
@@ -856,7 +1026,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:383
#, no-wrap
msgid ""
" ethernet0.present = \"TRUE\"\n"
@@ -864,7 +1034,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:333
+#: en/user_basics.ssi:386
#, no-wrap
msgid ""
" displayName = \"Test Boot PXE\"\n"
@@ -872,7 +1042,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:391
#, no-wrap
msgid ""
" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
@@ -882,19 +1052,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:395
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:397
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:398
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/pt_BR/user_overview.ssi.po b/manual/po/pt_BR/user_overview.ssi.po
index 0fb3838..77594e1 100644
--- a/manual/po/pt_BR/user_overview.ssi.po
+++ b/manual/po/pt_BR/user_overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-02-28 12:48-0400\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,21 +19,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
+#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
+#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
+#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
+#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
+#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
+#: en/user_basics.ssi:343 en/user_basics.ssi:368
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -83,21 +84,22 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
+#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
+#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
+#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
+#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
+#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
+#: en/user_basics.ssi:354 en/user_basics.ssi:393
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -362,8 +364,8 @@ msgstr ""
#: en/user_overview.ssi:98
msgid ""
"The #{lb build}# command reads in your configuration from the config/ "
-"directory. It then runs the lower lower level commands needed to build your "
-"Live system."
+"directory. It then runs the lower level commands needed to build your Live "
+"system."
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 3f4ba81..97faf6b 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-13 14:58+0100\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-13\n"
+" :published: 2011-03-17\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index 5eacf9d..a4a20a8 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-02 08:01-0400\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,21 +20,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
+#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
+#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
+#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
+#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
+#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
+#: en/user_basics.ssi:343 en/user_basics.ssi:368
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -84,21 +85,22 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
+#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
+#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
+#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
+#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
+#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
+#: en/user_basics.ssi:354 en/user_basics.ssi:393
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -161,14 +163,14 @@ msgid ""
"This chapter contains a brief overview of the build process and instructions "
"for using the three most commonly used image types. The most versatile image "
"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
-"portable storage device. In certain special cases, #{usb-hdd}# may be more "
-"suitable for USB devices. The chapter finishes with instructions for "
-"building and using a #{net}# type image, which is a bit more involved due to "
-"the setup required on the server. This is a slightly advanced topic for "
-"anyone who is not familiar already with netbooting, but is included here "
-"because once the setup is done, it is a very convenient way to test and "
-"deploy images for booting on the local network without the hassle of dealing "
-"with image media."
+"portable storage device. In certain special cases, such as the use of "
+"persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter "
+"finishes with instructions for building and using a #{net}# type image, "
+"which is a bit more involved due to the setup required on the server. This "
+"is a slightly advanced topic for anyone who is not familiar already with "
+"netbooting, but is included here because once the setup is done, it is a "
+"very convenient way to test and deploy images for booting on the local "
+"network without the hassle of dealing with image media."
msgstr ""
#. type: Plain text
@@ -241,23 +243,23 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:24
-msgid "2~ First steps: building an ISO image"
+msgid "2~ First steps: building an ISO hybrid image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:26
msgid ""
-"The following sequence of live-build commands will create a basic ISO hybrid "
-"image containing just the Debian standard system without X.org. It is "
-"suitable for burning to CD or DVD media, and also to copy onto a USB stick "
-"(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
-"specifying \".iso\" extension where \".img\" is indicated)."
+"Regardless of the image type, you will need to perform the same basic steps "
+"to build an image each time. As a first example, execute the following "
+"sequence of live-build commands to create a basic ISO hybrid image "
+"containing just the Debian standard system without X.org. It is suitable for "
+"burning to CD or DVD media, and also to copy onto a USB stick."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:28
msgid ""
-"First, we run the #{lb config}# command which will create a \"config/\" "
+"First, run the #{lb config}# command. This will create a \"config/\" "
"hierarchy in the current directory for use by other commands:"
msgstr ""
@@ -270,19 +272,20 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:36
msgid ""
-"By passing no parameters to #{lb config}#, we indicated that we wish to use "
-"the defaults (see {The lb config command}#lb-config)."
+"No parameters are passed to #{lb config}#, so defaults for all of its "
+"various options will be used. See {The lb config command}#lb-config for more "
+"details."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:38
msgid ""
-"Now that we have a \"config/\" hierarchy, we may build the image with the #"
-"{lb build}# command:"
+"Now that the \"config/\" hierarchy exists, build the image with the #{lb "
+"build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_basics.ssi:42 en/user_basics.ssi:169 en/user_basics.ssi:255
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -292,104 +295,264 @@ msgstr ""
#: en/user_basics.ssi:46
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection (see {The lb build command}#lb-build)."
+"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"image file, ready to use, in the current directory."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:48
-msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
+msgid "2~ Using an ISO hybrid live image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "Testing an ISO is simple:"
+msgid ""
+"After either building or downloading an ISO hybrid image, which can be "
+"obtained at http://www.debian.org/CD/live/, the usual next step is to "
+"prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or "
+"a USB stick."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:54 en/user_basics.ssi:142
-#, no-wrap
-msgid " # apt-get install qemu\n"
+#: en/user_basics.ssi:52
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:54
+msgid "Burning an ISO image is easy:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56
+#: en/user_basics.ssi:58
#, no-wrap
-msgid " $ qemu -cdrom binary.iso\n"
+msgid " # apt-get install wodim\n"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:60
-msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
+#, no-wrap
+msgid " $ wodim binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:62
-msgid "In order to test the ISO with virtualbox-ose:"
+#: en/user_basics.ssi:64
+msgid "3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:66
-#, no-wrap
-msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
+msgid ""
+"ISO images prepared with the #{isohybrid}# command, like the images produced "
+"by live-build's default #{iso-hybrid}# binary image type, can be copied to a "
+"USB stick and directly booted without further steps. Plug in a USB stick "
+"with a size larger than that of #{binary-hybrid.iso}# and determine which "
+"device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the "
+"device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/"
+"dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s "
+"output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:68
+#: en/user_basics.ssi:68 en/user_basics.ssi:187
#, no-wrap
-msgid " $ virtualbox\n"
+msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:70
msgid ""
-"Create a new virtual machine, change the storage settings to use binary.iso "
-"as the CD/DVD device, and start the machine."
+"Once you are certain you have the correct device name, use the #{dd}# "
+"command to copy the image to the stick as follows:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:74
+#, no-wrap
+msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:79
+msgid "3~ Booting the live media"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:81
+msgid ""
+"The first time you boot your live media, whether CD, DVD, USB key, or PXE "
+"boot, some setup in your computer's BIOS may be needed first. Since BIOSes "
+"vary greatly in features and key bindings, we cannot get into the topic in "
+"depth here. Some BIOSes provide a key to bring up a menu of boot devices at "
+"boot time, which is the easiest way if it is available on your system. "
+"Otherwise, you need to enter the BIOS configuration menu and change the boot "
+"order to place the boot device for the live system before your normal boot "
+"device."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:83
+msgid ""
+"Once you've booted the media, you are presented with a boot menu. If you "
+"just press enter here, the system will boot using the default entry, #{Live}"
+"# and default options. For more information about boot options, see the "
+"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
+"man pages found within the live system."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:85
+msgid ""
+"Assuming you've selected #{Live}# and booted a default desktop live image, "
+"after the boot messages scroll by, you should be automatically logged into "
+"the #{user}# account and see a desktop, ready to use. If you've booted a "
+"console-only image, such as #{standard}# or #{rescue}# flavour prebuilt "
+"images, you should be automatically logged in on the console to the #{user}# "
+"account and see a shell prompt, ready to use."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:87
+msgid "2~ Using a virtual machine for testing"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:89
+msgid ""
+"It can be a great time-saver for the development of live images to run them "
+"in a virtual machine (VM). This is not without its caveats:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:91
+msgid ""
+"_* Running a VM requires enough RAM for both the guest OS and the host and a "
+"CPU with hardware support for virtualization is recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:93
+msgid ""
+"_* There are some inherent limitations to running on a VM, e.g. poor video "
+"performance, limited choice of emulated hardware."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:95
+msgid ""
+"_* When developing for specific hardware, there is no substitute for running "
+"on the hardware itself."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:97
+msgid ""
+"_* Occasionally there are bugs that relate only to running in a VM. When in "
+"doubt, test your image directly on the hardware."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:99
+msgid ""
+"Provided you can work within these constraints, survey the available VM "
+"software and choose one that is suitable for your needs."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:101
+msgid "3~testing-iso-with-qemu Testing an ISO image with QEMU"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:103
+msgid ""
+"The most versatile VM in Debian is QEMU. If your processor has hardware "
+"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"package description briefly lists the requirements."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:105
msgid ""
-"Note: For live systems containing X.org that you want to test with "
-"virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
-"virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the "
-"resolution is limited to 800x600."
+"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
+"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The #{qemu-utils}# package is also valuable for "
+"creating virtual disk images with #{qemu-img}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:78
+#: en/user_basics.ssi:109
#, no-wrap
-msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
+msgid " # apt-get install qemu-kvm qemu-utils\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:82
-msgid "3~burning-iso-image Burning an ISO image to a physical medium"
+#: en/user_basics.ssi:113
+msgid "Booting an ISO image is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:84
-msgid "Burning an ISO image is easy:"
+#: en/user_basics.ssi:117
+#, no-wrap
+msgid " $ kvm -cdrom binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:88
+#: en/user_basics.ssi:121
+msgid "See the man pages for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:123
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:125
+msgid "In order to test the ISO with virtualbox-ose:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:129
#, no-wrap
-msgid " # apt-get install wodim\n"
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:131
+#, no-wrap
+msgid " $ virtualbox\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:135
+msgid ""
+"Create a new virtual machine, change the storage settings to use binary-"
+"hybrid.iso as the CD/DVD device, and start the machine."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:137
+msgid ""
+"Note: For live systems containing X.org that you want to test with #"
+"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
+"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
+"Otherwise, the resolution is limited to 800x600."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:141
#, no-wrap
-msgid " $ wodim binary.iso\n"
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:145
msgid "2~ Building a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:147
msgid ""
"The following sequence of commands will create a basic USB/HDD image "
"containing just the Debian standard system without X.org. It is suitable for "
@@ -401,7 +564,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:149
msgid ""
"Note: if you created an ISO image with the previous example, you will need "
"to clean up your working directory with the #{lb clean}# command (see {The "
@@ -409,36 +572,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#: en/user_basics.ssi:153 en/user_basics.ssi:237
#, no-wrap
msgid " # lb clean --binary\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:106
+#: en/user_basics.ssi:157
msgid ""
"Run the #{lb config}# command with the parameters to configure the #{config/}"
"# hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:110
+#: en/user_basics.ssi:161
#, no-wrap
msgid " $ lb config -b usb-hdd\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:114 en/user_basics.ssi:198
+#: en/user_basics.ssi:165 en/user_basics.ssi:251
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:122
+#: en/user_basics.ssi:173
msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:175
+msgid ""
+"% FIXME: eliminate duplication with ISO hybrid, as these are virtually the "
+"same instructions!"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:177
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
"bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -446,13 +616,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:128
+#: en/user_basics.ssi:181
#, no-wrap
msgid " $ dd if=binary.img of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:132
+#: en/user_basics.ssi:185
msgid ""
"where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
"a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -461,36 +631,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:134
-#, no-wrap
-msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:189
msgid ""
"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:191
msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:195
+#, no-wrap
+msgid " # apt-get install qemu\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:197
#, no-wrap
msgid " $ qemu -hda binary.img\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:201
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:203
msgid ""
"If you want to use the remaining free space after you have installed the "
"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -499,13 +669,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:207
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:211
msgid ""
"After the creation of the partition, where #{${PARTITION}}# is the name of "
"the partition, like #{/dev/sdb2}#, you have to create a filesystem on it. "
@@ -513,35 +683,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:215
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:219
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:223
#, no-wrap
msgid " # mkfs.vfat -F 32\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:227
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:229
msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:231
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -549,27 +719,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:233
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:241
msgid ""
"Run the #{lb config}# command as follows to configure your image for "
"netbooting:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:192
+#: en/user_basics.ssi:245
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:249
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
"serve the filesystem image to the client, so the files must be served via "
@@ -580,7 +750,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:259
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -591,7 +761,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:261
msgid ""
"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
@@ -600,19 +770,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:263
msgid ""
"We must now configure three services on the server to enable netboot: the "
"DHCP server, the TFTP server and the NFS server."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:265
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:267
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -620,26 +790,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:269
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:220
+#: en/user_basics.ssi:273
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:275
#, no-wrap
msgid " ddns-update-style none;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:225
+#: en/user_basics.ssi:278
#, no-wrap
msgid ""
" option domain-name \"example.org\";\n"
@@ -647,7 +817,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:281
#, no-wrap
msgid ""
" default-lease-time 600;\n"
@@ -655,13 +825,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:283
#, no-wrap
msgid " log-facility local7;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:236
+#: en/user_basics.ssi:289
#, no-wrap
msgid ""
" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
@@ -672,17 +842,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:293
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:295
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:297
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
@@ -690,23 +860,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:248
+#: en/user_basics.ssi:301
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:252
+#: en/user_basics.ssi:305
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:254
+#: en/user_basics.ssi:307
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:256
+#: en/user_basics.ssi:309
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -714,37 +884,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:258
+#: en/user_basics.ssi:311
msgid "You need to install the #{nfs-kernel-server}# package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:260
+#: en/user_basics.ssi:313
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to #{/etc/exports}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:264
+#: en/user_basics.ssi:317
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:268
+#: en/user_basics.ssi:321
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:272
+#: en/user_basics.ssi:325
#, no-wrap
msgid " # exportfs -rv\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:276
+#: en/user_basics.ssi:329
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. For more information, see the "
@@ -755,40 +925,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:278
+#: en/user_basics.ssi:331
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:280
+#: en/user_basics.ssi:333
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:282
+#: en/user_basics.ssi:335
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:284
+#: en/user_basics.ssi:337
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:286
+#: en/user_basics.ssi:339
msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:288
+#: en/user_basics.ssi:341
msgid "Edit #{/etc/qemu-ifup}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:352
#, no-wrap
msgid ""
" #!/bin/sh\n"
@@ -802,40 +972,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:303
+#: en/user_basics.ssi:356
msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:358
msgid ""
"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:360
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:309
+#: en/user_basics.ssi:362
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:311
+#: en/user_basics.ssi:364
msgid ""
"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
"inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:313
+#: en/user_basics.ssi:366
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:321
+#: en/user_basics.ssi:374
#, no-wrap
msgid ""
" #!/usr/bin/vmware\n"
@@ -846,7 +1016,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:327
+#: en/user_basics.ssi:380
#, no-wrap
msgid ""
" ide0:0.present = \"FALSE\"\n"
@@ -857,7 +1027,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:383
#, no-wrap
msgid ""
" ethernet0.present = \"TRUE\"\n"
@@ -865,7 +1035,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:333
+#: en/user_basics.ssi:386
#, no-wrap
msgid ""
" displayName = \"Test Boot PXE\"\n"
@@ -873,7 +1043,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:391
#, no-wrap
msgid ""
" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
@@ -883,19 +1053,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:395
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:397
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:398
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/ro/user_overview.ssi.po b/manual/po/ro/user_overview.ssi.po
index 2d08271..171ae81 100644
--- a/manual/po/ro/user_overview.ssi.po
+++ b/manual/po/ro/user_overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-02-28 12:48-0400\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,21 +20,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
+#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
+#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
+#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
+#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
+#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
+#: en/user_basics.ssi:343 en/user_basics.ssi:368
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -84,21 +85,22 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
+#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
+#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
+#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
+#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
+#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
+#: en/user_basics.ssi:354 en/user_basics.ssi:393
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -363,8 +365,8 @@ msgstr ""
#: en/user_overview.ssi:98
msgid ""
"The #{lb build}# command reads in your configuration from the config/ "
-"directory. It then runs the lower lower level commands needed to build your "
-"Live system."
+"directory. It then runs the lower level commands needed to build your Live "
+"system."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 628750e..1ca8e3b 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-03-13 14:58+0100\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-13\n"
+" :published: 2011-03-17\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index fbc964d..f87bd04 100644
--- a/manual/pot/user_basics.ssi.pot
+++ b/manual/pot/user_basics.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-03-02 08:01-0400\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -19,21 +19,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
+#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
+#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
+#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
+#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
+#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
+#: en/user_basics.ssi:343 en/user_basics.ssi:368
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -83,21 +84,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
+#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
+#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
+#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
+#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
+#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
+#: en/user_basics.ssi:354 en/user_basics.ssi:393
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -160,14 +162,14 @@ msgid ""
"This chapter contains a brief overview of the build process and instructions "
"for using the three most commonly used image types. The most versatile image "
"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
-"portable storage device. In certain special cases, #{usb-hdd}# may be more "
-"suitable for USB devices. The chapter finishes with instructions for "
-"building and using a #{net}# type image, which is a bit more involved due to "
-"the setup required on the server. This is a slightly advanced topic for "
-"anyone who is not familiar already with netbooting, but is included here "
-"because once the setup is done, it is a very convenient way to test and "
-"deploy images for booting on the local network without the hassle of dealing "
-"with image media."
+"portable storage device. In certain special cases, such as the use of "
+"persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter "
+"finishes with instructions for building and using a #{net}# type image, "
+"which is a bit more involved due to the setup required on the server. This "
+"is a slightly advanced topic for anyone who is not familiar already with "
+"netbooting, but is included here because once the setup is done, it is a "
+"very convenient way to test and deploy images for booting on the local "
+"network without the hassle of dealing with image media."
msgstr ""
#. type: Plain text
@@ -240,23 +242,23 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:24
-msgid "2~ First steps: building an ISO image"
+msgid "2~ First steps: building an ISO hybrid image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:26
msgid ""
-"The following sequence of live-build commands will create a basic ISO hybrid "
-"image containing just the Debian standard system without X.org. It is "
-"suitable for burning to CD or DVD media, and also to copy onto a USB stick "
-"(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
-"specifying \".iso\" extension where \".img\" is indicated)."
+"Regardless of the image type, you will need to perform the same basic steps "
+"to build an image each time. As a first example, execute the following "
+"sequence of live-build commands to create a basic ISO hybrid image "
+"containing just the Debian standard system without X.org. It is suitable for "
+"burning to CD or DVD media, and also to copy onto a USB stick."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:28
msgid ""
-"First, we run the #{lb config}# command which will create a \"config/\" "
+"First, run the #{lb config}# command. This will create a \"config/\" "
"hierarchy in the current directory for use by other commands:"
msgstr ""
@@ -269,19 +271,20 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:36
msgid ""
-"By passing no parameters to #{lb config}#, we indicated that we wish to use "
-"the defaults (see {The lb config command}#lb-config)."
+"No parameters are passed to #{lb config}#, so defaults for all of its "
+"various options will be used. See {The lb config command}#lb-config for more "
+"details."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:38
msgid ""
-"Now that we have a \"config/\" hierarchy, we may build the image with the #"
-"{lb build}# command:"
+"Now that the \"config/\" hierarchy exists, build the image with the #{lb "
+"build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_basics.ssi:42 en/user_basics.ssi:169 en/user_basics.ssi:255
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -291,104 +294,264 @@ msgstr ""
#: en/user_basics.ssi:46
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection (see {The lb build command}#lb-build)."
+"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"image file, ready to use, in the current directory."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:48
-msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
+msgid "2~ Using an ISO hybrid live image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "Testing an ISO is simple:"
+msgid ""
+"After either building or downloading an ISO hybrid image, which can be "
+"obtained at http://www.debian.org/CD/live/, the usual next step is to "
+"prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or "
+"a USB stick."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:54 en/user_basics.ssi:142
-#, no-wrap
-msgid " # apt-get install qemu\n"
+#: en/user_basics.ssi:52
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:54
+msgid "Burning an ISO image is easy:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56
+#: en/user_basics.ssi:58
#, no-wrap
-msgid " $ qemu -cdrom binary.iso\n"
+msgid " # apt-get install wodim\n"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:60
-msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
+#, no-wrap
+msgid " $ wodim binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:62
-msgid "In order to test the ISO with virtualbox-ose:"
+#: en/user_basics.ssi:64
+msgid "3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:66
-#, no-wrap
-msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
+msgid ""
+"ISO images prepared with the #{isohybrid}# command, like the images produced "
+"by live-build's default #{iso-hybrid}# binary image type, can be copied to a "
+"USB stick and directly booted without further steps. Plug in a USB stick "
+"with a size larger than that of #{binary-hybrid.iso}# and determine which "
+"device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the "
+"device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/"
+"dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s "
+"output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:68
+#: en/user_basics.ssi:68 en/user_basics.ssi:187
#, no-wrap
-msgid " $ virtualbox\n"
+msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:70
msgid ""
-"Create a new virtual machine, change the storage settings to use binary.iso "
-"as the CD/DVD device, and start the machine."
+"Once you are certain you have the correct device name, use the #{dd}# "
+"command to copy the image to the stick as follows:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:74
+#, no-wrap
+msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:79
+msgid "3~ Booting the live media"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:81
+msgid ""
+"The first time you boot your live media, whether CD, DVD, USB key, or PXE "
+"boot, some setup in your computer's BIOS may be needed first. Since BIOSes "
+"vary greatly in features and key bindings, we cannot get into the topic in "
+"depth here. Some BIOSes provide a key to bring up a menu of boot devices at "
+"boot time, which is the easiest way if it is available on your system. "
+"Otherwise, you need to enter the BIOS configuration menu and change the boot "
+"order to place the boot device for the live system before your normal boot "
+"device."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:83
+msgid ""
+"Once you've booted the media, you are presented with a boot menu. If you "
+"just press enter here, the system will boot using the default entry, #{Live}"
+"# and default options. For more information about boot options, see the "
+"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
+"man pages found within the live system."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:85
+msgid ""
+"Assuming you've selected #{Live}# and booted a default desktop live image, "
+"after the boot messages scroll by, you should be automatically logged into "
+"the #{user}# account and see a desktop, ready to use. If you've booted a "
+"console-only image, such as #{standard}# or #{rescue}# flavour prebuilt "
+"images, you should be automatically logged in on the console to the #{user}# "
+"account and see a shell prompt, ready to use."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:87
+msgid "2~ Using a virtual machine for testing"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:89
+msgid ""
+"It can be a great time-saver for the development of live images to run them "
+"in a virtual machine (VM). This is not without its caveats:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:91
+msgid ""
+"_* Running a VM requires enough RAM for both the guest OS and the host and a "
+"CPU with hardware support for virtualization is recommended."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:93
+msgid ""
+"_* There are some inherent limitations to running on a VM, e.g. poor video "
+"performance, limited choice of emulated hardware."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:95
+msgid ""
+"_* When developing for specific hardware, there is no substitute for running "
+"on the hardware itself."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:97
+msgid ""
+"_* Occasionally there are bugs that relate only to running in a VM. When in "
+"doubt, test your image directly on the hardware."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:99
+msgid ""
+"Provided you can work within these constraints, survey the available VM "
+"software and choose one that is suitable for your needs."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:101
+msgid "3~testing-iso-with-qemu Testing an ISO image with QEMU"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:103
+msgid ""
+"The most versatile VM in Debian is QEMU. If your processor has hardware "
+"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"package description briefly lists the requirements."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:105
msgid ""
-"Note: For live systems containing X.org that you want to test with "
-"virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
-"virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the "
-"resolution is limited to 800x600."
+"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
+"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The #{qemu-utils}# package is also valuable for "
+"creating virtual disk images with #{qemu-img}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:78
+#: en/user_basics.ssi:109
#, no-wrap
-msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
+msgid " # apt-get install qemu-kvm qemu-utils\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:82
-msgid "3~burning-iso-image Burning an ISO image to a physical medium"
+#: en/user_basics.ssi:113
+msgid "Booting an ISO image is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:84
-msgid "Burning an ISO image is easy:"
+#: en/user_basics.ssi:117
+#, no-wrap
+msgid " $ kvm -cdrom binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:88
+#: en/user_basics.ssi:121
+msgid "See the man pages for more details."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:123
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:125
+msgid "In order to test the ISO with virtualbox-ose:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:129
#, no-wrap
-msgid " # apt-get install wodim\n"
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:131
+#, no-wrap
+msgid " $ virtualbox\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:135
+msgid ""
+"Create a new virtual machine, change the storage settings to use binary-"
+"hybrid.iso as the CD/DVD device, and start the machine."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:137
+msgid ""
+"Note: For live systems containing X.org that you want to test with #"
+"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
+"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
+"Otherwise, the resolution is limited to 800x600."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:141
#, no-wrap
-msgid " $ wodim binary.iso\n"
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:145
msgid "2~ Building a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:147
msgid ""
"The following sequence of commands will create a basic USB/HDD image "
"containing just the Debian standard system without X.org. It is suitable for "
@@ -400,7 +563,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:149
msgid ""
"Note: if you created an ISO image with the previous example, you will need "
"to clean up your working directory with the #{lb clean}# command (see {The "
@@ -408,36 +571,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#: en/user_basics.ssi:153 en/user_basics.ssi:237
#, no-wrap
msgid " # lb clean --binary\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:106
+#: en/user_basics.ssi:157
msgid ""
"Run the #{lb config}# command with the parameters to configure the #{config/}"
"# hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:110
+#: en/user_basics.ssi:161
#, no-wrap
msgid " $ lb config -b usb-hdd\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:114 en/user_basics.ssi:198
+#: en/user_basics.ssi:165 en/user_basics.ssi:251
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:122
+#: en/user_basics.ssi:173
msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:175
+msgid ""
+"% FIXME: eliminate duplication with ISO hybrid, as these are virtually the "
+"same instructions!"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:177
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
"bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -445,13 +615,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:128
+#: en/user_basics.ssi:181
#, no-wrap
msgid " $ dd if=binary.img of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:132
+#: en/user_basics.ssi:185
msgid ""
"where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
"a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -460,36 +630,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:134
-#, no-wrap
-msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:189
msgid ""
"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:191
msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:195
+#, no-wrap
+msgid " # apt-get install qemu\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:197
#, no-wrap
msgid " $ qemu -hda binary.img\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:201
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:203
msgid ""
"If you want to use the remaining free space after you have installed the "
"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -498,13 +668,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:207
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:211
msgid ""
"After the creation of the partition, where #{${PARTITION}}# is the name of "
"the partition, like #{/dev/sdb2}#, you have to create a filesystem on it. "
@@ -512,35 +682,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:215
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:219
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:223
#, no-wrap
msgid " # mkfs.vfat -F 32\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:227
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:229
msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:231
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -548,27 +718,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:233
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:241
msgid ""
"Run the #{lb config}# command as follows to configure your image for "
"netbooting:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:192
+#: en/user_basics.ssi:245
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:249
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
"serve the filesystem image to the client, so the files must be served via "
@@ -579,7 +749,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:259
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -590,7 +760,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:261
msgid ""
"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
@@ -599,19 +769,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:263
msgid ""
"We must now configure three services on the server to enable netboot: the "
"DHCP server, the TFTP server and the NFS server."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:265
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:267
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -619,26 +789,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:269
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:220
+#: en/user_basics.ssi:273
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:275
#, no-wrap
msgid " ddns-update-style none;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:225
+#: en/user_basics.ssi:278
#, no-wrap
msgid ""
" option domain-name \"example.org\";\n"
@@ -646,7 +816,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:281
#, no-wrap
msgid ""
" default-lease-time 600;\n"
@@ -654,13 +824,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:283
#, no-wrap
msgid " log-facility local7;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:236
+#: en/user_basics.ssi:289
#, no-wrap
msgid ""
" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
@@ -671,17 +841,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:293
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:295
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:297
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
@@ -689,23 +859,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:248
+#: en/user_basics.ssi:301
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:252
+#: en/user_basics.ssi:305
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:254
+#: en/user_basics.ssi:307
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:256
+#: en/user_basics.ssi:309
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -713,37 +883,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:258
+#: en/user_basics.ssi:311
msgid "You need to install the #{nfs-kernel-server}# package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:260
+#: en/user_basics.ssi:313
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to #{/etc/exports}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:264
+#: en/user_basics.ssi:317
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:268
+#: en/user_basics.ssi:321
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:272
+#: en/user_basics.ssi:325
#, no-wrap
msgid " # exportfs -rv\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:276
+#: en/user_basics.ssi:329
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. For more information, see the "
@@ -754,40 +924,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:278
+#: en/user_basics.ssi:331
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:280
+#: en/user_basics.ssi:333
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:282
+#: en/user_basics.ssi:335
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:284
+#: en/user_basics.ssi:337
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:286
+#: en/user_basics.ssi:339
msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:288
+#: en/user_basics.ssi:341
msgid "Edit #{/etc/qemu-ifup}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:352
#, no-wrap
msgid ""
" #!/bin/sh\n"
@@ -801,40 +971,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:303
+#: en/user_basics.ssi:356
msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:358
msgid ""
"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:360
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:309
+#: en/user_basics.ssi:362
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:311
+#: en/user_basics.ssi:364
msgid ""
"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
"inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:313
+#: en/user_basics.ssi:366
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:321
+#: en/user_basics.ssi:374
#, no-wrap
msgid ""
" #!/usr/bin/vmware\n"
@@ -845,7 +1015,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:327
+#: en/user_basics.ssi:380
#, no-wrap
msgid ""
" ide0:0.present = \"FALSE\"\n"
@@ -856,7 +1026,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:383
#, no-wrap
msgid ""
" ethernet0.present = \"TRUE\"\n"
@@ -864,7 +1034,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:333
+#: en/user_basics.ssi:386
#, no-wrap
msgid ""
" displayName = \"Test Boot PXE\"\n"
@@ -872,7 +1042,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:391
#, no-wrap
msgid ""
" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
@@ -882,19 +1052,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:395
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:397
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:398
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/pot/user_overview.ssi.pot b/manual/pot/user_overview.ssi.pot
index c5feafe..b1d2a57 100644
--- a/manual/pot/user_overview.ssi.pot
+++ b/manual/pot/user_overview.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-02-28 12:48-0400\n"
+"POT-Creation-Date: 2011-03-17 18:01-0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -19,21 +19,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
+#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
+#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
+#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
+#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
+#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
+#: en/user_basics.ssi:343 en/user_basics.ssi:368
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -83,21 +84,22 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
+#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
+#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
+#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
+#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
+#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
+#: en/user_basics.ssi:354 en/user_basics.ssi:393
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -362,8 +364,8 @@ msgstr ""
#: en/user_overview.ssi:98
msgid ""
"The #{lb build}# command reads in your configuration from the config/ "
-"directory. It then runs the lower lower level commands needed to build your "
-"Live system."
+"directory. It then runs the lower level commands needed to build your Live "
+"system."
msgstr ""
#. type: Plain text
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 0312db5..4d25f00 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
:license: 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 3 of the License, or (at your option) any later version.<br><br>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.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-03-13
+ :published: 2011-03-17
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index e385a53..a097a47 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -5,14 +5,14 @@
This chapter contains a brief overview of the build process and instructions
for using the three most commonly used image types. The most versatile image
type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
-portable storage device. In certain special cases, #{usb-hdd}# may be more
-suitable for USB devices. The chapter finishes with instructions for
-building and using a #{net}# type image, which is a bit more involved due to
-the setup required on the server. This is a slightly advanced topic for
-anyone who is not familiar already with netbooting, but is included here
-because once the setup is done, it is a very convenient way to test and
-deploy images for booting on the local network without the hassle of dealing
-with image media.
+portable storage device. In certain special cases, such as the use of
+persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter
+finishes with instructions for building and using a #{net}# type image,
+which is a bit more involved due to the setup required on the server. This
+is a slightly advanced topic for anyone who is not familiar already with
+netbooting, but is included here because once the setup is done, it is a
+very convenient way to test and deploy images for booting on the local
+network without the hassle of dealing with image media.
2~ What is a live system?
@@ -52,16 +52,16 @@ You can use live-build to build the system image from your specifications,
set up a Linux kernel, its initrd, and a bootloader to run them, all in one
media-dependant format (ISO9660 image, disk image, etc.).
-2~ First steps: building an ISO image
+2~ First steps: building an ISO hybrid image
-The following sequence of live-build commands will create a basic ISO hybrid
-image containing just the Debian standard system without X.org. It is
-suitable for burning to CD or DVD media, and also to copy onto a USB stick
-(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image,
-specifying ".iso" extension where ".img" is indicated).
+Regardless of the image type, you will need to perform the same basic steps
+to build an image each time. As a first example, execute the following
+sequence of live-build commands to create a basic ISO hybrid image
+containing just the Debian standard system without X.org. It is suitable for
+burning to CD or DVD media, and also to copy onto a USB stick.
-First, we run the #{lb config}# command which will create a "config/"
-hierarchy in the current directory for use by other commands:
+First, run the #{lb config}# command. This will create a "config/" hierarchy
+in the current directory for use by other commands:
code{
@@ -69,10 +69,11 @@ code{
}code
-By passing no parameters to #{lb config}#, we indicated that we wish to use
-the defaults (see {The lb config command}#lb-config).
+No parameters are passed to #{lb config}#, so defaults for all of its
+various options will be used. See {The lb config command}#lb-config for more
+details.
-Now that we have a "config/" hierarchy, we may build the image with the #{lb
+Now that the "config/" hierarchy exists, build the image with the #{lb
build}# command:
code{
@@ -82,55 +83,146 @@ code{
}code
This process can take a while, depending on the speed of your network
-connection (see {The lb build command}#lb-build).
+connection. When it is complete, there should be a #{binary-hybrid.iso}#
+image file, ready to use, in the current directory.
+
+2~ Using an ISO hybrid live image
-3~testing-iso-with-qemu Testing an ISO image with Qemu
+After either building or downloading an ISO hybrid image, which can be
+obtained at http://www.debian.org/CD/live/, the usual next step is to
+prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or
+a USB stick.
-Testing an ISO is simple:
+3~burning-iso-image Burning an ISO image to a physical medium
+
+Burning an ISO image is easy:
code{
- # apt-get install qemu
+ # apt-get install wodim
- $ qemu -cdrom binary.iso
+ $ wodim binary-hybrid.iso
}code
-3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
+3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick
-In order to test the ISO with virtualbox-ose:
+ISO images prepared with the #{isohybrid}# command, like the images produced
+by live-build's default #{iso-hybrid}# binary image type, can be copied to a
+USB stick and directly booted without further steps. Plug in a USB stick
+with a size larger than that of #{binary-hybrid.iso}# and determine which
+device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the
+device file of your key, such as #{/dev/sdb}#, not a partition, such as
+#{/dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s
+output after plugging in the stick, or better yet, #{ls -l
+/dev/disk/by-id}#.
-code{
+*{This will definitely overwrite any previous contents on your stick!}*
- # apt-get install virtualbox-ose virtualbox-ose-dkms
+Once you are certain you have the correct device name, use the #{dd}#
+command to copy the image to the stick as follows:
- $ virtualbox
+code{
+
+ $ dd if=binary-hybrid.iso of=${USBSTICK}
}code
-Create a new virtual machine, change the storage settings to use binary.iso
-as the CD/DVD device, and start the machine.
-Note: For live systems containing X.org that you want to test with
-virtualbox-ose, you may wish to include the VirtualBox X.org driver package,
-virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the
-resolution is limited to 800x600.
+3~ Booting the live media
+
+The first time you boot your live media, whether CD, DVD, USB key, or PXE
+boot, some setup in your computer's BIOS may be needed first. Since BIOSes
+vary greatly in features and key bindings, we cannot get into the topic in
+depth here. Some BIOSes provide a key to bring up a menu of boot devices at
+boot time, which is the easiest way if it is available on your
+system. Otherwise, you need to enter the BIOS configuration menu and change
+the boot order to place the boot device for the live system before your
+normal boot device.
+
+Once you've booted the media, you are presented with a boot menu. If you
+just press enter here, the system will boot using the default entry,
+#{Live}# and default options. For more information about boot options, see
+the "help" entry in the menu and also the #{live-boot}# and #{live-config}#
+man pages found within the live system.
+
+Assuming you've selected #{Live}# and booted a default desktop live image,
+after the boot messages scroll by, you should be automatically logged into
+the #{user}# account and see a desktop, ready to use. If you've booted a
+console-only image, such as #{standard}# or #{rescue}# flavour prebuilt
+images, you should be automatically logged in on the console to the #{user}#
+account and see a shell prompt, ready to use.
+
+2~ Using a virtual machine for testing
+
+It can be a great time-saver for the development of live images to run them
+in a virtual machine (VM). This is not without its caveats:
+
+_* Running a VM requires enough RAM for both the guest OS and the host and a
+CPU with hardware support for virtualization is recommended.
+
+_* There are some inherent limitations to running on a VM, e.g. poor video
+performance, limited choice of emulated hardware.
+
+_* When developing for specific hardware, there is no substitute for running
+on the hardware itself.
+
+_* Occasionally there are bugs that relate only to running in a VM. When in
+doubt, test your image directly on the hardware.
+
+Provided you can work within these constraints, survey the available VM
+software and choose one that is suitable for your needs.
+
+3~testing-iso-with-qemu Testing an ISO image with QEMU
+
+The most versatile VM in Debian is QEMU. If your processor has hardware
+support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}#
+package description briefly lists the requirements.
+
+First, install #{qemu-kvm}# if your processor supports it. If not, install
+#{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in
+the following examples. The #{qemu-utils}# package is also valuable for
+creating virtual disk images with #{qemu-img}#.
code{
- $ lb config --packages virtualbox-ose-guest-x11
+ # apt-get install qemu-kvm qemu-utils
}code
-3~burning-iso-image Burning an ISO image to a physical medium
+Booting an ISO image is simple:
-Burning an ISO image is easy:
+code{
+
+ $ kvm -cdrom binary-hybrid.iso
+
+}code
+
+See the man pages for more details.
+
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
+
+In order to test the ISO with virtualbox-ose:
code{
- # apt-get install wodim
+ # apt-get install virtualbox-ose virtualbox-ose-dkms
- $ wodim binary.iso
+ $ virtualbox
+
+}code
+
+Create a new virtual machine, change the storage settings to use
+binary-hybrid.iso as the CD/DVD device, and start the machine.
+
+Note: For live systems containing X.org that you want to test with
+#{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver
+package, #{virtualbox-ose-guest-x11}#, in your live-build
+configuration. Otherwise, the resolution is limited to 800x600.
+
+code{
+
+ $ lb config --packages virtualbox-ose-guest-x11
}code
@@ -173,6 +265,9 @@ code{
3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
+% FIXME: eliminate duplication with ISO hybrid, as these are virtually the
+same instructions!
+
The generated binary image contains a VFAT partition and the syslinux
bootloader, ready to be directly written on a USB stick. Plug in a USB stick
with a size larger than that of binary.img and type:
diff --git a/manual/pt_BR/user_overview.ssi b/manual/pt_BR/user_overview.ssi
index 4eeb593..9e81818 100644
--- a/manual/pt_BR/user_overview.ssi
+++ b/manual/pt_BR/user_overview.ssi
@@ -121,8 +121,8 @@ A full list of options is available in the #{lb_config}# man page.
3~lb-build The #{lb build}# command
The #{lb build}# command reads in your configuration from the config/
-directory. It then runs the lower lower level commands needed to build your
-Live system.
+directory. It then runs the lower level commands needed to build your Live
+system.
3~lb-clean The #{lb clean}# command
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 0312db5..4d25f00 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
:license: 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 3 of the License, or (at your option) any later version.<br><br>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.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-03-13
+ :published: 2011-03-17
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index e385a53..a097a47 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -5,14 +5,14 @@
This chapter contains a brief overview of the build process and instructions
for using the three most commonly used image types. The most versatile image
type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
-portable storage device. In certain special cases, #{usb-hdd}# may be more
-suitable for USB devices. The chapter finishes with instructions for
-building and using a #{net}# type image, which is a bit more involved due to
-the setup required on the server. This is a slightly advanced topic for
-anyone who is not familiar already with netbooting, but is included here
-because once the setup is done, it is a very convenient way to test and
-deploy images for booting on the local network without the hassle of dealing
-with image media.
+portable storage device. In certain special cases, such as the use of
+persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter
+finishes with instructions for building and using a #{net}# type image,
+which is a bit more involved due to the setup required on the server. This
+is a slightly advanced topic for anyone who is not familiar already with
+netbooting, but is included here because once the setup is done, it is a
+very convenient way to test and deploy images for booting on the local
+network without the hassle of dealing with image media.
2~ What is a live system?
@@ -52,16 +52,16 @@ You can use live-build to build the system image from your specifications,
set up a Linux kernel, its initrd, and a bootloader to run them, all in one
media-dependant format (ISO9660 image, disk image, etc.).
-2~ First steps: building an ISO image
+2~ First steps: building an ISO hybrid image
-The following sequence of live-build commands will create a basic ISO hybrid
-image containing just the Debian standard system without X.org. It is
-suitable for burning to CD or DVD media, and also to copy onto a USB stick
-(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image,
-specifying ".iso" extension where ".img" is indicated).
+Regardless of the image type, you will need to perform the same basic steps
+to build an image each time. As a first example, execute the following
+sequence of live-build commands to create a basic ISO hybrid image
+containing just the Debian standard system without X.org. It is suitable for
+burning to CD or DVD media, and also to copy onto a USB stick.
-First, we run the #{lb config}# command which will create a "config/"
-hierarchy in the current directory for use by other commands:
+First, run the #{lb config}# command. This will create a "config/" hierarchy
+in the current directory for use by other commands:
code{
@@ -69,10 +69,11 @@ code{
}code
-By passing no parameters to #{lb config}#, we indicated that we wish to use
-the defaults (see {The lb config command}#lb-config).
+No parameters are passed to #{lb config}#, so defaults for all of its
+various options will be used. See {The lb config command}#lb-config for more
+details.
-Now that we have a "config/" hierarchy, we may build the image with the #{lb
+Now that the "config/" hierarchy exists, build the image with the #{lb
build}# command:
code{
@@ -82,55 +83,146 @@ code{
}code
This process can take a while, depending on the speed of your network
-connection (see {The lb build command}#lb-build).
+connection. When it is complete, there should be a #{binary-hybrid.iso}#
+image file, ready to use, in the current directory.
+
+2~ Using an ISO hybrid live image
-3~testing-iso-with-qemu Testing an ISO image with Qemu
+After either building or downloading an ISO hybrid image, which can be
+obtained at http://www.debian.org/CD/live/, the usual next step is to
+prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or
+a USB stick.
-Testing an ISO is simple:
+3~burning-iso-image Burning an ISO image to a physical medium
+
+Burning an ISO image is easy:
code{
- # apt-get install qemu
+ # apt-get install wodim
- $ qemu -cdrom binary.iso
+ $ wodim binary-hybrid.iso
}code
-3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
+3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick
-In order to test the ISO with virtualbox-ose:
+ISO images prepared with the #{isohybrid}# command, like the images produced
+by live-build's default #{iso-hybrid}# binary image type, can be copied to a
+USB stick and directly booted without further steps. Plug in a USB stick
+with a size larger than that of #{binary-hybrid.iso}# and determine which
+device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the
+device file of your key, such as #{/dev/sdb}#, not a partition, such as
+#{/dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s
+output after plugging in the stick, or better yet, #{ls -l
+/dev/disk/by-id}#.
-code{
+*{This will definitely overwrite any previous contents on your stick!}*
- # apt-get install virtualbox-ose virtualbox-ose-dkms
+Once you are certain you have the correct device name, use the #{dd}#
+command to copy the image to the stick as follows:
- $ virtualbox
+code{
+
+ $ dd if=binary-hybrid.iso of=${USBSTICK}
}code
-Create a new virtual machine, change the storage settings to use binary.iso
-as the CD/DVD device, and start the machine.
-Note: For live systems containing X.org that you want to test with
-virtualbox-ose, you may wish to include the VirtualBox X.org driver package,
-virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the
-resolution is limited to 800x600.
+3~ Booting the live media
+
+The first time you boot your live media, whether CD, DVD, USB key, or PXE
+boot, some setup in your computer's BIOS may be needed first. Since BIOSes
+vary greatly in features and key bindings, we cannot get into the topic in
+depth here. Some BIOSes provide a key to bring up a menu of boot devices at
+boot time, which is the easiest way if it is available on your
+system. Otherwise, you need to enter the BIOS configuration menu and change
+the boot order to place the boot device for the live system before your
+normal boot device.
+
+Once you've booted the media, you are presented with a boot menu. If you
+just press enter here, the system will boot using the default entry,
+#{Live}# and default options. For more information about boot options, see
+the "help" entry in the menu and also the #{live-boot}# and #{live-config}#
+man pages found within the live system.
+
+Assuming you've selected #{Live}# and booted a default desktop live image,
+after the boot messages scroll by, you should be automatically logged into
+the #{user}# account and see a desktop, ready to use. If you've booted a
+console-only image, such as #{standard}# or #{rescue}# flavour prebuilt
+images, you should be automatically logged in on the console to the #{user}#
+account and see a shell prompt, ready to use.
+
+2~ Using a virtual machine for testing
+
+It can be a great time-saver for the development of live images to run them
+in a virtual machine (VM). This is not without its caveats:
+
+_* Running a VM requires enough RAM for both the guest OS and the host and a
+CPU with hardware support for virtualization is recommended.
+
+_* There are some inherent limitations to running on a VM, e.g. poor video
+performance, limited choice of emulated hardware.
+
+_* When developing for specific hardware, there is no substitute for running
+on the hardware itself.
+
+_* Occasionally there are bugs that relate only to running in a VM. When in
+doubt, test your image directly on the hardware.
+
+Provided you can work within these constraints, survey the available VM
+software and choose one that is suitable for your needs.
+
+3~testing-iso-with-qemu Testing an ISO image with QEMU
+
+The most versatile VM in Debian is QEMU. If your processor has hardware
+support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}#
+package description briefly lists the requirements.
+
+First, install #{qemu-kvm}# if your processor supports it. If not, install
+#{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in
+the following examples. The #{qemu-utils}# package is also valuable for
+creating virtual disk images with #{qemu-img}#.
code{
- $ lb config --packages virtualbox-ose-guest-x11
+ # apt-get install qemu-kvm qemu-utils
}code
-3~burning-iso-image Burning an ISO image to a physical medium
+Booting an ISO image is simple:
-Burning an ISO image is easy:
+code{
+
+ $ kvm -cdrom binary-hybrid.iso
+
+}code
+
+See the man pages for more details.
+
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
+
+In order to test the ISO with virtualbox-ose:
code{
- # apt-get install wodim
+ # apt-get install virtualbox-ose virtualbox-ose-dkms
- $ wodim binary.iso
+ $ virtualbox
+
+}code
+
+Create a new virtual machine, change the storage settings to use
+binary-hybrid.iso as the CD/DVD device, and start the machine.
+
+Note: For live systems containing X.org that you want to test with
+#{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver
+package, #{virtualbox-ose-guest-x11}#, in your live-build
+configuration. Otherwise, the resolution is limited to 800x600.
+
+code{
+
+ $ lb config --packages virtualbox-ose-guest-x11
}code
@@ -173,6 +265,9 @@ code{
3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
+% FIXME: eliminate duplication with ISO hybrid, as these are virtually the
+same instructions!
+
The generated binary image contains a VFAT partition and the syslinux
bootloader, ready to be directly written on a USB stick. Plug in a USB stick
with a size larger than that of binary.img and type:
diff --git a/manual/ro/user_overview.ssi b/manual/ro/user_overview.ssi
index 4eeb593..9e81818 100644
--- a/manual/ro/user_overview.ssi
+++ b/manual/ro/user_overview.ssi
@@ -121,8 +121,8 @@ A full list of options is available in the #{lb_config}# man page.
3~lb-build The #{lb build}# command
The #{lb build}# command reads in your configuration from the config/
-directory. It then runs the lower lower level commands needed to build your
-Live system.
+directory. It then runs the lower level commands needed to build your Live
+system.
3~lb-clean The #{lb clean}# command
--
live-manual
More information about the debian-live-changes
mailing list