Libguestfs - Aug 2017 - [PATCH 2/2] builder/templates: remove Debian 6 (Squeeze)

Also unify .index-fragment files
---
 builder/templates/debian-7.index-fragment |  7 -------
 builder/templates/debian-8.index-fragment |  7 -------
 builder/templates/debian-9.index-fragment | 18 ++++++------------
 builder/templates/debian.preseed          |  1 +
 builder/templates/make-template.ml        |  6 ------
 5 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/builder/templates/debian-7.index-fragment
b/builder/templates/debian-7.index-fragment
index 7d868e63c..37e72f7f5 100644
--- a/builder/templates/debian-7.index-fragment
+++ b/builder/templates/debian-7.index-fragment
@@ -19,13 +19,6 @@ notes=Debian 7 (Wheezy).
  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 image does not contain SSH host keys.  To regenerate them use:
  
  --firstboot-command "dpkg-reconfigure openssh-server"
diff --git a/builder/templates/debian-8.index-fragment
b/builder/templates/debian-8.index-fragment
index d8387c327..68017fbd0 100644
--- a/builder/templates/debian-8.index-fragment
+++ b/builder/templates/debian-8.index-fragment
@@ -21,10 +21,3 @@ notes=Debian 8 (Jessie).
  This image does not contain SSH host keys.  To regenerate them use:
  
  --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
-
diff --git a/builder/templates/debian-9.index-fragment
b/builder/templates/debian-9.index-fragment
index 293f9117f..5eb7146bc 100644
--- a/builder/templates/debian-9.index-fragment
+++ b/builder/templates/debian-9.index-fragment
@@ -10,20 +10,14 @@ compressed_size=203644432
 expand=/dev/sda1
 notes=Debian 9 (stretch)
  
- This is a minimal Debian install.
+ This is a default 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:
+ The preseed and virt-install scripts that produced this image
+ can be found in the libguestfs source tree:
  
-     --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,'
+ builder/website/debian.preseed
+ builder/website/debian.sh
  
  This image does not contain SSH host keys.  To regenerate them use:
  
-     --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.
-
+ --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 ();
-- 
2.14.1

it's not on the mirrors anymore, so not installable anymore.
---
 builder/templates/debian-6.index-fragment | 32 -------------------------------
 builder/templates/make-template.ml        |  1 -
 2 files changed, 33 deletions(-)
 delete mode 100644 builder/templates/debian-6.index-fragment

diff --git a/builder/templates/debian-6.index-fragment
b/builder/templates/debian-6.index-fragment
deleted file mode 100644
index 3b0c78da9..000000000
--- a/builder/templates/debian-6.index-fragment
+++ /dev/null
@@ -1,32 +0,0 @@
-[debian-6]
-name=Debian 6 (Squeeze)
-osinfo=debian6
-arch=x86_64
-file=debian-6.xz
-revision=2
-checksum=bff9c28da0375fde65fa238d7a2ea644cbfad0ea3246783a2f44a98f2374850987679c3f1032a632d3c6238de8d9e43291d07a82efc1e824945000e206b9f6cc
-format=raw
-size=4294967296
-compressed_size=139615908
-expand=/dev/sda1
-notes=Debian 6 (Squeeze).
- 
- 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-6 \
-     --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/make-template.ml
b/builder/templates/make-template.ml
index 42ff48eb9..24c6d5582 100755
--- a/builder/templates/make-template.ml
+++ b/builder/templates/make-template.ml
@@ -328,7 +328,6 @@ and os_of_string os ver    match os, ver with
   | "centos", ver -> let maj, min = parse_major_minor ver in
CentOS (maj, min)
   | "rhel", ver -> let maj, min = parse_major_minor ver in RHEL
(maj, min)
-  | "debian", "6" -> Debian (6, "squeeze")
   | "debian", "7" -> Debian (7, "wheezy")
   | "debian", "8" -> Debian (8, "jessie")
   | "debian", "9" -> Debian (9, "stretch")
-- 
2.14.1

Hi,
On Sun, Aug 27, 2017 at 01:21:39AM +0200, Florian Klink
wrote:
> it's not on the mirrors anymore, so not installable anymore.
It's certainly still on

      http://cdimage.debian.org/mirror/cdimage/archive/
      
but there will be issues due to outdated signatures and such so it's
better to remove it.
Cheers,
 -- Guido
> ---
>  builder/templates/debian-6.index-fragment | 32
-------------------------------
>  builder/templates/make-template.ml        |  1 -
>  2 files changed, 33 deletions(-)
>  delete mode 100644 builder/templates/debian-6.index-fragment
> 
> diff --git a/builder/templates/debian-6.index-fragment
b/builder/templates/debian-6.index-fragment
> deleted file mode 100644
> index 3b0c78da9..000000000
> --- a/builder/templates/debian-6.index-fragment
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -[debian-6]
> -name=Debian 6 (Squeeze)
> -osinfo=debian6
> -arch=x86_64
> -file=debian-6.xz
> -revision=2
>
-checksum=bff9c28da0375fde65fa238d7a2ea644cbfad0ea3246783a2f44a98f2374850987679c3f1032a632d3c6238de8d9e43291d07a82efc1e824945000e206b9f6cc
> -format=raw
> -size=4294967296
> -compressed_size=139615908
> -expand=/dev/sda1
> -notes=Debian 6 (Squeeze).
> - 
> - 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-6 \
> -     --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/make-template.ml
b/builder/templates/make-template.ml
> index 42ff48eb9..24c6d5582 100755
> --- a/builder/templates/make-template.ml
> +++ b/builder/templates/make-template.ml
> @@ -328,7 +328,6 @@ and os_of_string os ver >    match os, ver with
>    | "centos", ver -> let maj, min = parse_major_minor ver in
CentOS (maj, min)
>    | "rhel", ver -> let maj, min = parse_major_minor ver in
RHEL (maj, min)
> -  | "debian", "6" -> Debian (6,
"squeeze")
>    | "debian", "7" -> Debian (7, "wheezy")
>    | "debian", "8" -> Debian (8, "jessie")
>    | "debian", "9" -> Debian (9,
"stretch")
> -- 
> 2.14.1
> 
> _______________________________________________
> Libguestfs mailing list
> Libguestfs@redhat.com
> https://www.redhat.com/mailman/listinfo/libguestfs
>

On Sun, Aug 27, 2017 at 01:21:39AM +0200, Florian Klink
wrote:
> it's not on the mirrors anymore, so not installable anymore.
I do prefer to keep these old distros, as they are useful for virt-v2v
testing and various other forms of regression testing.  Should we
instead modify the URLs in sources.list so they default to the archive
that Guido mentioned?

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top

On Sunday, 27 August 2017 01:21:38 CEST Florian Klink
wrote:
> Also unify .index-fragment files
> ---
>  builder/templates/debian-7.index-fragment |  7 -------
>  builder/templates/debian-8.index-fragment |  7 -------
>  builder/templates/debian-9.index-fragment | 18 ++++++------------
Note that changes to the fragment files will be lost with the next
update of the images.  In particular ...
> diff --git a/builder/templates/debian-9.index-fragment
b/builder/templates/debian-9.index-fragment
> index 293f9117f..5eb7146bc 100644
> --- a/builder/templates/debian-9.index-fragment
> +++ b/builder/templates/debian-9.index-fragment
> @@ -10,20 +10,14 @@ compressed_size=203644432
>  expand=/dev/sda1
>  notes=Debian 9 (stretch)
>   
> - This is a minimal Debian install.
> + This is a default 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:
> + The preseed and virt-install scripts that produced this image
> + can be found in the libguestfs source tree:
>   
> -     --edit '/etc/inittab:
s,^#([1-9].*respawn.*/sbin/getty.*),$1,'
> + builder/website/debian.preseed
> + builder/website/debian.sh
>   
>   This image does not contain SSH host keys.  To regenerate them use:
>   
> -     --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.
> -
> + --firstboot-command "dpkg-reconfigure openssh-server"
... these changes will be reverted back by updating this template.

-- 
Pino Toscano

On Sun, Aug 27, 2017 at 01:21:38AM +0200, Florian Klink
wrote:
> Also unify .index-fragment files
> ---
>  builder/templates/debian-7.index-fragment |  7 -------
>  builder/templates/debian-8.index-fragment |  7 -------
>  builder/templates/debian-9.index-fragment | 18 ++++++------------
>  builder/templates/debian.preseed          |  1 +
>  builder/templates/make-template.ml        |  6 ------
>  5 files changed, 7 insertions(+), 32 deletions(-)
I pushed this, but with the proviso that editing the index-fragment
files doesn't make sense because they are regenerated as soon as I ran
the script to rebuild the Debian images (for RHBZ#1484957).

The new images have a single partition and working serial console, but
I didn't test them very much beyond that.

Thanks,

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/