Hello, Adam D. Barratt, on dim. 19 févr. 2017 20:35:11 +0000, wrote: > Control: tags -1 + confirmed > > On Thu, 2017-02-02 at 15:36 +0100, Cyril Brulebois wrote: > > We're getting more reports from people failing to deal with syslinux > > settings for debian-installer; we've had a fix in the installation guide > > for quite a while but it wasn't propagated to jessie yet, meaning the > > website still has faulty instructions for jessie (4.3.3.2): > > https://www.debian.org/releases/jessie/amd64/ch04s03.html.en > > https://www.debian.org/releases/stretch/amd64/ch04s03.html.en > > > > Samuel already cherry-picked the changes in the jessie branch, but that > > wasn't submitted yet. You'll find attached a quasi minimal patch against > > jessie (yay svn…). Changelog: > > | installation-guide (20150423+deb8u3) jessie; urgency=medium > > | > > | [ Matt Kraai ] > > | * Fix Instructions for creating syslinux.cfg according to syslinux 5.00 > > | change. Closes: #803267. > > Please go ahead.
I have now uploaded them, see attached debdiff. Samuel
diff -Nru installation-guide-20150423+deb8u2/debian/changelog installation-guide-20150423+deb8u3/debian/changelog --- installation-guide-20150423+deb8u2/debian/changelog 2016-01-21 20:24:13.000000000 +0100 +++ installation-guide-20150423+deb8u3/debian/changelog 2017-04-29 17:20:16.000000000 +0200 @@ -1,3 +1,15 @@ +installation-guide (20150423+deb8u3) jessie; urgency=medium + + [ Matt Kraai ] + * Fix Instructions for creating syslinux.cfg according to syslinux 5.00 + change. Closes: #803267. + + [ Cyril Brulebois ] + * Mass-update po translations (install-methods.po) so that the syslinux + example is correct (see #803267): el es fi hu ko ru sv vi zh_CN zh_TW + + -- Samuel Thibault <[email protected]> Sat, 29 Apr 2017 17:20:16 +0200 + installation-guide (20150423+deb8u2) jessie; urgency=medium [ Martin Michlmayr ] diff -Nru installation-guide-20150423+deb8u2/en/install-methods/usb-setup/x86.xml installation-guide-20150423+deb8u3/en/install-methods/usb-setup/x86.xml --- installation-guide-20150423+deb8u2/en/install-methods/usb-setup/x86.xml 2014-08-26 22:40:15.000000000 +0200 +++ installation-guide-20150423+deb8u3/en/install-methods/usb-setup/x86.xml 2016-11-11 20:49:54.000000000 +0100 @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- $Id: x86.xml 69269 2014-08-26 20:40:15Z holger-guest $ --> +<!-- $Id: x86.xml 70334 2016-11-11 19:49:54Z sthibault $ --> <sect3 arch="x86"> <title>Partitioning the USB stick</title> @@ -93,17 +93,16 @@ </para><para> Next you should create a <filename>syslinux.cfg</filename> configuration -file, which at a bare minimum should contain the following two lines (change +file, which at a bare minimum should contain the following line (change the name of the kernel binary to <quote><filename>linux</filename></quote> if you used a <filename>netboot</filename> image): <informalexample><screen> -default vmlinuz -append initrd=initrd.gz +default vmlinuz initrd=initrd.gz </screen></informalexample> For the graphical installer you should add <userinput>vga=788</userinput> to the -second line. Other parameters can be appended as desired. +line. Other parameters can be appended as desired. </para><para> diff -Nru installation-guide-20150423+deb8u2/po/el/install-methods.po installation-guide-20150423+deb8u3/po/el/install-methods.po --- installation-guide-20150423+deb8u2/po/el/install-methods.po 2015-05-27 23:29:21.000000000 +0200 +++ installation-guide-20150423+deb8u3/po/el/install-methods.po 2017-04-29 17:20:08.000000000 +0200 @@ -1284,8 +1284,7 @@ "ακόλουθες δύο γραμμές (αλλάξτε το όνομα του εκτελέσιμου του πυρήνα σε " "<quote><filename>linux</filename></quote> αν χρησιμοποιείτε μια εικόνα " "<filename>netboot</filename>): <informalexample><screen>\n" -"default vmlinuz\n" -"append initrd=initrd.gz\n" +"default vmlinuz initrd=initrd.gz\n" "</screen></informalexample> Για τον γραφικό εγκαταστάτη θα πρέπει να " "προσθέσετε τις παραμέτρους <userinput>vga=788</userinput> στη δεύτερη " "γραμμή. Μπορείτε να προσθέσετε και άλλες παραμέτρους σύμφωνα με τις " diff -Nru installation-guide-20150423+deb8u2/po/es/install-methods.po installation-guide-20150423+deb8u3/po/es/install-methods.po --- installation-guide-20150423+deb8u2/po/es/install-methods.po 2015-04-17 16:28:47.000000000 +0200 +++ installation-guide-20150423+deb8u3/po/es/install-methods.po 2017-04-29 17:20:08.000000000 +0200 @@ -1279,8 +1279,7 @@ "(cambie el nombre del núcleo binario a <quote><filename>linux</filename></" "quote> si ha usado una imagen <filename>netboot</filename>): " "<informalexample><screen>\n" -"default vmlinuz\n" -"append initrd=initrd.gz\n" +"default vmlinuz initrd=initrd.gz\n" "</screen></informalexample> Para el uso del instalador gráfico añada " "<userinput>vga=788</userinput> a la segunda línea. Puede añadir otros " "parámetros al final." diff -Nru installation-guide-20150423+deb8u2/po/fi/install-methods.po installation-guide-20150423+deb8u3/po/fi/install-methods.po --- installation-guide-20150423+deb8u2/po/fi/install-methods.po 2015-04-17 17:11:30.000000000 +0200 +++ installation-guide-20150423+deb8u3/po/fi/install-methods.po 2017-04-29 17:20:08.000000000 +0200 @@ -1234,8 +1234,7 @@ "<quote><filename>linux</filename></quote> jos käytit <filename>netboot</" "filename>-otosta):\n" "<informalexample><screen>\n" -"default vmlinuz\n" -"append initrd=initrd.gz\n" +"default vmlinuz initrd=initrd.gz\n" "</screen></informalexample> \n" "Asentimen graafista käyttöliittymää varten olisi toiseen riviin\n" "lisättävä <userinput>vga=788</userinput>." diff -Nru installation-guide-20150423+deb8u2/po/hu/install-methods.po installation-guide-20150423+deb8u3/po/hu/install-methods.po --- installation-guide-20150423+deb8u2/po/hu/install-methods.po 2015-04-17 15:38:53.000000000 +0200 +++ installation-guide-20150423+deb8u3/po/hu/install-methods.po 2017-04-29 17:20:08.000000000 +0200 @@ -1136,8 +1136,7 @@ msgstr "" "A <filename>syslinux.cfg</filename> beállító fájl az alábbi 2 sort " "tartalmazza: <informalexample><screen>\n" -"default vmlinuz\n" -"append initrd=initrd.gz ramdisk_size=12000 root=/dev/ram rw\n" +"default vmlinuz initrd=initrd.gz ramdisk_size=12000 root=/dev/ram rw\n" "</screen></informalexample> Ne feledd, hogy a <userinput>ramdisk_size</" "userinput> paraméter növelése szükséges lehet, az indító képnek megfelelően." diff -Nru installation-guide-20150423+deb8u2/po/ko/install-methods.po installation-guide-20150423+deb8u3/po/ko/install-methods.po --- installation-guide-20150423+deb8u2/po/ko/install-methods.po 2015-05-17 08:47:00.000000000 +0200 +++ installation-guide-20150423+deb8u3/po/ko/install-methods.po 2017-04-29 17:20:08.000000000 +0200 @@ -1140,8 +1140,7 @@ "두 줄이 필요합니다 (<filename>netboot</filename>를 사용하는 경우, 커널 바이너" "리 이름을 <quote><filename>linux</filename></quote>로 변경하십시오): " "<informalexample><screen>\n" -"default vmlinuz\n" -"append initrd=initrd.gz\n" +"default vmlinuz initrd=initrd.gz\n" "</screen></informalexample> 그래픽 설치 프로그램은 두 번째 줄에 " "<userinput>vga=788</userinput>를 추가하십시오. 다른 파라미터도 원하는대로 뒤" "에 붙일 수 있습니다." diff -Nru installation-guide-20150423+deb8u2/po/ru/install-methods.po installation-guide-20150423+deb8u3/po/ru/install-methods.po --- installation-guide-20150423+deb8u2/po/ru/install-methods.po 2015-04-15 22:43:58.000000000 +0200 +++ installation-guide-20150423+deb8u3/po/ru/install-methods.po 2017-04-29 17:20:08.000000000 +0200 @@ -1191,8 +1191,7 @@ "который, как минимум, должен содержать две строки (измените имя файла с " "ядром на <quote><filename>linux</filename></quote>, если используется образ " "<filename>netboot</filename>): <informalexample><screen>\n" -"default vmlinuz\n" -"append initrd=initrd.gz\n" +"default vmlinuz initrd=initrd.gz\n" "</screen></informalexample> Для графической версии программы установки нужно " "добавить <userinput>vga=788</userinput> во вторую строку. По желанию, можно " "добавлять и другие параметры." diff -Nru installation-guide-20150423+deb8u2/po/sv/install-methods.po installation-guide-20150423+deb8u3/po/sv/install-methods.po --- installation-guide-20150423+deb8u2/po/sv/install-methods.po 2015-04-17 16:51:42.000000000 +0200 +++ installation-guide-20150423+deb8u3/po/sv/install-methods.po 2017-04-29 17:20:08.000000000 +0200 @@ -1242,8 +1242,7 @@ "som minimum bör innehålla följande två rader (ändra namnet på kärnbinärfilen " "till <quote><filename>linux</filename></quote> om du använder en " "<filename>netboot</filename>-avbildning): <informalexample><screen>\n" -"default vmlinuz\n" -"append initrd=initrd.gz\n" +"default vmlinuz initrd=initrd.gz\n" "</screen></informalexample> För det grafiska installationsprogrammet så bör " "du lägga till <userinput>vga=788</userinput> på den andra raden." diff -Nru installation-guide-20150423+deb8u2/po/vi/install-methods.po installation-guide-20150423+deb8u3/po/vi/install-methods.po --- installation-guide-20150423+deb8u2/po/vi/install-methods.po 2015-04-17 16:40:18.000000000 +0200 +++ installation-guide-20150423+deb8u3/po/vi/install-methods.po 2017-04-29 17:20:08.000000000 +0200 @@ -1247,8 +1247,7 @@ "filename>: nó nên chứa ít nhất hai dòng này (thay đổi tên của bản nhị phân " "hạt nhân thành <quote><filename>linux</filename></quote> nếu bạn đã dùng một " "ảnh kiểu <filename>netboot</filename>): <informalexample><screen>\n" -"default vmlinuz\n" -"append initrd=initrd.gz\n" +"default vmlinuz initrd=initrd.gz\n" "</screen></informalexample> Đối với trình cài đặt kiểu đồ họa, bạn nên thêm " "vào dòng thứ hai chuỗi <userinput>vga=788</userinput>." diff -Nru installation-guide-20150423+deb8u2/po/zh_CN/install-methods.po installation-guide-20150423+deb8u3/po/zh_CN/install-methods.po --- installation-guide-20150423+deb8u2/po/zh_CN/install-methods.po 2015-04-17 16:07:24.000000000 +0200 +++ installation-guide-20150423+deb8u3/po/zh_CN/install-methods.po 2017-04-29 17:20:08.000000000 +0200 @@ -1124,8 +1124,7 @@ "接下来,您需要创建一个 <filename>syslinux.cfg</filename> 配置文件,里面最少要" "包含下面两行(如果您使用 <filename>netboot</filename> 映象,修改内核文件名为 " "<quote><filename>linux</filename></quote> ):<informalexample><screen>\n" -"default vmlinuz\n" -"append initrd=initrd.gz\n" +"default vmlinuz initrd=initrd.gz\n" "</screen></informalexample> 对于图形安装程序,您需要添加 <userinput>vga=788</" "userinput> 到第二行尾部。还可以添加其他的参数。" diff -Nru installation-guide-20150423+deb8u2/po/zh_TW/install-methods.po installation-guide-20150423+deb8u3/po/zh_TW/install-methods.po --- installation-guide-20150423+deb8u2/po/zh_TW/install-methods.po 2015-04-17 15:38:53.000000000 +0200 +++ installation-guide-20150423+deb8u3/po/zh_TW/install-methods.po 2017-04-29 17:20:08.000000000 +0200 @@ -1096,8 +1096,7 @@ msgstr "" "<filename>syslinux.cfg</filename> 設定檔案應該含有下列兩行: " "<informalexample><screen>\n" -"default vmlinuz\n" -"append initrd=initrd.gz ramdisk_size=12000 root=/dev/ram rw\n" +"default vmlinuz initrd=initrd.gz ramdisk_size=12000 root=/dev/ram rw\n" "</screen></informalexample> 請注意,根據開機的映像大小,在必要的時候,您可能" "需要增大 <userinput>ramdisk_size</userinput> 參數的數值。<phrase condition=" "\"sarge\">如果開機失敗,您可以嘗試添加 <userinput>devfs=mount,dall</"

