From 84c9ba28988f924199332357a45f2bc55e9f01d0 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 27 Aug 2017 01:21:38 +0200 Subject: [PATCH] builder/templates/debian.preseed: enable serial console RWMJ: - Rebuilt the images, to fix RHBZ#1484957 - Regenerated the index-fragment files as part of rebuilding the images. --- builder/templates/debian-7.index-fragment | 35 +++----- builder/templates/debian-8.index-fragment | 30 +++---- builder/templates/debian-9.index-fragment | 11 +-- builder/templates/debian.preseed | 1 + builder/templates/make-template.ml | 6 -- website/download/builder/index | 76 ++++++---------- website/download/builder/index.asc | 102 +++++++++------------- 7 files changed, 101 insertions(+), 160 deletions(-) diff --git a/builder/templates/debian-7.index-fragment b/builder/templates/debian-7.index-fragment index 7d868e63c..cb0648bf8 100644 --- a/builder/templates/debian-7.index-fragment +++ b/builder/templates/debian-7.index-fragment @@ -1,32 +1,25 @@ [debian-7] -name=Debian 7 (Wheezy) +name=Debian 7 (wheezy) osinfo=debian7 arch=x86_64 file=debian-7.xz -revision=2 -checksum=c980a7d878c086b14619b3b9f644ab131c1f88b87729062f2832de12a938ba9e5a511c49402a9d02b740a30876f51889d20e7d0ed4997755f542650b8485f013 +revision=3 +checksum[sha512]=428d5867009c49bdffe3e752c68da7aa17fac415a308dffe1a0863376325aed93945500afedc0dd14b06f1b1e86598c0445c63c3bc3be91aafe4de7a0aefcbdd format=raw -size=4294967296 -compressed_size=150734028 +size=6442450944 +compressed_size=200048080 expand=/dev/sda1 -notes=Debian 7 (Wheezy). +notes=Debian 7 (wheezy) - This is a default Debian install. - - The preseed and virt-install scripts that produced this image - can be found in the libguestfs source tree: - - builder/website/debian.preseed - builder/website/debian.sh - - This image is so very minimal that it only includes an ssh - server and no virtual consoles. To enable virtual consoles - use this virt-builder option: - - virt-builder debian-7 \ - --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,' + This is a minimal Debian install. + This image is so very minimal that it only includes an ssh server This image does not contain SSH host keys. To regenerate them use: - --firstboot-command "dpkg-reconfigure openssh-server" + --firstboot-command "dpkg-reconfigure openssh-server" + + This template was generated by a script in the libguestfs source tree: + builder/templates/make-template.ml + Associated files used to prepare this template can be found in the + same directory. diff --git a/builder/templates/debian-8.index-fragment b/builder/templates/debian-8.index-fragment index d8387c327..b61b010dc 100644 --- a/builder/templates/debian-8.index-fragment +++ b/builder/templates/debian-8.index-fragment @@ -1,30 +1,24 @@ [debian-8] -name=Debian 8 (Jessie) +name=Debian 8 (jessie) osinfo=debian8 arch=x86_64 file=debian-8.xz -checksum=67700928c435a7a3cd3b611a390ae3f3dfb1b4d882157b6617aa7ea5d693dff3eb4951e5968bdb6859b5f82aa6fe95cc636f053344867d34178ecd5acefe8e91 +revision=2 +checksum[sha512]=bd182ce61636166e4cb9c98d786f61e4b53069cc945036ff04ddec3f39f3b2218183bbe059e0e237ba782622cbbee6683018cc8f45fc47a1ed7464e754b87ed3 format=raw -size=4294967296 -compressed_size=229866456 +size=6442450944 +compressed_size=232182108 expand=/dev/sda1 -notes=Debian 8 (Jessie). +notes=Debian 8 (jessie) - This is a default Debian install. - - The preseed and virt-install scripts that produced this image - can be found in the libguestfs source tree: - - builder/website/debian.preseed - builder/website/debian.sh + This is a minimal Debian install. This image does not contain SSH host keys. To regenerate them use: - --firstboot-command "dpkg-reconfigure openssh-server" + --firstboot-command "dpkg-reconfigure openssh-server" - The serial console is not working in this image. To enable it, do: - - --edit '/etc/default/grub: - s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=ttyS0,115200n8"/' \ - --run-command update-grub + This template was generated by a script in the libguestfs source tree: + builder/templates/make-template.ml + Associated files used to prepare this template can be found in the + same directory. diff --git a/builder/templates/debian-9.index-fragment b/builder/templates/debian-9.index-fragment index 293f9117f..1f2ccde8a 100644 --- a/builder/templates/debian-9.index-fragment +++ b/builder/templates/debian-9.index-fragment @@ -3,21 +3,16 @@ name=Debian 9 (stretch) osinfo=debian9 arch=x86_64 file=debian-9.xz -checksum[sha512]=8f556a0ef907ecce2de22c2c3b06e3c2512e7f7c3e9a61b6c377ea39c8ccedf9f371f491678037c8357334b915346f2b4de793be34859d92f710a9596bd71148 +revision=2 +checksum[sha512]=2e8bc3b34940157766b9ad628ddf8eb9a1b410798b921959fd57ae8a4e54fdfa74ac939fe214b8200f9d783be940f4b75b640dbf388e51ef5e74f0c96acd5529 format=raw size=6442450944 -compressed_size=203644432 +compressed_size=194181968 expand=/dev/sda1 notes=Debian 9 (stretch) This is a minimal Debian install. - This image is so very minimal that it only includes an ssh server - and no virtual consoles. To enable virtual consoles use this - virt-builder option: - - --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,' - This image does not contain SSH host keys. To regenerate them use: --firstboot-command "dpkg-reconfigure openssh-server" diff --git a/builder/templates/debian.preseed b/builder/templates/debian.preseed index 3cffb3b9b..1f13eadbd 100644 --- a/builder/templates/debian.preseed +++ b/builder/templates/debian.preseed @@ -439,4 +439,5 @@ d-i finish-install/reboot_in_progress note # directly, or use the apt-install and in-target commands to easily install # packages and run commands in the target system. #d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh +d-i preseed/late_command string in-target sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT="console=ttyS0,115200n8"/g; s/# *GRUB_TERMINAL=console/GRUB_TERMINAL=serial/g' /etc/default/grub; in-target update-grub diff --git a/builder/templates/make-template.ml b/builder/templates/make-template.ml index 7b46bdacb..42ff48eb9 100755 --- a/builder/templates/make-template.ml +++ b/builder/templates/make-template.ml @@ -1027,14 +1027,8 @@ and notes_of_os os arch nvram = add "" | Debian ((8|9), _) -> reconfigure_ssh_host_keys_debian (); - fix_serial_console_debian (); | Debian _ -> add "This image is so very minimal that it only includes an ssh server"; - add "and no virtual consoles. To enable virtual consoles use this"; - add "virt-builder option:"; - add ""; - add " --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,'"; - add ""; reconfigure_ssh_host_keys_debian (); | Ubuntu ("16.04", _) -> builder_account_warning (); diff --git a/website/download/builder/index b/website/download/builder/index index 418342854..a2a76b389 100644 --- a/website/download/builder/index +++ b/website/download/builder/index @@ -226,87 +226,69 @@ notes=Debian 7 (Wheezy). is still booting and will eventually give you a login prompt. [debian-7] -name=Debian 7 (Wheezy) +name=Debian 7 (wheezy) osinfo=debian7 arch=x86_64 file=debian-7.xz -revision=2 -checksum=c980a7d878c086b14619b3b9f644ab131c1f88b87729062f2832de12a938ba9e5a511c49402a9d02b740a30876f51889d20e7d0ed4997755f542650b8485f013 +revision=3 +checksum[sha512]=428d5867009c49bdffe3e752c68da7aa17fac415a308dffe1a0863376325aed93945500afedc0dd14b06f1b1e86598c0445c63c3bc3be91aafe4de7a0aefcbdd format=raw -size=4294967296 -compressed_size=150734028 +size=6442450944 +compressed_size=200048080 expand=/dev/sda1 -notes=Debian 7 (Wheezy). +notes=Debian 7 (wheezy) - This is a default Debian install. - - The preseed and virt-install scripts that produced this image - can be found in the libguestfs source tree: - - builder/website/debian.preseed - builder/website/debian.sh - - This image is so very minimal that it only includes an ssh - server and no virtual consoles. To enable virtual consoles - use this virt-builder option: - - virt-builder debian-7 \ - --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,' + This is a minimal Debian install. + This image is so very minimal that it only includes an ssh server This image does not contain SSH host keys. To regenerate them use: - --firstboot-command "dpkg-reconfigure openssh-server" + --firstboot-command "dpkg-reconfigure openssh-server" + + This template was generated by a script in the libguestfs source tree: + builder/templates/make-template.ml + Associated files used to prepare this template can be found in the + same directory. [debian-8] -name=Debian 8 (Jessie) +name=Debian 8 (jessie) osinfo=debian8 arch=x86_64 file=debian-8.xz -checksum=67700928c435a7a3cd3b611a390ae3f3dfb1b4d882157b6617aa7ea5d693dff3eb4951e5968bdb6859b5f82aa6fe95cc636f053344867d34178ecd5acefe8e91 +revision=2 +checksum[sha512]=bd182ce61636166e4cb9c98d786f61e4b53069cc945036ff04ddec3f39f3b2218183bbe059e0e237ba782622cbbee6683018cc8f45fc47a1ed7464e754b87ed3 format=raw -size=4294967296 -compressed_size=229866456 +size=6442450944 +compressed_size=232182108 expand=/dev/sda1 -notes=Debian 8 (Jessie). +notes=Debian 8 (jessie) - This is a default Debian install. - - The preseed and virt-install scripts that produced this image - can be found in the libguestfs source tree: - - builder/website/debian.preseed - builder/website/debian.sh + This is a minimal Debian install. This image does not contain SSH host keys. To regenerate them use: - --firstboot-command "dpkg-reconfigure openssh-server" + --firstboot-command "dpkg-reconfigure openssh-server" - The serial console is not working in this image. To enable it, do: - - --edit '/etc/default/grub: - s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=ttyS0,115200n8"/' \ - --run-command update-grub + This template was generated by a script in the libguestfs source tree: + builder/templates/make-template.ml + Associated files used to prepare this template can be found in the + same directory. [debian-9] name=Debian 9 (stretch) osinfo=debian9 arch=x86_64 file=debian-9.xz -checksum[sha512]=8f556a0ef907ecce2de22c2c3b06e3c2512e7f7c3e9a61b6c377ea39c8ccedf9f371f491678037c8357334b915346f2b4de793be34859d92f710a9596bd71148 +revision=2 +checksum[sha512]=2e8bc3b34940157766b9ad628ddf8eb9a1b410798b921959fd57ae8a4e54fdfa74ac939fe214b8200f9d783be940f4b75b640dbf388e51ef5e74f0c96acd5529 format=raw size=6442450944 -compressed_size=203644432 +compressed_size=194181968 expand=/dev/sda1 notes=Debian 9 (stretch) This is a minimal Debian install. - This image is so very minimal that it only includes an ssh server - and no virtual consoles. To enable virtual consoles use this - virt-builder option: - - --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,' - This image does not contain SSH host keys. To regenerate them use: --firstboot-command "dpkg-reconfigure openssh-server" diff --git a/website/download/builder/index.asc b/website/download/builder/index.asc index 3a19b6fda..736e2043d 100644 --- a/website/download/builder/index.asc +++ b/website/download/builder/index.asc @@ -229,87 +229,69 @@ notes=Debian 7 (Wheezy). is still booting and will eventually give you a login prompt. [debian-7] -name=Debian 7 (Wheezy) +name=Debian 7 (wheezy) osinfo=debian7 arch=x86_64 file=debian-7.xz -revision=2 -checksum=c980a7d878c086b14619b3b9f644ab131c1f88b87729062f2832de12a938ba9e5a511c49402a9d02b740a30876f51889d20e7d0ed4997755f542650b8485f013 +revision=3 +checksum[sha512]=428d5867009c49bdffe3e752c68da7aa17fac415a308dffe1a0863376325aed93945500afedc0dd14b06f1b1e86598c0445c63c3bc3be91aafe4de7a0aefcbdd format=raw -size=4294967296 -compressed_size=150734028 +size=6442450944 +compressed_size=200048080 expand=/dev/sda1 -notes=Debian 7 (Wheezy). +notes=Debian 7 (wheezy) - This is a default Debian install. - - The preseed and virt-install scripts that produced this image - can be found in the libguestfs source tree: - - builder/website/debian.preseed - builder/website/debian.sh - - This image is so very minimal that it only includes an ssh - server and no virtual consoles. To enable virtual consoles - use this virt-builder option: - - virt-builder debian-7 \ - --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,' + This is a minimal Debian install. + This image is so very minimal that it only includes an ssh server This image does not contain SSH host keys. To regenerate them use: - --firstboot-command "dpkg-reconfigure openssh-server" + --firstboot-command "dpkg-reconfigure openssh-server" + + This template was generated by a script in the libguestfs source tree: + builder/templates/make-template.ml + Associated files used to prepare this template can be found in the + same directory. [debian-8] -name=Debian 8 (Jessie) +name=Debian 8 (jessie) osinfo=debian8 arch=x86_64 file=debian-8.xz -checksum=67700928c435a7a3cd3b611a390ae3f3dfb1b4d882157b6617aa7ea5d693dff3eb4951e5968bdb6859b5f82aa6fe95cc636f053344867d34178ecd5acefe8e91 +revision=2 +checksum[sha512]=bd182ce61636166e4cb9c98d786f61e4b53069cc945036ff04ddec3f39f3b2218183bbe059e0e237ba782622cbbee6683018cc8f45fc47a1ed7464e754b87ed3 format=raw -size=4294967296 -compressed_size=229866456 +size=6442450944 +compressed_size=232182108 expand=/dev/sda1 -notes=Debian 8 (Jessie). +notes=Debian 8 (jessie) - This is a default Debian install. - - The preseed and virt-install scripts that produced this image - can be found in the libguestfs source tree: - - builder/website/debian.preseed - builder/website/debian.sh + This is a minimal Debian install. This image does not contain SSH host keys. To regenerate them use: - --firstboot-command "dpkg-reconfigure openssh-server" + --firstboot-command "dpkg-reconfigure openssh-server" - The serial console is not working in this image. To enable it, do: - - --edit '/etc/default/grub: - s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=ttyS0,115200n8"/' \ - --run-command update-grub + This template was generated by a script in the libguestfs source tree: + builder/templates/make-template.ml + Associated files used to prepare this template can be found in the + same directory. [debian-9] name=Debian 9 (stretch) osinfo=debian9 arch=x86_64 file=debian-9.xz -checksum[sha512]=8f556a0ef907ecce2de22c2c3b06e3c2512e7f7c3e9a61b6c377ea39c8ccedf9f371f491678037c8357334b915346f2b4de793be34859d92f710a9596bd71148 +revision=2 +checksum[sha512]=2e8bc3b34940157766b9ad628ddf8eb9a1b410798b921959fd57ae8a4e54fdfa74ac939fe214b8200f9d783be940f4b75b640dbf388e51ef5e74f0c96acd5529 format=raw size=6442450944 -compressed_size=203644432 +compressed_size=194181968 expand=/dev/sda1 notes=Debian 9 (stretch) This is a minimal Debian install. - This image is so very minimal that it only includes an ssh server - and no virtual consoles. To enable virtual consoles use this - virt-builder option: - - --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,' - This image does not contain SSH host keys. To regenerate them use: --firstboot-command "dpkg-reconfigure openssh-server" @@ -1247,17 +1229,17 @@ notes=Ubuntu 16.04 (Xenial). -----BEGIN PGP SIGNATURE----- -iQIcBAEBAgAGBQJZb7k9AAoJEJFzj3Pht2iggw8QAIRWE5G93R0MrOi6qkqQy7/i -Uh81xpSs914tKZAeKm1PjCEf7IoHKSu39TbFp7trtTg31RXYUuZftdRo1PZt272o -yIy9+9T5va1aszQVNpAU78Lox84j9Mtz1WeY/Oh1v95dxuLfl4sxRNy4t2tnHXIq -NqEQuWlivhyR6baPYykDdFqLAESQStSq0HWoBAKKL6Nzy2bwbT4ecfspNGNhVjPI -WpbzGUktSskgRZb5NHPX5UDlbB2CmVP7unQMYD8xqmGtPJA+EcXOUq3ZT62DJI/3 -zfWX8Wk6qVWKcFxeB4WiWwo8WhZ5By67AwC7Aa3/1L1asTkZczyfTH/+TSlAPQtF -MDoCWthAO4AAugnMU0byKl76T50Oz7ZjTsX2nSe+X3PNwi+GUVqXqAz0FrSO1ZAS -JWB6BrVaDkI7orrISXN/1/jyT7nf7JZfhixFBkEzVeh3maiDTzl3nB87logzcHXq -HobqYOr5Iw/R82ftcE1Ivlh9fQEEgfZ3PjCdJ90hnUA0a/gAXhrX1cYaoQs67P7f -7sd6bj9CMjftGo7Oc7n1552wKMhfdFQmwybEqLKKPUASJSax/E/VlYc1zteu3akM -MuIzNoQWiB+wL32CXezRy/z6e5QAcwgHA2FK8a9skywx2mkgHGBOT397wD3wcyK8 -46BcJUAvu28z0J1mlRSD -=smQG +iQIcBAEBAgAGBQJZpV+zAAoJEJFzj3Pht2igg5gP/RqdROZZyibDCWKwRfO5Zep8 +P4XailTHVIO7W9z+K+dSHDTFXqp9BRHIFMjTEf/9GrSyVErZA8H0WdhK8Yt1NBLX +6MlH/pq9bTD4xJi41h3UMVyUmPwowfTYn9eL1A4/1xtEfDf7QHLfImjaAnNKqaSu +D6xPuTdHG+5N8iEyVmoZYdiKaDpbvPE0zXtFqHPgYEuCcdYg5rZ4iyKrMEf410rj +5YaWAYcxdLJdCXO1IA75FDC1gkiAA06q1mnvrq+WRgPWhM4PxoDli02Wx9mgmM1G +jnpxDil6yeAa4p+LjIXpwwuyqjdmG/4Xja6+kpReLgPulq/2IU/VBYh0BAZCt4yI +LIIK/p5gwXajgxWNcYP3SvAnhlXtMSn4bPU9i/xBrfCKWktnb0mR34Qb/Odf61Yn +a14ALn6GhZpIs1dGgqVqtsjeKn37tTZnKPapukPKsmahAtG6r6v0iupsKsj7hHOJ ++hK6pF7dSkJMj9IQrmA8jwa5fxNJm3vDUw+9pyH4M9m2r+Dy1Zr/AZ6+mlJXcIzb +vpAswvhy19kqVU+8x9zJVG2uIkZNS5d2NuiaLv0947VnJumnUjLDnH8dL/M5OMCV +3nfwVvzkxnksSSIApfmlUT+NZF8ZUTwdZDNX+dXP2a8iMmcDx7ScRoJRdTHRYqWO +T6H89uaipYAm3BYESLk6 +=xJe7 -----END PGP SIGNATURE-----