summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ca/appendix/preseed.xml1
-rw-r--r--cs/appendix/preseed.xml1
-rw-r--r--de/appendix/preseed.xml1
-rw-r--r--debian/changelog2
-rw-r--r--en/appendix/preseed.xml1
-rw-r--r--fr/appendix/preseed.xml1
-rw-r--r--it/appendix/preseed.xml1
-rw-r--r--nl/appendix/preseed.xml1
-rw-r--r--po/el/preseed.po2
-rw-r--r--po/es/preseed.po2
-rw-r--r--po/fi/preseed.po2
-rw-r--r--po/hu/preseed.po1
-rw-r--r--po/ja/preseed.po2
-rw-r--r--po/ko/preseed.po2
-rw-r--r--po/pt/preseed.po2
-rw-r--r--po/ru/preseed.po2
-rw-r--r--po/sv/preseed.po2
-rw-r--r--po/vi/preseed.po2
-rw-r--r--po/zh_CN/preseed.po2
-rw-r--r--pt_BR/appendix/preseed.xml1
20 files changed, 31 insertions, 0 deletions
diff --git a/ca/appendix/preseed.xml b/ca/appendix/preseed.xml
index a95d9b2d3..33ca67b44 100644
--- a/ca/appendix/preseed.xml
+++ b/ca/appendix/preseed.xml
@@ -904,6 +904,7 @@ indicar que no s'hauria d'utilitzar cap passarel·la.
# per a instal·lar remotament mitjançant SSH. Açò només té sentit si voleu
# continuar amb la instal·lació de forma manual.
#d-i anna/choose_modules string network-console
+#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key
#d-i network-console/password password r00tme
#d-i network-console/password-again password r00tme
</screen></informalexample>
diff --git a/cs/appendix/preseed.xml b/cs/appendix/preseed.xml
index c43c49c31..c4649364d 100644
--- a/cs/appendix/preseed.xml
+++ b/cs/appendix/preseed.xml
@@ -955,6 +955,7 @@ což znamená, že se brána nemá použít vůbec.
# Toto přednastavení má smysl pouze pokud plánujete dokončit
# instalaci ručně.
#d-i anna/choose_modules string network-console
+#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key
#d-i network-console/password password r00tme
#d-i network-console/password-again password r00tme
</screen></informalexample>
diff --git a/de/appendix/preseed.xml b/de/appendix/preseed.xml
index 444897d80..fd3d3b2c9 100644
--- a/de/appendix/preseed.xml
+++ b/de/appendix/preseed.xml
@@ -973,6 +973,7 @@ soll.
# macht nur Sinn, wenn Sie vorhaben, den verbleibenden Rest der Installation
# manuell durchzuführen.
#d-i anna/choose_modules string network-console
+#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key
#d-i network-console/password password r00tme
#d-i network-console/password-again password r00tme
</screen></informalexample>
diff --git a/debian/changelog b/debian/changelog
index 54bbc0f43..ca76da8a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
installation-guide (20120827) UNRELEASED; urgency=low
* debian/rules: Fix suite name.
+ * preseed: Add authorized_keys url preseed example, thanks Charles Plessy
+ for the patch. Closes: #684629.
-- Samuel Thibault <sthibault@debian.org> Sun, 26 Aug 2012 16:47:22 +0200
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index ab5a3205d..b1094f7d7 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -904,6 +904,7 @@ that no gateway should be used.
# component for remote installation over SSH. This only makes sense if you
# intend to perform the remainder of the installation manually.
#d-i anna/choose_modules string network-console
+#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key
#d-i network-console/password password r00tme
#d-i network-console/password-again password r00tme
</screen></informalexample>
diff --git a/fr/appendix/preseed.xml b/fr/appendix/preseed.xml
index 3e562d799..f76ed6f4f 100644
--- a/fr/appendix/preseed.xml
+++ b/fr/appendix/preseed.xml
@@ -871,6 +871,7 @@ de passerelle, vous pouvez positionner cette variable à <quote>none</quote>.
# par SSH, vous pouvez vous servir des commandes suivantes. Elles n'ont de sens que si
# vous avez l'intention de poursuivre l'installation <quote>manuellement</quote>.
#d-i anna/choose_modules string network-console
+#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key
#d-i network-console/password password r00tme
#d-i network-console/password-again password r00tme
</screen></informalexample>
diff --git a/it/appendix/preseed.xml b/it/appendix/preseed.xml
index 5ef5b4e6c..7756c643d 100644
--- a/it/appendix/preseed.xml
+++ b/it/appendix/preseed.xml
@@ -1640,6 +1640,7 @@ indicare che non deve essere usato alcun gateway.
# network-console, usare le seguenti impostazioni. Questo ha senso se si
# intende effettuare il resto dell'installazione manualmente.
#d-i anna/choose_modules string network-console
+#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key
#d-i network-console/password password r00tme
#d-i network-console/password-again password r00tme
</screen></informalexample>
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index 25c5e3d47..90ce8a4f6 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -886,6 +886,7 @@ that no gateway should be used.
# component for remote installation over SSH. This only makes sense if you
# intend to perform the remainder of the installation manually.
#d-i anna/choose_modules string network-console
+#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key
#d-i network-console/password password r00tme
#d-i network-console/password-again password r00tme
</screen></informalexample>
diff --git a/po/el/preseed.po b/po/el/preseed.po
index 2b02fc330..728a051e4 100644
--- a/po/el/preseed.po
+++ b/po/el/preseed.po
@@ -1825,6 +1825,7 @@ msgid ""
"# component for remote installation over SSH. This only makes sense if you\n"
"# intend to perform the remainder of the installation manually.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
msgstr ""
@@ -1833,6 +1834,7 @@ msgstr ""
"# για απομακρυσμένη εγκατάσταση πάνω από SSH. Αυτό έχει νόημα μόνο αν\n"
"# σκοπεύετε να κάνετε την υπόλοιπη εγκατάσταση με το χέρι.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
diff --git a/po/es/preseed.po b/po/es/preseed.po
index 1512eadc2..185a094dd 100644
--- a/po/es/preseed.po
+++ b/po/es/preseed.po
@@ -1723,6 +1723,7 @@ msgid ""
"# component for remote installation over SSH. This only makes sense if you\n"
"# intend to perform the remainder of the installation manually.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
msgstr ""
@@ -1731,6 +1732,7 @@ msgstr ""
"# Sólo tiene sentido si desea hacer el resto de la instalación\n"
"# manualmente\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
diff --git a/po/fi/preseed.po b/po/fi/preseed.po
index 827509b7b..7da7eff93 100644
--- a/po/fi/preseed.po
+++ b/po/fi/preseed.po
@@ -1713,6 +1713,7 @@ msgid ""
"# component for remote installation over SSH. This only makes sense if you\n"
"# intend to perform the remainder of the installation manually.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
msgstr ""
@@ -1720,6 +1721,7 @@ msgstr ""
"# pääteyhteyhteydellä. Tämä on järkevää vain jos aikomus on jatkaa\n"
"#asennus loppuun ei-automaattisesti.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
diff --git a/po/hu/preseed.po b/po/hu/preseed.po
index b14a476f4..ee8b76b87 100644
--- a/po/hu/preseed.po
+++ b/po/hu/preseed.po
@@ -1614,6 +1614,7 @@ msgid ""
"# component for remote installation over SSH. This only makes sense if you\n"
"# intend to perform the remainder of the installation manually.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
msgstr ""
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 7c6f76481..a24f79183 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -1587,6 +1587,7 @@ msgid ""
"# component for remote installation over SSH. This only makes sense if you\n"
"# intend to perform the remainder of the installation manually.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
msgstr ""
@@ -1594,6 +1595,7 @@ msgstr ""
"# component for remote installation over SSH. This only makes sense if you\n"
"# intend to perform the remainder of the installation manually.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
diff --git a/po/ko/preseed.po b/po/ko/preseed.po
index 3650b5837..b91c5e238 100644
--- a/po/ko/preseed.po
+++ b/po/ko/preseed.po
@@ -1569,6 +1569,7 @@ msgid ""
"# component for remote installation over SSH. This only makes sense if you\n"
"# intend to perform the remainder of the installation manually.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
msgstr ""
@@ -1576,6 +1577,7 @@ msgstr ""
"# 설정을 사용합니다. 이후의 모든 설치를 수동으로 하는 경우에만 이렇게 합니"
"다.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
diff --git a/po/pt/preseed.po b/po/pt/preseed.po
index db61ed75e..e332d49b2 100644
--- a/po/pt/preseed.po
+++ b/po/pt/preseed.po
@@ -1744,6 +1744,7 @@ msgid ""
"# component for remote installation over SSH. This only makes sense if you\n"
"# intend to perform the remainder of the installation manually.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
msgstr ""
@@ -1751,6 +1752,7 @@ msgstr ""
"# network-console para instalações remotas através de SSH. Isto só faz\n"
"# sentido se pretender fazer manualmente o resto da instalação.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
diff --git a/po/ru/preseed.po b/po/ru/preseed.po
index 6ae616127..12bdbef30 100644
--- a/po/ru/preseed.po
+++ b/po/ru/preseed.po
@@ -1725,6 +1725,7 @@ msgid ""
"# component for remote installation over SSH. This only makes sense if you\n"
"# intend to perform the remainder of the installation manually.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
msgstr ""
@@ -1733,6 +1734,7 @@ msgstr ""
"вы\n"
"# намереваетесь выполнять оставшуюся часть установки вручную.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
diff --git a/po/sv/preseed.po b/po/sv/preseed.po
index 8649c261f..e8e572fec 100644
--- a/po/sv/preseed.po
+++ b/po/sv/preseed.po
@@ -1745,6 +1745,7 @@ msgid ""
"# component for remote installation over SSH. This only makes sense if you\n"
"# intend to perform the remainder of the installation manually.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
msgstr ""
@@ -1752,6 +1753,7 @@ msgstr ""
"# network-console för fjärrinstallation över SSH. Detta gäller endast\n"
"# om du tänker genomföra återstående del av installationen manuellt.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
diff --git a/po/vi/preseed.po b/po/vi/preseed.po
index 55977567c..5e9224440 100644
--- a/po/vi/preseed.po
+++ b/po/vi/preseed.po
@@ -1642,6 +1642,7 @@ msgid ""
"# component for remote installation over SSH. This only makes sense if you\n"
"# intend to perform the remainder of the installation manually.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
msgstr ""
@@ -1650,6 +1651,7 @@ msgstr ""
"# thông qua SSH (trình bao bảo mật). Trường hợp này chỉ hữu ích\n"
"# nếu bạn định tự thực hiện phần còn lại của quá trình cài đặt.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 8c582a48b..73ebd98b6 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -1570,6 +1570,7 @@ msgid ""
"# component for remote installation over SSH. This only makes sense if you\n"
"# intend to perform the remainder of the installation manually.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
msgstr ""
@@ -1577,6 +1578,7 @@ msgstr ""
"# component for remote installation over SSH. This only makes sense if you\n"
"# intend to perform the remainder of the installation manually.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
diff --git a/pt_BR/appendix/preseed.xml b/pt_BR/appendix/preseed.xml
index 3e586d076..e9fe60cc9 100644
--- a/pt_BR/appendix/preseed.xml
+++ b/pt_BR/appendix/preseed.xml
@@ -880,6 +880,7 @@ especial, você pode definir <classname>netcfg/get_gateway</classname> como
# component for remote installation over SSH. This only makes sense if you
# intend to perform the remainder of the installation manually.
#d-i anna/choose_modules string network-console
+#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key
#d-i network-console/password password r00tme
#d-i network-console/password-again password r00tme
</screen></informalexample>