updates

README.md

@@ -83,6 +83,28 @@ There are 3 ansible roles:
 
 3. toxcore : 
 
+In addition, toxcore calls an included role ansible-gentoo_install.
+This is an updated version of the abandonned
+https://github.com/agaffney/ansible-gentoo_install/ This role,
+when run on the host, builds the Gentoo base qcow image. As a safety
+feature, you must create the qcow2 image and activate it with:
+
+modprobe nbd
+qemu-img $BOX_NBD_BASE_QCOW 20G
+qemu-nbd -c $BOX_NBD_DEV $BOX_NBD_BASE_QCOW
+
+and put these values into the hosts.yml file in the pentoo or devuan
+target, depending on your host operating system. The filesytem that
+holds base qcow2 $BOX_NBD_BASE_QCOW must have at least 12G available,
+and may grow to almost 20G.
+
+After you have finished building the base qcow2 image, you will want
+to dismount it with qemu-nbd -d $BOX_NBD_DEV. Be careful and look
+in /proc/partitions to see if it is still there after you dismount it:
+it the partition is busy the dismount will fail silently, and you can
+get into trouble if partprobe complains. You may have to reboot,
+or it may resolve itself. Wierd.
+
 Each role has been conditionalized to run with different connections.
  
 ## Connection Types

roles/ansible-gentoo_install/README.md

@@ -1,4 +1,5 @@
 # Ansible role: Gentoo_install
+https://github.com/agaffney/ansible-gentoo_install/
 
 Performs an installation of Gentoo Linux against an InstallCD environment.
 

roles/ansible-gentoo_install/tasks/#local.yml#

@@ -1,182 +0,0 @@
-# -*- mode: yaml; indent-tabs-mode: nil; tab-width: 2; coding: utf-8-unix -*-
----
-- name: "DEBUG: ansible-gentoo_install local"
-  debug:
-    verbosity: 0
-    msg: "DEBUG: ansible-gentoo_install local BOX_NBD_DEV={{BOX_NBD_DEV}}"
-  check_mode: no
-
-- assert:
-    that:
-      -  "'{{BOX_NBD_DEV}}' != ''"
-  when: ansible_connection in ['local', 'chroot']
-
-- set_fact:
-    AGI_use_local_kernel: true
-  when:
-    - ansible_distribution == 'Gentoo' or BOX_GENTOO_FROM_MP not in ['/', '']
-
-- set_fact:
-    AGI_PROXY_MODE: "{{PROXY_MODE|default('')}}"
-  when:
-     - PROXY_MODE|default('') != '' 
-  check_mode: no
-
-- set_fact:
-    AGI_PROXY_MODE: "{{BOX_PROXY_MODE|default('')}}"
-  when:
-     - AGI_PROXY_MODE == ''
-  check_mode: no
-
-- block:
-   
-  - name: check for mounted disk
-    shell: |
-      grep '/dev/{{AGI_NBD_DEV}}' /proc/mounts && exit 0
-      ps ax | grep -v grep | \
-        grep "qemu-nbd.*/dev/nbd.*{{BOX_NBD_BASE_QCOW}}" && \
-        echo WARN looks like theres an active nbd mount of \
-        "${BOX_NBD_BASE_QCOW}" && exit 1
-      exit 2
-    failed_when: false
-    changed_when: false
-    register: check_mounted_disk
-    check_mode: no
- 
-  - name: partition if disk not mounted
-    fail:
-      msg: "looks like theres an active nbd mount of {{BOX_NBD_BASE_QCOW}}"
-    when:
-      - check_mounted_disk.rc == 1
-    check_mode: no
- 
-  - name: partition if disk not mounted or active
-    include: disk.yml
-    when:
-      - check_mounted_disk.rc > 1
-    check_mode: no
- 
-  - name: mount root partition
-    mount:
-      name: "{{AGI_NBD_MP}}"
-      src: "{{ AGI_install_disk }}p3"
-      fstype: ext4
-      state: mounted
-    check_mode: false
-  
-  - name: create /boot mountpoint
-    file:
-      path: "{{AGI_NBD_MP}}/boot"
-      state: directory
-    check_mode: false
-  
-  - name: mount boot partition
-    mount:
-      name: "{{AGI_NBD_MP}}/boot"
-      src: "{{ AGI_install_disk }}p1"
-      fstype: ext2
-      state: mounted
-    check_mode: false
-
-  - name: mount distfiles
-    delegate_to: localhost
-    shell: |
-      [ -d "{{MOUNT_GENTOO_DISTFILES_ARCHIVES}}" ] || exit 1
-      grep {{MOUNT_GENTOO_DISTFILES_ARCHIVES}} /proc/mounts && exit 0
-      [ -d {{AGI_NBD_MP}}/usr/portage/ ] || exit 0
-      [ -d {{AGI_NBD_MP}}/usr/portage/distfiles ] || mkdir {{AGI_NBD_MP}}/usr/portage/distfiles
-      mount --bind {{MOUNT_GENTOO_DISTFILES_ARCHIVES}} {{AGI_NBD_MP}}/usr/portage/distfiles
-    when:
-      - "MOUNT_GENTOO_DISTFILES_ARCHIVES != ''"
-      - "AGI_NBD_MP != ''"
-      - false # let the tester take care of this
-      
-  - include: tarball.yml
-  - include: copy.yml
-    when: AGI_use_local_kernel
-  - include: chroot.yml
-
-  delegate_to: localhost
-  when: ansible_connection in ['chroot', 'local'] # libvirt?
-
-- block:
-     
-  - name: check chroot wrapper installed
-    shell: |
-      [ -x /var/tmp/chroot_wrapper.sh ] || exit 1
-      df /mnt/gentoo || exit 2
-      /var/tmp/chroot_wrapper.sh df | grep /mnt/gentoo && exit 4
-      exit 0
-    register: chroot_out
-    check_mode: false
- 
-  - name: enable chroot wrapper
-    set_fact:
-      ansible_shell_executable: /var/tmp/chroot_wrapper.sh
-      old_ansible_python_interpreter: "{{ansible_python_interpreter}}"
-      ansible_python_interpreter: "/usr/bin/python3"
-    check_mode: false
-
-  when: ansible_connection in ['local']
- 
-- block:
-
-  - include: portage.yml
-  - include: misc.yml
-
-  - include: network.yml
-   
-  - include: kernel.yml
-    when: not AGI_use_local_kernel
-
-  - include: bootloader.yml
-  - include: daemons.yml
-
-  #   - include: finish.yml
-
-  check_mode: false
-  when:
-    - "ansible_connection in ['chroot'] or chroot_out.rc|default(1) == 0"
-  rescue:
-    - debug:
-        msg: "ERROR: "
-   
-- name: disable chroot wrapper
-  set_fact:
-    ansible_shell_executable: /bin/sh
-    ansible_python_interpreter: "{{old_ansible_python_interpreter}}"
-  when:
-    - "ansible_connection in ['local'] and chroot_out.rc|default(1) == 0"
-  check_mode: false
-
-- name: unmount filesystems
-  mount:
-    name: "{{AGI_NBD_MP}}/{{ item }}"
-    state: unmounted
-  with_items:
-    - proc
-    - sys
-    - dev/pts
-    - dev/shm
-    - dev
-    - boot
-    - ''
-  loop_control:
-    label: "{{AGI_NBD_MP}}/{{ item }}"
-  when:
-    - "ansible_connection in ['local'] and chroot_out.rc|default(1) == 0"
-    - false # leave it mounted for testing
-
-- name: dismount any other mounts
-  shell: |
-    if [ -z "{{MOUNT_GENTOO_DISTFILES_ARCHIVES}}" ] && \
-         [ -d "{{MOUNT_GENTOO_DISTFILES_ARCHIVES}}" ] && \
-         grep {{MOUNT_GENTOO_DISTFILES_ARCHIVES}} /proc/mounts ; then
-           umount  {{MOUNT_GENTOO_DISTFILES_ARCHIVES}}
-      fi
-    df -a | grep "{{AGI_NBD_MP}}" | sed -e 's/.* //' | tac | while read elt;do
-        umount $elt
-        done
-  when:
-    - "ansible_connection in ['chroot'] or chroot_out.rc|default(1) == 0"
-    - false # leave it mounted for testing

roles/ansible-gentoo_install/tasks/.#local.yml

@@ -1 +0,0 @@
-root@pentoo.152064:1703733868

roles/ansible-gentoo_install/tasks/disk.yml

@@ -13,7 +13,7 @@
     [ "{{ansible_distribution}}" == 'Gentoo' ] || \
       ( {{AGI_GENTOO_FROM_MP}} != '' && '{{AGI_GENTOO_FROM_MP}}' != '/' ) || \
       exit 4
-l    [ -d "{{AGI_GENTOO_FROM_MP}}" ] || exit 5
+    [ -d "{{AGI_GENTOO_FROM_MP}}" ] || exit 5
   check_mode: false
 
 - block:
@@ -29,6 +29,10 @@ l    [ -d "{{AGI_GENTOO_FROM_MP}}" ] || exit 5
       var: disklabel_out
   # you can get into a wierd state with /dev/nbd - partprobe reports
   # Error: Partition(s) 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64 on /dev/nbd3 have been written, but we have been unable to inform the kernel of the change, probably because it/they are in use.  As a result, the old partition(s) will remain in use.  You should reboot now before making further changes.
+  # and the same thing on all of the rest of your disks! All untrue
+  # but the qemu -d /dev/nbd1 command will fail silently if busy
+    when: disklabel_out.rc != 0
+
   - name: This is fatal - you must reboot
     fail:
       msg: "This is fatal - you must reboot. {{disklabel_out.stderr}}"
@@ -74,9 +78,12 @@ l    [ -d "{{AGI_GENTOO_FROM_MP}}" ] || exit 5
     filesystem: dev={{ AGI_install_disk }}p3 fstype=ext4 force=yes
     check_mode: false
     when: not ansible_check_mode
+
   when: false
 
 - block:
+
+  - name: create disk partitions
     shell: |
       sfdisk {{ AGI_install_disk }} << EOF
       label: dos
@@ -91,6 +98,7 @@ l    [ -d "{{AGI_GENTOO_FROM_MP}}" ] || exit 5
       EOF
       mke2fs {{ AGI_install_disk }}p1
       mke2fs {{ AGI_install_disk }}p3
+
   when: true
 
 - name: label partitions

src/ansible_gentooimgr.bash

@@ -0,0 +1,2 @@
+#!/bin/sh
+