summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rw-r--r--en/appendix/preseed.xml3
-rw-r--r--po/el/preseed.po6
-rw-r--r--po/fi/preseed.po6
-rw-r--r--po/hu/preseed.po6
-rw-r--r--po/ja/preseed.po6
-rw-r--r--po/ko/preseed.po6
-rw-r--r--po/pot/preseed.pot3
-rw-r--r--po/pt/preseed.po6
-rw-r--r--po/ru/preseed.po6
-rw-r--r--po/sv/preseed.po6
-rw-r--r--po/vi/preseed.po6
-rw-r--r--po/zh_CN/preseed.po6
13 files changed, 26 insertions, 45 deletions
diff --git a/debian/changelog b/debian/changelog
index d63288b17..f3fcc85e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,11 +22,14 @@ installation-guide (2008xxxx) UNRELEASED; urgency=low
* Fix double / in links, spotted by Stanislav Gromov. Closes: #472813.
* Document new boot parameters to define mouse protocol and device (port)
for the graphical installer.
+ * Correct command to use to allow preseeding of netcfg when using a
+ preconfiguration file downloaded from a server (preseed/url).
+ Thanks to Durk Strooisma for the report and analysis. Closes: #476524.
[ Joey Hess ]
* Remove autopartkit from the module list.
- -- Frans Pop <fjp@debian.org> Sat, 19 Apr 2008 14:53:10 +0200
+ -- Frans Pop <fjp@debian.org> Wed, 23 Apr 2008 07:17:13 +0200
installation-guide (20080211) unstable; urgency=low
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 72473038c..9d9e78ac8 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -774,8 +774,7 @@ by creating a <quote>preseed/run</quote> script containing the following
lines:
<informalexample><screen>
-killall.sh dhclient
-netcfg
+killall.sh; netcfg
</screen></informalexample>
</para>
diff --git a/po/el/preseed.po b/po/el/preseed.po
index 469973669..342fe4af9 100644
--- a/po/el/preseed.po
+++ b/po/el/preseed.po
@@ -1427,11 +1427,9 @@ msgstr ""
#: preseed.xml:738
#, no-c-format
msgid ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
msgstr ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
#. Tag: screen
#: preseed.xml:742
diff --git a/po/fi/preseed.po b/po/fi/preseed.po
index a7b12a8a7..590dc59c7 100644
--- a/po/fi/preseed.po
+++ b/po/fi/preseed.po
@@ -1370,11 +1370,9 @@ msgstr ""
#: preseed.xml:738
#, no-c-format
msgid ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
msgstr ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
#. Tag: screen
#: preseed.xml:742
diff --git a/po/hu/preseed.po b/po/hu/preseed.po
index 9d48dcb52..159f23bde 100644
--- a/po/hu/preseed.po
+++ b/po/hu/preseed.po
@@ -1315,11 +1315,9 @@ msgstr ""
#: preseed.xml:738
#, no-c-format
msgid ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
msgstr ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
#. Tag: screen
#: preseed.xml:742
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 086f703b4..c463ac018 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -1326,11 +1326,9 @@ msgstr ""
#: preseed.xml:738
#, no-c-format
msgid ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
msgstr ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
#. Tag: screen
#: preseed.xml:742
diff --git a/po/ko/preseed.po b/po/ko/preseed.po
index 1b3edcfc6..95ed1d699 100644
--- a/po/ko/preseed.po
+++ b/po/ko/preseed.po
@@ -1318,11 +1318,9 @@ msgstr ""
#: preseed.xml:738
#, no-c-format
msgid ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
msgstr ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
#. Tag: screen
#: preseed.xml:742
diff --git a/po/pot/preseed.pot b/po/pot/preseed.pot
index f0f92412f..5ef871161 100644
--- a/po/pot/preseed.pot
+++ b/po/pot/preseed.pot
@@ -766,8 +766,7 @@ msgstr ""
#: preseed.xml:738
#, no-c-format
msgid ""
- "killall.sh dhclient\n"
- "netcfg"
+ "killall.sh; netcfg"
msgstr ""
#. Tag: screen
diff --git a/po/pt/preseed.po b/po/pt/preseed.po
index 26e1e0947..b702e93be 100644
--- a/po/pt/preseed.po
+++ b/po/pt/preseed.po
@@ -1393,11 +1393,9 @@ msgstr ""
#: preseed.xml:738
#, no-c-format
msgid ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
msgstr ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
#. Tag: screen
#: preseed.xml:742
diff --git a/po/ru/preseed.po b/po/ru/preseed.po
index 6083252cd..79d9a5dc3 100644
--- a/po/ru/preseed.po
+++ b/po/ru/preseed.po
@@ -1370,11 +1370,9 @@ msgstr ""
#: preseed.xml:738
#, no-c-format
msgid ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
msgstr ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
#. Tag: screen
#: preseed.xml:742
diff --git a/po/sv/preseed.po b/po/sv/preseed.po
index 2f628d4e0..41c9533a9 100644
--- a/po/sv/preseed.po
+++ b/po/sv/preseed.po
@@ -1386,11 +1386,9 @@ msgstr ""
#: preseed.xml:738
#, no-c-format
msgid ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
msgstr ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
#. Tag: screen
#: preseed.xml:742
diff --git a/po/vi/preseed.po b/po/vi/preseed.po
index ee0711a61..afaf5630f 100644
--- a/po/vi/preseed.po
+++ b/po/vi/preseed.po
@@ -1374,11 +1374,9 @@ msgstr ""
#: preseed.xml:738
#, no-c-format
msgid ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
msgstr ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
#. Tag: screen
#: preseed.xml:742
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 8c8a57e06..201a3efc4 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -1245,11 +1245,9 @@ msgstr ""
#: preseed.xml:738
#, no-c-format
msgid ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
msgstr ""
-"killall.sh dhclient\n"
-"netcfg"
+"killall.sh; netcfg"
#. Tag: screen
#: preseed.xml:742