[SCM] live-manual branch, debian, updated. debian/2.0.0-1-24-gcf5c0a6
Daniel Baumann
daniel at debian.org
Fri Dec 17 12:46:07 UTC 2010
The following commit has been merged in the debian branch:
commit 4e57928d255281c5ab46f5b32fe5548119bf2700
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Dec 17 13:12:19 2010 +0100
Updating example dhcpd.conf for pxe for squeeze.
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index 858d488..7619537 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -297,32 +297,23 @@ bootloader.
Here is an example for inspiration, written for the ISC DHCP server
#{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
-% FIXME: bring up to date: base example on default isc-dhcp-server config
-file in Squeeze
-
code{
-subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24
-
- # IP addresses available for guests
- range 192.168.1.100 192.168.1.149;
+# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
- # allow booting from the net
- allow bootp;
+ddns-update-style none;
- # for net booting, server where the first file to be loaded (by TFTP
- # protocol) ("filename" following definition) lies : so the TFTP
- # server's name.
- next-server myserver;
+option domain-name "example.org"; option domain-name-servers
+ns1.example.org, ns2.example.org;
- # net boot configuration for guests with a PXE client :
- if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
- # Note: all files for PXE are relatives to the TFTP server's root
+default-lease-time 600; max-lease-time 7200;
- # PXE bootloader (first program to be loaded, by TFTP)
- filename "pxelinux.0";
+log-facility local7;
- }
+subnet 192.168.0.0 netmask 255.255.255.0 {
+ range 192.168.0.1 192.168.0.254;
+ next-server servername;
+ filename "pxelinux.0";
}
}code
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index dd2fc18..ca12046 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -214,31 +214,24 @@ We must configure our network's DHCP server to be sure to give an IP address to
Here is an example for inspiration, written for the ISC DHCP server #{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
-% FIXME: bring up to date: base example on default isc-dhcp-server config file in Squeeze
-
code{
-subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24
-
- # IP addresses available for guests
- range 192.168.1.100 192.168.1.149;
+# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
- # allow booting from the net
- allow bootp;
+ddns-update-style none;
- # for net booting, server where the first file to be loaded (by TFTP
- # protocol) ("filename" following definition) lies : so the TFTP
- # server's name.
- next-server myserver;
+option domain-name "example.org";
+option domain-name-servers ns1.example.org, ns2.example.org;
- # net boot configuration for guests with a PXE client :
- if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
- # Note: all files for PXE are relatives to the TFTP server's root
+default-lease-time 600;
+max-lease-time 7200;
- # PXE bootloader (first program to be loaded, by TFTP)
- filename "pxelinux.0";
+log-facility local7;
- }
+subnet 192.168.0.0 netmask 255.255.255.0 {
+ range 192.168.0.1 192.168.0.254;
+ next-server servername;
+ filename "pxelinux.0";
}
}code
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index 858d488..7619537 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -297,32 +297,23 @@ bootloader.
Here is an example for inspiration, written for the ISC DHCP server
#{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
-% FIXME: bring up to date: base example on default isc-dhcp-server config
-file in Squeeze
-
code{
-subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24
-
- # IP addresses available for guests
- range 192.168.1.100 192.168.1.149;
+# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
- # allow booting from the net
- allow bootp;
+ddns-update-style none;
- # for net booting, server where the first file to be loaded (by TFTP
- # protocol) ("filename" following definition) lies : so the TFTP
- # server's name.
- next-server myserver;
+option domain-name "example.org"; option domain-name-servers
+ns1.example.org, ns2.example.org;
- # net boot configuration for guests with a PXE client :
- if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
- # Note: all files for PXE are relatives to the TFTP server's root
+default-lease-time 600; max-lease-time 7200;
- # PXE bootloader (first program to be loaded, by TFTP)
- filename "pxelinux.0";
+log-facility local7;
- }
+subnet 192.168.0.0 netmask 255.255.255.0 {
+ range 192.168.0.1 192.168.0.254;
+ next-server servername;
+ filename "pxelinux.0";
}
}code
diff --git a/manual/it/project_coding-style.ssi b/manual/it/project_coding-style.ssi
index 1324023..9f04ca5 100644
--- a/manual/it/project_coding-style.ssi
+++ b/manual/it/project_coding-style.ssi
@@ -72,22 +72,24 @@ foo ()
_* Le variabili vanno sempre scritte in maiuscolo.
-_* Variables that used in #{lb config}# always start with #{LB_}# prefix.
+_* Le variabili usate nella configurazione di lb iniziano sempre con il
+prefisso "#{LB_}#".
-_* Internal temporary variables in live-build should start with the
-#{\_LB_}# prefix.
+_* Le variabili temporanee interne a live-build dovrebbero iniziare con il
+prefisso "#{\_LB_}#".
-_* Local variables start with live-build #{\_\_LB_}# prefix.
+_* Le variabili locali iniziano con il prefisso di live-build "#{\_\_LB_}#"
-_* Variables in connection to a boot parameter in live-config start with
-#{LIVE_}#.
+_* Le variabili relative ai parametri di avvio di live-config iniziano con
+il prefisso "#{LIVE_}#".
-_* All other variables in live-config start with #{_}# prefix.
+_* Tutte le altre variabili di live-config iniziano con il prefisso "#{_}#".
-_* Use braces around variables; eg. write #{${FOO}}# instead of #{$FOO}#.
+_* Intorno alle variabili utilizzare le parentesi, scrivere #{${FOO}}#
+invece di #{$FOO}#.
-_* Always protect variables with quotes to respect potential whitespaces,
-write #{"${FOO}"}# not #{${FOO}}#.
+_* Racchiudere sempre le variabili tra virgolette per rispettare potenziali
+spaziature, scrivere #{"${FOO}"}# e non #{${FOO}}#.
_* Per coerenza usare sempre le virgolette per assegnare un valore ad una
variabile:
@@ -134,12 +136,12 @@ fi
2~ Varie
-_* Use "#{|}#" (without the surround quotes) as a seperator in calls to sed,
-e.g. "#{sed -e 's|foo|bar|'}#" (without "").
+_* In sed utilizzare "#{|}#" (senza virgolette intorno) come separatore,
+#{"sed -e 's|foo|bar|'"}# (senza "").
-_* Don't use the test command for comparisons or tests, use "#{[}#" "#{]}#"
-(without ""), e.g. "#{if [ -x /bin/foo ]; ...}#" and not "#{if test -x
-/bin/foo; ...}#".
+_* Non utilizzare il comando "#{test}#" per prove o confronti, usare invece
+"#{[}#" "#{]}#" (senza ""), "#{if [ -x /bin/foo ]; ...}#" e non "#{if test
+-x /bin/foo; ...}#".
-_* Use #{case}# wherever possible over #{test}#, as it's easier to read and
-faster in execution.
+_* Ove possibile utilizzare "#{case}#" invece di "#{test}#", è più facile da
+leggere e più veloce in esecuzione.
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index 9d2b880..de7f884 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -310,32 +310,23 @@ posizione del bootloader PXE.
Ecco un esempio, scritto per un server DHCP ISC #{isc-dhcp-server}# nel file
di configurazione /etc/dhcp/dhcpd.conf;
-% FIXME: bring up to date: base example on default isc-dhcp-server config
-file in Squeeze
-
code{
-subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24
-
- # IP addresses available for guests
- range 192.168.1.100 192.168.1.149;
+# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
- # allow booting from the net
- allow bootp;
+ddns-update-style none;
- # for net booting, server where the first file to be loaded (by TFTP
- # protocol) ("filename" following definition) lies : so the TFTP
- # server's name.
- next-server myserver;
+option domain-name "example.org"; option domain-name-servers
+ns1.example.org, ns2.example.org;
- # net boot configuration for guests with a PXE client :
- if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
- # Note: all files for PXE are relatives to the TFTP server's root
+default-lease-time 600; max-lease-time 7200;
- # PXE bootloader (first program to be loaded, by TFTP)
- filename "pxelinux.0";
+log-facility local7;
- }
+subnet 192.168.0.0 netmask 255.255.255.0 {
+ range 192.168.0.1 192.168.0.254;
+ next-server servername;
+ filename "pxelinux.0";
}
}code
diff --git a/manual/it/user_managing_a_configuration.ssi b/manual/it/user_managing_a_configuration.ssi
index de650b5..57958a6 100644
--- a/manual/it/user_managing_a_configuration.ssi
+++ b/manual/it/user_managing_a_configuration.ssi
@@ -21,11 +21,11 @@ distribuzione. Quindi, se in seguito si decide di cambiare distribuzione,
quelle variabili dipendenti continueranno a mantenere i vecchi valori i
quali non sono più appropriati
-A second, related problem is that if you run #{lb config}# and then upgrade
-to a new version of live-build that has changed one of the variable names,
-you will discover this only by manual review of the variables in your
-#{config/*}# files, which you will then need to use to set the appropriate
-option again.
+Un secondo relativo problema è che se si lancia #{lb config}# e si è
+aggiornato live-build ad una nuova versione il quale ha cambiato il nome di
+una o più variabili, si può scoprire ciò solamente con una revisione manuale
+delle variabili nei file #{config/*}#, bisogna che vengano risistemate, di
+nuovo, le appropriate opzioni.
Tutto ciò potrebbe essere un fastidio terribile se non fosse per lo script
auto/*, una semplice alternativa ai comandi #{lb config}#, #{lb build}# e
diff --git a/manual/it/user_overview.ssi b/manual/it/user_overview.ssi
index 1eb52df..4e0ad83 100644
--- a/manual/it/user_overview.ssi
+++ b/manual/it/user_overview.ssi
@@ -18,12 +18,12 @@ tutti gli aspetti della creazione di un'immagine live.
Molti concetti sono simili a quelli negli strumenti del pacchetto Debian
debhelper scritto da Joey Hess:
-_* The scripts have a central location for configuring their operation. In
-debhelper, this is the #{debian/}# subdirectory of a package tree. For
-example, dh_install will look, amongst others, for a file called
-#{debian/install}# to determine which files should exist in a particular
-binary package. In much the same way, live-build stores its configuration
-entirely under a #{config/}# subdirectory.
+_* Gli script hanno una locazione centrale per configurare le loro
+operazioni, in debhelper questa è la sottodirectory #{debian/}# dell'albero
+di un pacchetto. Ad esempio dh_install cercherà, tra gli altri, un file
+chiamato #{debian/install}# per determinare quali file dovrebbero esistere
+in un certo pacchetto binario. Allo stesso modo, live-build salva la sua
+configurazione interamente in una sottodirectory #{config/}#.
_* Gli script sono indipendenti, vale a dire che è sempre sicuro eseguire
ogni comando.
@@ -48,11 +48,11 @@ informazioni.
3~lb-config Il comando #{lb config}#
-As discussed in {live-build}#live-build, the scripts that make up live-build
-source their configuration from a single directory named #{config/}#. As
-constructing this directory by hand would be time-consuming and error-prone,
-the #{lb config}# command can be used to create skeleton configuration
-folders.
+Come discusso in {live-build}#live-build, gli script che compongono
+live-build attingono la loro configurazione da una singola directory
+chiamata #{config/}#. Dal momento che crearla a mano sarebbe dispendioso in
+termini di tempo e soggetto a errori, si può usare il comando #{lb config}#
+per creare la directory scheletro di configurazione.
L'esecuzione di #{lb config}# senza argomenti crea una sottodirectory di
#{config/}# popolata con alcune impostazioni predefinite:
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index 7849103..c798eb9 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: 2010-12-16 15:00+0100\n"
+"POT-Creation-Date: 2010-12-17 13:34+0100\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -32,8 +32,8 @@ msgstr ""
#: 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: 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_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
@@ -95,8 +95,8 @@ msgstr ""
#: 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:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: 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_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:36
@@ -605,81 +605,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218
-msgid ""
-"% FIXME: bring up to date: base example on default isc-dhcp-server config "
-"file in Squeeze"
+#: en/user_basics.ssi:220
+msgid "# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:222
-#, no-wrap
-msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
+msgid "ddns-update-style none;"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:225
-#, no-wrap
msgid ""
-" # IP addresses available for guests\n"
-" range 192.168.1.100 192.168.1.149;\n"
+"option domain-name \"example.org\"; option domain-name-servers ns1.example."
+"org, ns2.example.org;"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:228
-#, no-wrap
-msgid ""
-" # allow booting from the net\n"
-" allow bootp;\n"
+msgid "default-lease-time 600; max-lease-time 7200;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
-#, no-wrap
-msgid ""
-" # for net booting, server where the first file to be loaded (by TFTP\n"
-" # protocol) (\"filename\" following definition) lies: so the TFTP\n"
-" # server's name.\n"
-" next-server myserver;\n"
+#: en/user_basics.ssi:230
+msgid "log-facility local7;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:236
#, no-wrap
msgid ""
-" # net boot configuration for guests with a PXE client:\n"
-" if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-" # Note: all files for PXE are relatives to the TFTP server's root\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:240
-#, no-wrap
-msgid ""
-" # PXE bootloader (first program to be loaded, by TFTP)\n"
-" filename \"pxelinux.0\";\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:243
-#, no-wrap
-msgid ""
-" }\n"
+"subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+" range 192.168.0.1 192.168.0.254;\n"
+" next-server servername;\n"
+" filename \"pxelinux.0\";\n"
"}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:240
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:242
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:244
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 /"
@@ -687,22 +661,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:248
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:252
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:254
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:256
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 "
@@ -710,35 +684,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:258
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:260
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:271
+#: en/user_basics.ssi:264
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:268
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:272
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:276
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -747,40 +721,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:278
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:280
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:289
+#: en/user_basics.ssi:282
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:284
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:286
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:288
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:299
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -789,62 +763,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:303
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:305
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:307
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:309
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:311
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:313
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:321
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:327
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:330
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:333
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:338
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -852,19 +826,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:342
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:344
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:345
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index be207af..1271072 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: 2010-12-16 15:00+0100\n"
+"POT-Creation-Date: 2010-12-17 13:34+0100\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -32,8 +32,8 @@ msgstr ""
#: 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: 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_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
@@ -95,8 +95,8 @@ msgstr "code{"
#: 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:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: 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_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:36
@@ -605,81 +605,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218
-msgid ""
-"% FIXME: bring up to date: base example on default isc-dhcp-server config "
-"file in Squeeze"
+#: en/user_basics.ssi:220
+msgid "# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:222
-#, no-wrap
-msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
+msgid "ddns-update-style none;"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:225
-#, no-wrap
msgid ""
-" # IP addresses available for guests\n"
-" range 192.168.1.100 192.168.1.149;\n"
+"option domain-name \"example.org\"; option domain-name-servers ns1.example."
+"org, ns2.example.org;"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:228
-#, no-wrap
-msgid ""
-" # allow booting from the net\n"
-" allow bootp;\n"
+msgid "default-lease-time 600; max-lease-time 7200;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
-#, no-wrap
-msgid ""
-" # for net booting, server where the first file to be loaded (by TFTP\n"
-" # protocol) (\"filename\" following definition) lies: so the TFTP\n"
-" # server's name.\n"
-" next-server myserver;\n"
+#: en/user_basics.ssi:230
+msgid "log-facility local7;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:236
#, no-wrap
msgid ""
-" # net boot configuration for guests with a PXE client:\n"
-" if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-" # Note: all files for PXE are relatives to the TFTP server's root\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:240
-#, no-wrap
-msgid ""
-" # PXE bootloader (first program to be loaded, by TFTP)\n"
-" filename \"pxelinux.0\";\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:243
-#, no-wrap
-msgid ""
-" }\n"
+"subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+" range 192.168.0.1 192.168.0.254;\n"
+" next-server servername;\n"
+" filename \"pxelinux.0\";\n"
"}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:240
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:242
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:244
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 /"
@@ -687,22 +661,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:248
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:252
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:254
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:256
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 "
@@ -710,35 +684,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:258
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:260
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:271
+#: en/user_basics.ssi:264
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:268
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:272
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:276
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -747,40 +721,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:278
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:280
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:289
+#: en/user_basics.ssi:282
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:284
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:286
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:288
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:299
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -789,62 +763,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:303
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:305
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:307
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:309
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:311
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:313
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:321
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:327
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:330
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:333
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:338
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -852,19 +826,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:342
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:344
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:345
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/it/project_coding-style.ssi.po b/manual/po/it/project_coding-style.ssi.po
index 2d4949e..9e26dd7 100644
--- a/manual/po/it/project_coding-style.ssi.po
+++ b/manual/po/it/project_coding-style.ssi.po
@@ -311,7 +311,8 @@ msgstr ""
#: en/project_coding-style.ssi:78
msgid "_* Local variables start with live-build #{\\_\\_LB_}# prefix."
msgstr ""
-"_* Le variabili locali iniziano con il prefisso di live-build \"#{\\_\\_LB_}#\""
+"_* Le variabili locali iniziano con il prefisso di live-build \"#{\\_\\_LB_}#"
+"\""
#. type: Plain text
#: en/project_coding-style.ssi:80
@@ -326,15 +327,16 @@ msgstr ""
#: en/project_coding-style.ssi:82
msgid "_* All other variables in live-config start with #{_}# prefix."
msgstr ""
-"_* Tutte le altre variabili di live-config iniziano con il prefisso \"#{_}#\"."
+"_* Tutte le altre variabili di live-config iniziano con il prefisso \"#{_}#"
+"\"."
#. type: Plain text
#: en/project_coding-style.ssi:84
msgid ""
"_* Use braces around variables; eg. write #{${FOO}}# instead of #{$FOO}#."
msgstr ""
-"_* Intorno alle variabili utilizzare le parentesi, scrivere #{${FOO}}# invece di "
-"#{$FOO}#."
+"_* Intorno alle variabili utilizzare le parentesi, scrivere #{${FOO}}# "
+"invece di #{$FOO}#."
#. type: Plain text
#: en/project_coding-style.ssi:86
@@ -408,8 +410,8 @@ msgid ""
"_* Use \"#{|}#\" (without the surround quotes) as a seperator in calls to "
"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
msgstr ""
-"_* In sed utilizzare \"#{|}#\" (senza virgolette intorno) come separatore, #{\"sed "
-"-e 's|foo|bar|'\"}# (senza \"\")."
+"_* In sed utilizzare \"#{|}#\" (senza virgolette intorno) come separatore, #"
+"{\"sed -e 's|foo|bar|'\"}# (senza \"\")."
#. type: Plain text
#: en/project_coding-style.ssi:134
@@ -418,9 +420,9 @@ msgid ""
"\" (without \"\"), e.g. \"#{if [ -x /bin/foo ]; ...}#\" and not \"#{if test -"
"x /bin/foo; ...}#\"."
msgstr ""
-"_* Non utilizzare il comando \"#{test}#\" per prove o confronti, usare invece "
-"\"#{[}#\" \"#{]}#\" (senza \"\"), \"#{if [ -x /bin/foo ]; ...}#\" e non \"#{if test -x /"
-"bin/foo; ...}#\"."
+"_* Non utilizzare il comando \"#{test}#\" per prove o confronti, usare "
+"invece \"#{[}#\" \"#{]}#\" (senza \"\"), \"#{if [ -x /bin/foo ]; ...}#\" e "
+"non \"#{if test -x /bin/foo; ...}#\"."
#. type: Plain text
#: en/project_coding-style.ssi:135
@@ -428,5 +430,5 @@ msgid ""
"_* Use #{case}# wherever possible over #{test}#, as it's easier to read and "
"faster in execution."
msgstr ""
-"_* Ove possibile utilizzare \"#{case}#\" invece di \"#{test}#\", è più facile da "
-"leggere e più veloce in esecuzione."
+"_* Ove possibile utilizzare \"#{case}#\" invece di \"#{test}#\", è più "
+"facile da leggere e più veloce in esecuzione."
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index d701679..044cf16 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: 2010-12-16 15:00+0100\n"
+"POT-Creation-Date: 2010-12-17 13:34+0100\n"
"PO-Revision-Date: 2010-12-16 15:04+0100\n"
"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -34,8 +34,8 @@ msgstr ""
#: 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: 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_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
@@ -97,8 +97,8 @@ msgstr "code{"
#: 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:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: 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_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:36
@@ -734,99 +734,57 @@ msgstr ""
"di configurazione /etc/dhcp/dhcpd.conf;"
#. type: Plain text
-#: en/user_basics.ssi:218
-msgid ""
-"% FIXME: bring up to date: base example on default isc-dhcp-server config "
-"file in Squeeze"
+#: en/user_basics.ssi:220
+msgid "# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server"
msgstr ""
-"% FIXME: bring up to date: base example on default isc-dhcp-server config "
-"file in Squeeze"
#. type: Plain text
#: en/user_basics.ssi:222
-#, no-wrap
-msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
-msgstr "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
+msgid "ddns-update-style none;"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:225
-#, no-wrap
msgid ""
-" # IP addresses available for guests\n"
-" range 192.168.1.100 192.168.1.149;\n"
+"option domain-name \"example.org\"; option domain-name-servers ns1.example."
+"org, ns2.example.org;"
msgstr ""
-" # IP addresses available for guests\n"
-" range 192.168.1.100 192.168.1.149;\n"
#. type: Plain text
#: en/user_basics.ssi:228
-#, no-wrap
-msgid ""
-" # allow booting from the net\n"
-" allow bootp;\n"
+msgid "default-lease-time 600; max-lease-time 7200;"
msgstr ""
-" # allow booting from the net\n"
-" allow bootp;\n"
#. type: Plain text
-#: en/user_basics.ssi:233
-#, no-wrap
-msgid ""
-" # for net booting, server where the first file to be loaded (by TFTP\n"
-" # protocol) (\"filename\" following definition) lies: so the TFTP\n"
-" # server's name.\n"
-" next-server myserver;\n"
+#: en/user_basics.ssi:230
+msgid "log-facility local7;"
msgstr ""
-" # for net booting, server where the first file to be loaded (by TFTP\n"
-" # protocol) (\"filename\" following definition) lies: so the TFTP\n"
-" # server's name.\n"
-" next-server myserver;\n"
#. type: Plain text
-#: en/user_basics.ssi:237
-#, no-wrap
+#: en/user_basics.ssi:236
+#, fuzzy, no-wrap
+#| msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
msgid ""
-" # net boot configuration for guests with a PXE client:\n"
-" if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-" # Note: all files for PXE are relatives to the TFTP server's root\n"
-msgstr ""
-" # net boot configuration for guests with a PXE client:\n"
-" if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-" # Note: all files for PXE are relatives to the TFTP server's root\n"
-
-#. type: Plain text
-#: en/user_basics.ssi:240
-#, no-wrap
-msgid ""
-" # PXE bootloader (first program to be loaded, by TFTP)\n"
-" filename \"pxelinux.0\";\n"
-msgstr ""
-" # PXE bootloader (first program to be loaded, by TFTP)\n"
-" filename \"pxelinux.0\";\n"
-
-#. type: Plain text
-#: en/user_basics.ssi:243
-#, no-wrap
-msgid ""
-" }\n"
-"}\n"
-msgstr ""
-" }\n"
+"subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+" range 192.168.0.1 192.168.0.254;\n"
+" next-server servername;\n"
+" filename \"pxelinux.0\";\n"
"}\n"
+msgstr "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:240
msgid "3~ TFTP server"
msgstr "3~ Server TFTP"
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:242
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:251
+#: en/user_basics.ssi:244
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 /"
@@ -838,22 +796,22 @@ msgstr ""
"seguente comando come utente root:"
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:248
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr "dpkg-reconfigure -plow tftpd-hpa"
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:252
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:261
+#: en/user_basics.ssi:254
msgid "3~ NFS server"
msgstr "3~ Server NFS"
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:256
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 "
@@ -864,12 +822,12 @@ msgstr ""
"tramite un server NFS."
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:258
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:267
+#: en/user_basics.ssi:260
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to /etc/exports:"
@@ -878,23 +836,23 @@ msgstr ""
"una riga come la seguente in /etc/exports:"
#. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:264
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:268
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:279
+#: en/user_basics.ssi:272
msgid "# exportfs -rv"
msgstr "# exportfs -rv"
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:276
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -907,12 +865,12 @@ msgstr ""
"http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html può essere d'aiuto."
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:278
msgid "3~ Netboot testing HowTo"
msgstr "3~ Come provare una netboot"
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:280
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
@@ -922,7 +880,7 @@ msgstr ""
"in termini di tempo."
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:282
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
@@ -930,22 +888,22 @@ msgstr ""
"soluzioni."
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:284
msgid "3~ Qemu"
msgstr "3~ Qemu"
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:286
msgid "_* Install qemu, bridge-utils, sudo."
msgstr "_* Installare qemu, bridge-utils, sudo."
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:288
msgid "Edit /etc/qemu-ifup:"
msgstr "Modificare /etc/qemu-ifup:"
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:299
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -958,27 +916,27 @@ msgstr ""
"usr/sbin/brctl addif br0 $1 sleep 2"
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:303
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:312
+#: en/user_basics.ssi:305
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:314
+#: en/user_basics.ssi:307
msgid "3~ VMWare Player"
msgstr "3~ VMWare Player"
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:309
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:318
+#: en/user_basics.ssi:311
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
@@ -986,12 +944,12 @@ msgstr ""
"chiamato pxe.vmx"
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:313
msgid "_* Paste this text inside:"
msgstr "_* Vi si copi dentro questo testo:"
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:321
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
@@ -1000,7 +958,7 @@ msgstr ""
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:327
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
@@ -1009,17 +967,17 @@ msgstr ""
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:330
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:333
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr "displayName = \"Test Boot PXE\" guestOS = \"other\""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:338
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -1030,7 +988,7 @@ msgstr ""
"de 3f-ae 9e 07 91 1d 8d 71 3b\" ethernet0.generatedAddressOffset = \"0\""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:342
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
@@ -1039,7 +997,7 @@ msgstr ""
"256 il limite della memoria)"
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:344
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
@@ -1047,7 +1005,7 @@ msgstr ""
"selezionare questo file)."
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:345
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_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index bbccebc..b29d96e 100644
--- a/manual/po/it/user_customization-packages.ssi.po
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -1272,6 +1272,15 @@ msgstr "$ lb config --apt-recommends false"
#. type: Plain text
#: en/user_customization-packages.ssi:319
+#, fuzzy
+#| msgid ""
+#| "The tradeoff here is that recommended packages are defined as \"packages "
+#| "that would be found together with this one in all but unusual "
+#| "installations\" (Debian Policy Manual, 7.2). This may lead to some "
+#| "packages that you actually need being omitted, so we suggest you review "
+#| "the difference this makes to your packages list (see the #{binary."
+#| "packages}# file generated by #{lb build}#) and re-include in your list "
+#| "any missing packages that you still want installed."
msgid ""
"The tradeoff here is that recommended packages are defined as \"packages "
"that would be found together with this one in all but unusual installations"
diff --git a/manual/po/it/user_managing_a_configuration.ssi.po b/manual/po/it/user_managing_a_configuration.ssi.po
index 0ade48b..6f7ad8a 100644
--- a/manual/po/it/user_managing_a_configuration.ssi.po
+++ b/manual/po/it/user_managing_a_configuration.ssi.po
@@ -212,8 +212,8 @@ msgstr ""
"Un secondo relativo problema è che se si lancia #{lb config}# e si è "
"aggiornato live-build ad una nuova versione il quale ha cambiato il nome di "
"una o più variabili, si può scoprire ciò solamente con una revisione manuale "
-"delle variabili nei file #{config/*}#, bisogna che vengano risistemate, di nuovo, "
-"le appropriate opzioni."
+"delle variabili nei file #{config/*}#, bisogna che vengano risistemate, di "
+"nuovo, le appropriate opzioni."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:16
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 8ddb547..8fce478 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: 2010-12-16 15:00+0100\n"
+"POT-Creation-Date: 2010-12-17 13:34+0100\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -32,8 +32,8 @@ msgstr ""
#: 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: 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_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
@@ -95,8 +95,8 @@ msgstr "code{"
#: 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:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: 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_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:36
@@ -605,81 +605,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218
-msgid ""
-"% FIXME: bring up to date: base example on default isc-dhcp-server config "
-"file in Squeeze"
+#: en/user_basics.ssi:220
+msgid "# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:222
-#, no-wrap
-msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
+msgid "ddns-update-style none;"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:225
-#, no-wrap
msgid ""
-" # IP addresses available for guests\n"
-" range 192.168.1.100 192.168.1.149;\n"
+"option domain-name \"example.org\"; option domain-name-servers ns1.example."
+"org, ns2.example.org;"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:228
-#, no-wrap
-msgid ""
-" # allow booting from the net\n"
-" allow bootp;\n"
+msgid "default-lease-time 600; max-lease-time 7200;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
-#, no-wrap
-msgid ""
-" # for net booting, server where the first file to be loaded (by TFTP\n"
-" # protocol) (\"filename\" following definition) lies: so the TFTP\n"
-" # server's name.\n"
-" next-server myserver;\n"
+#: en/user_basics.ssi:230
+msgid "log-facility local7;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:236
#, no-wrap
msgid ""
-" # net boot configuration for guests with a PXE client:\n"
-" if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-" # Note: all files for PXE are relatives to the TFTP server's root\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:240
-#, no-wrap
-msgid ""
-" # PXE bootloader (first program to be loaded, by TFTP)\n"
-" filename \"pxelinux.0\";\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:243
-#, no-wrap
-msgid ""
-" }\n"
+"subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+" range 192.168.0.1 192.168.0.254;\n"
+" next-server servername;\n"
+" filename \"pxelinux.0\";\n"
"}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:240
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:242
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:244
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 /"
@@ -687,22 +661,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:248
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:252
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:254
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:256
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 "
@@ -710,35 +684,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:258
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:260
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:271
+#: en/user_basics.ssi:264
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:268
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:272
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:276
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -747,40 +721,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:278
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:280
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:289
+#: en/user_basics.ssi:282
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:284
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:286
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:288
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:299
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -789,62 +763,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:303
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:305
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:307
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:309
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:311
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:313
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:321
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:327
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:330
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:333
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:338
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -852,19 +826,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:342
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:344
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:345
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index c96fe70..18e0e23 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: 2010-12-16 15:00+0100\n"
+"POT-Creation-Date: 2010-12-17 13:34+0100\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -33,8 +33,8 @@ msgstr ""
#: 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: 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_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
@@ -96,8 +96,8 @@ msgstr "code{"
#: 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:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: 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_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:36
@@ -606,81 +606,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218
-msgid ""
-"% FIXME: bring up to date: base example on default isc-dhcp-server config "
-"file in Squeeze"
+#: en/user_basics.ssi:220
+msgid "# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:222
-#, no-wrap
-msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
+msgid "ddns-update-style none;"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:225
-#, no-wrap
msgid ""
-" # IP addresses available for guests\n"
-" range 192.168.1.100 192.168.1.149;\n"
+"option domain-name \"example.org\"; option domain-name-servers ns1.example."
+"org, ns2.example.org;"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:228
-#, no-wrap
-msgid ""
-" # allow booting from the net\n"
-" allow bootp;\n"
+msgid "default-lease-time 600; max-lease-time 7200;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
-#, no-wrap
-msgid ""
-" # for net booting, server where the first file to be loaded (by TFTP\n"
-" # protocol) (\"filename\" following definition) lies: so the TFTP\n"
-" # server's name.\n"
-" next-server myserver;\n"
+#: en/user_basics.ssi:230
+msgid "log-facility local7;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:236
#, no-wrap
msgid ""
-" # net boot configuration for guests with a PXE client:\n"
-" if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-" # Note: all files for PXE are relatives to the TFTP server's root\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:240
-#, no-wrap
-msgid ""
-" # PXE bootloader (first program to be loaded, by TFTP)\n"
-" filename \"pxelinux.0\";\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:243
-#, no-wrap
-msgid ""
-" }\n"
+"subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+" range 192.168.0.1 192.168.0.254;\n"
+" next-server servername;\n"
+" filename \"pxelinux.0\";\n"
"}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:240
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:242
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:244
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 /"
@@ -688,22 +662,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:248
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:252
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:254
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:256
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 "
@@ -711,35 +685,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:258
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:260
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:271
+#: en/user_basics.ssi:264
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:268
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:272
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:276
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -748,40 +722,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:278
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:280
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:289
+#: en/user_basics.ssi:282
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:284
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:286
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:288
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:299
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -790,62 +764,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:303
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:305
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:307
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:309
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:311
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:313
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:321
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:327
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:330
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:333
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:338
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -853,19 +827,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:342
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:344
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:345
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index ab61d23..bebabe8 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: 2010-12-16 15:00+0100\n"
+"POT-Creation-Date: 2010-12-17 13:34+0100\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"
@@ -32,8 +32,8 @@ msgstr ""
#: 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: 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_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
@@ -95,8 +95,8 @@ msgstr ""
#: 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:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: 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_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:36
@@ -605,81 +605,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218
-msgid ""
-"% FIXME: bring up to date: base example on default isc-dhcp-server config "
-"file in Squeeze"
+#: en/user_basics.ssi:220
+msgid "# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:222
-#, no-wrap
-msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
+msgid "ddns-update-style none;"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:225
-#, no-wrap
msgid ""
-" # IP addresses available for guests\n"
-" range 192.168.1.100 192.168.1.149;\n"
+"option domain-name \"example.org\"; option domain-name-servers ns1.example."
+"org, ns2.example.org;"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:228
-#, no-wrap
-msgid ""
-" # allow booting from the net\n"
-" allow bootp;\n"
+msgid "default-lease-time 600; max-lease-time 7200;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
-#, no-wrap
-msgid ""
-" # for net booting, server where the first file to be loaded (by TFTP\n"
-" # protocol) (\"filename\" following definition) lies: so the TFTP\n"
-" # server's name.\n"
-" next-server myserver;\n"
+#: en/user_basics.ssi:230
+msgid "log-facility local7;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:236
#, no-wrap
msgid ""
-" # net boot configuration for guests with a PXE client:\n"
-" if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-" # Note: all files for PXE are relatives to the TFTP server's root\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:240
-#, no-wrap
-msgid ""
-" # PXE bootloader (first program to be loaded, by TFTP)\n"
-" filename \"pxelinux.0\";\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:243
-#, no-wrap
-msgid ""
-" }\n"
+"subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+" range 192.168.0.1 192.168.0.254;\n"
+" next-server servername;\n"
+" filename \"pxelinux.0\";\n"
"}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:240
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:242
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:244
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 /"
@@ -687,22 +661,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:248
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:252
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:254
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:256
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 "
@@ -710,35 +684,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:258
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:260
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:271
+#: en/user_basics.ssi:264
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:268
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:272
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:276
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -747,40 +721,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:278
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:280
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:289
+#: en/user_basics.ssi:282
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:284
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:286
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:288
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:299
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -789,62 +763,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:303
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:305
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:307
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:309
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:311
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:313
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:321
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:327
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:330
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:333
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:338
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -852,19 +826,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:342
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:344
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:345
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index 858d488..7619537 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -297,32 +297,23 @@ bootloader.
Here is an example for inspiration, written for the ISC DHCP server
#{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
-% FIXME: bring up to date: base example on default isc-dhcp-server config
-file in Squeeze
-
code{
-subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24
-
- # IP addresses available for guests
- range 192.168.1.100 192.168.1.149;
+# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
- # allow booting from the net
- allow bootp;
+ddns-update-style none;
- # for net booting, server where the first file to be loaded (by TFTP
- # protocol) ("filename" following definition) lies : so the TFTP
- # server's name.
- next-server myserver;
+option domain-name "example.org"; option domain-name-servers
+ns1.example.org, ns2.example.org;
- # net boot configuration for guests with a PXE client :
- if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
- # Note: all files for PXE are relatives to the TFTP server's root
+default-lease-time 600; max-lease-time 7200;
- # PXE bootloader (first program to be loaded, by TFTP)
- filename "pxelinux.0";
+log-facility local7;
- }
+subnet 192.168.0.0 netmask 255.255.255.0 {
+ range 192.168.0.1 192.168.0.254;
+ next-server servername;
+ filename "pxelinux.0";
}
}code
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index 858d488..7619537 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -297,32 +297,23 @@ bootloader.
Here is an example for inspiration, written for the ISC DHCP server
#{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
-% FIXME: bring up to date: base example on default isc-dhcp-server config
-file in Squeeze
-
code{
-subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24
-
- # IP addresses available for guests
- range 192.168.1.100 192.168.1.149;
+# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
- # allow booting from the net
- allow bootp;
+ddns-update-style none;
- # for net booting, server where the first file to be loaded (by TFTP
- # protocol) ("filename" following definition) lies : so the TFTP
- # server's name.
- next-server myserver;
+option domain-name "example.org"; option domain-name-servers
+ns1.example.org, ns2.example.org;
- # net boot configuration for guests with a PXE client :
- if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
- # Note: all files for PXE are relatives to the TFTP server's root
+default-lease-time 600; max-lease-time 7200;
- # PXE bootloader (first program to be loaded, by TFTP)
- filename "pxelinux.0";
+log-facility local7;
- }
+subnet 192.168.0.0 netmask 255.255.255.0 {
+ range 192.168.0.1 192.168.0.254;
+ next-server servername;
+ filename "pxelinux.0";
}
}code
--
live-manual
More information about the debian-live-changes
mailing list