proxy_ping_test

roles/ansible-gentoo_install/tasks/bootloader.yml

@@ -42,8 +42,8 @@
       label pentoo2019-Pen19-6.1.52-pentoo_2023_09_30_0x037f
         menu label pentoo2019_Pen19_6.1.52-pentoo_2023_09_30_0x037f
         menu default
-        kernel vmlinuz-6.1.52-pentoo_2023_09_30
-        INITRD initramfs-pentoo-x86_64-6.1.52-pentoo_2023_09_30.img
+        kernel /vmlinuz-6.1.52-pentoo_2023_09_30
+        INITRD /initramfs-pentoo-x86_64-6.1.52-pentoo_2023_09_30.img
         # was vga=0x315 
         APPEND root=LABEL=root {{''.join(AGI_install_syslinux_kernel_commands)}}
       
@@ -106,7 +106,39 @@
           -i /etc/default/grub
       grub-script-check  /etc/default/grub
 
-  when: AGI_install_bootloader == 'grub:2'
+  - name: roles/ansible-gentoo_install/tasks/
+    shell: |
+      LINE="rd.skipfsck=1  ipv6.disable=1 console=ttys0 lang=en keymap=us "
+      # LINE="$LINE pti=on doscsi iommu=pt  amd_iommu=on debugfs=off efi=disable_early_pci_dma extra_latent_entropy init_on_free=1 kvm.nx_huge_pages=force l1tf=full,force mce=0 mds=full,nosmt nosmt=force page_alloc.shuffle=1 pti=on random.trust_cpu=off slab_nomerge slub_debug=FZ spec_store_bypass_disable=on spectre_v2=on tsx_async_abort=full,nosmt vsyscall=none "
+      LINE="$LINE intel_iommu=on vga=0x315 text
+      df | grep /boot || mount /dev/vda1 /boot
+      [ -d /boot/grub ] || exit 2
+      [ -f /boot/grub/grub.cfg ] || exit 3
+      cd /
+      # boot/initramfs-pentoo-x86_64-6.1.52-pentoo_2023_09_30.img
+
+  - name: /etc/default/grub
+    lineinfile:
+      dest: /etc/default/grub
+      line: '{{item.from}}="{{item.to}}"'
+      regexp: '^#*{{item.from}}=.*'
+    with_items:
+      # Append parameters to the linux kernel command line for non-recovery entries
+      - from: GRUB_CMDLINE_LINUX_DEFAULT
+        to: " rd.skipfsck=1 ipv6.disable=1 console=ttyS0 lang=en keymap=us intel_iommu=on vga=0x315 text"
+      # The resolution used on graphical terminal.
+    # Note that you can use only modes which your graphic card supports via VBE.
+    # You can see them in real GRUB with the command `vbeinfo'.
+      - from: GRUB_GFXMODE
+        to: 640x480
+      # Set to 'text' to force the Linux kernel to boot in normal text
+      - from: GRUB_GFXPAYLOAD_LINUX
+        to: text
+      # Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
+      - from: GRUB_DISABLE_LINUX_UUID
+        to: true
+
+    when: AGI_install_bootloader == 'grub:2'
   
 - name: fstab root
   lineinfile:
@@ -151,54 +183,36 @@
     dest: /etc/conf.d/consolefont
     line: 'consolefont="ter-v{{AGI_consolefont_font_size}}b"'
     regexp: '^consolefont=.*'
-
-- name: /etc/default/grub
-  lineinfile:
-    dest: /etc/default/grub
-    line: '{{item.from}}="{{item.to}}"'
-    regexp: '^#*{{item.from}}=.*'
-  with_items:
-    # Append parameters to the linux kernel command line for non-recovery entries
-    - from: GRUB_CMDLINE_LINUX_DEFAULT
-      to: " rd.skipfsck=1 ipv6.disable=1 console=tty1 lang=en keymap=us intel_iommu=on vga=0x315 text"
-    # The resolution used on graphical terminal.
-  # Note that you can use only modes which your graphic card supports via VBE.
-  # You can see them in real GRUB with the command `vbeinfo'.
-    - from: GRUB_GFXMODE
-      to: 640x480
-    # Set to 'text' to force the Linux kernel to boot in normal text
-    - from: GRUB_GFXPAYLOAD_LINUX
-      to: text
-    # Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
-    - from: GRUB_DISABLE_LINUX_UUID
-      to: true
-
-- name: roles/ansible-gentoo_install/tasks/
-  shell: |
-    LINE="rd.skipfsck=1  ipv6.disable=1 console=tty1 lang=en keymap=us "
-    # LINE="$LINE pti=on doscsi iommu=pt  amd_iommu=on debugfs=off efi=disable_early_pci_dma extra_latent_entropy init_on_free=1 kvm.nx_huge_pages=force l1tf=full,force mce=0 mds=full,nosmt nosmt=force page_alloc.shuffle=1 pti=on random.trust_cpu=off slab_nomerge slub_debug=FZ spec_store_bypass_disable=on spectre_v2=on tsx_async_abort=full,nosmt vsyscall=none "
-    LINE="$LINE intel_iommu=on vga=0x315 text
-    df | grep /boot || mount /dev/vda1 /boot
-    [ -d /boot/grub ] || exit 2
-    [ -f /boot/grub/grub.cfg ] || exit 3
-    cd /
-#    ln -s boot/vmlinuz* vmlinuz
-    # boot/initramfs-pentoo-x86_64-6.1.52-pentoo_2023_09_30.img
-    ln -s boot/initramfs* initrd.img
-
+ 
 - name: consolefont
   shell: |
-    cat >> /etc/rc.local << EOF
+    grep -q /etc/init.d/consolefont /etc/rc.local || \
+      cat >> /etc/rc.local << EOF
+    #!/bin/sh
     /etc/init.d consolefont stop
     /etc/init.d consolefont start
-    stty -F /dev/tty1 cols 80 rows 24
+    # these are right for ter-v28b consolefont
+    if tty|grep -q /dev/ttyS0 ; then   
+        stty cols 80 rows 35 
+    elif tty|grep -q /dev/tty[1-6] ; then
+        stty cols 80 rows 22
+    fi 
     EOF
-    bash /etc/rc.local
+    chmod 755 /etc/rc.local
   ignore_errors: true
 
 - name: rc-update add bootlogd boot
   shell: |
+    [ -d /etc/modules-load.d ] || mkdir /etc/modules-load.d
+    [ -f /etc/modules-load.d/virtio.conf ] || \
+        echo "{{'\n'.join(AGI_bootstrap_modules)}}" \
+        > /etc/modules-load.d/virtio.conf
     rc-update add consolefont
     rc-update | grep -q 'bootlogd .* boot' || \
       rc-update add bootlogd boot
+    grep -q '^s0:' /etc/inittab || \
+        sed -e 's/^#s0:/s0:/' /etc/inittab
+
+
     exit 0
+

roles/ansible-gentoo_install/tasks/chroot.yml

@@ -18,9 +18,11 @@
 
 - name: copy resolv.conf into chroot
   copy:
-    src: /etc/resolv.conf
-    dest: "{{AGI_NBD_MP}}/etc/resolv.conf"
+    src: "/{{item}}"
+    dest: "{{AGI_NBD_MP}}/{{item}}"
+    mode: '0644'
     remote_src: yes
+  with_items: "{{AGI_bootstrap_files}}"
   when: not ansible_check_mode
 
 - name: mount /proc in chroot

roles/ansible-gentoo_install/tasks/libvirt.yml

@@ -0,0 +1,23 @@
+# -*- mode: yaml; indent-tabs-mode: nil; tab-width: 2; coding: utf-8-unix -*-
+# localhost
+---
+- name: "DEBUG: ansible-gentoo_install libvirt"
+  debug:
+    verbosity: 1
+    msg: "DEBUG: ansible-gentoo_install libvirt"
+
+- name: test we are NOT in the chroot
+  shell: |
+    [ -n "{{AGI_NBD_MP}}" ] || exit 2
+    [ -d "{{AGI_NBD_MP}}" ] || exit 3
+  check_mode: false
+
+# - name: setup libvirt network
+# - name: setup libvirt iptables
+# net.ipv4.conf.virbr1.forwarding = 1
+# net.ipv4.ip_forward = 1
+# mkdir /etc/libvirt/qemu
+# qemu-ga -D > /etc/libvirt/qemu/qemu-ga.conf
+#    for elt in  unix-listen virtio-serial isa-serial vsock-listen ; do
+# /etc/conf.d/qemu-ga
+

roles/ansible-gentoo_install/tasks/local.yml

@@ -85,6 +85,7 @@
       state: mounted
     check_mode: false
 
+  - include: libvirt.yml
   - include: tarball.yml
   - include: copy.yml
     when: AGI_use_local_kernel

roles/ansible-gentoo_install/tasks/main.yml

@@ -131,13 +131,10 @@
       var: ansible_gentooimgr_out
 
   check_mode: false
-  when:
-    - ansible_connection in ['chroot', 'local', 'libvirt_qemu']
-    - ansible_distribution == 'Gentoo' or BOX_GENTOO_FROM_MP not in ['/', '']
-#    - nbd_disk|default('') == AGI_NBD_DISK
 
-- name: include_tasks local.yml
-  include_tasks: local.yml
+  - name: include_tasks local.yml
+    include_tasks: local.yml
+
   when:
     - ansible_connection in ['chroot', 'local']
     - ansible_distribution == 'Gentoo' or BOX_GENTOO_FROM_MP not in ['/', '']

roles/ansible-gentoo_install/tasks/misc.yml

@@ -15,6 +15,10 @@
     for elt in {{ AGI_bootstrap_mountpoints|join(' ') }} ; do
         [ -d $elt ] || mkdir $elt
       done
+    # 700 files from ansible umask
+    find /usr/local/*bin/ /usr/local/etc/ -name '*sh' -exec chmod 755 {} \;
+    find /usr/local/ -type f -exec chown ${BOX_USER_NAME}:${BOX_USER_GROUP} {} \;
+
     exit 0
   when: AGI_bootstrap_mountpoints|default([])|length > 0
 
@@ -32,7 +36,7 @@
     dest: /etc/localtime
     src: /usr/share/zoneinfo/{{ AGI_install_timezone }}
     state: link
-    force: yes
+    force: no
 
 - name: configure locales
   lineinfile: