kameleon-builder 2.1.3 → 2.2.0

data/templates/{ubuntu-12.04-desktop.yaml → qemu/ubuntu-12.04-desktop-amd64.yaml}

@@ -2,16 +2,16 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Ubuntu 12.04 LTS (Precise Pangolin) Desktop edition.
+# DESCRIPTION: Ubuntu 12.04 LTS (Precise Pangolin) Desktop edition (amd64).
 #
 #==============================================================================
 
 ---
-extend: ubuntu-12.04
+extend: ubuntu-12.04-amd64
 
 global:
   # Apt options
-  apt_install_recommends: true
+  virtualbox_memory_size: 1024
 
 bootstrap:
   - @base

data/templates/{ubuntu-14.04.yaml → qemu/ubuntu-14.04-amd64.yaml}

@@ -2,12 +2,12 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Ubuntu 14.04 LTS (Trusty Tahr) base system.
+# DESCRIPTION: Ubuntu 14.04 LTS (Trusty Tahr) base system (amd64).
 #
 #==============================================================================
 
 ---
-extend: ubuntu-12.04
+extend: ubuntu-12.04-amd64
 
 global:
   # Distribution

data/templates/{ubuntu-14.04-desktop.yaml → qemu/ubuntu-14.04-desktop-amd64.yaml}

@@ -2,12 +2,12 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: Ubuntu 14.04 LTS (Trusty Tahr) Desktop edition.
+# DESCRIPTION: Ubuntu 14.04 LTS (Trusty Tahr) Desktop edition (amd64).
 #
 #==============================================================================
 
 ---
-extend: ubuntu-14.04
+extend: ubuntu-14.04-amd64
 
 global:
   # Distribution

data/templates/steps/aliases/defaults.yaml

@@ -36,7 +36,7 @@ append_in:
 append_out:
   - exec_out: |
       mkdir -p $(dirname @1);
-      cat >@1 <<EOF
+      cat >>@1 <<EOF
       @2
       EOF
 
@@ -78,22 +78,19 @@ in2out:
       - exec_out: cat > @2
 
 check_cmd_out:
-  - on_bootstrap_init:
-    - rescue:
-      - exec_out: command -V @1 2> /dev/null
-      - breakpoint: "@1 is missing from out_context"
+  - rescue:
+    - exec_out: command -V @1 2> /dev/null
+    - breakpoint: "@1 is missing from out_context"
 
 check_cmd_local:
-  - on_bootstrap_init:
-    - rescue:
-      - exec_local: command -V @1 2> /dev/null
-      - breakpoint: "@1 is missing from local_context"
+  - rescue:
+    - exec_local: command -V @1 2> /dev/null
+    - breakpoint: "@1 is missing from local_context"
 
 check_cmd_in:
-  - on_bootstrap_init:
-    - rescue:
-      - exec_in: command -V @1 2> /dev/null
-      - breakpoint: "@1 is missing from in_context"
+  - rescue:
+    - exec_in: command -V @1 2> /dev/null
+    - breakpoint: "@1 is missing from in_context"
 
 umount_out:
   - exec_out: |
@@ -106,3 +103,12 @@ umount_local:
 umount_in:
   - exec_in: |
       echo "try umount @1..." ; mountpoint -q "@1" && umount -f -l "@1" || true
+
+download_file_in:
+  - exec_in: __download "@1" "@2"
+
+download_file_out:
+  - exec_out: __download "@1" "@2"
+
+download_file_local:
+  - exec_local: __download "@1" "@2"

data/templates/steps/bootstrap/archlinux/arch_bootstrap.yaml

@@ -8,11 +8,9 @@
 
 - pkg_group: base
 
-- enable_cache: true
-
 - import_script:
   - exec_out: |
-      cat > $$kameleon_cwd/arch-bootstrap.sh <<'EOF'
+      cat > $KAMELEON_WORKDIR/arch-bootstrap.sh <<'EOF'
       #!/bin/bash
       #
       # arch-bootstrap: Bootstrap a base Arch Linux system using any GNU distribution.
@@ -39,11 +37,11 @@
       PACMAN_PACKAGES=(
         acl archlinux-keyring attr bzip2 curl expat glibc gpgme libarchive
         libassuan libgpg-error libssh2 lzo2 openssl pacman pacman-mirrorlist xz
-        zlib krb5 e2fsprogs keyutils openssh
+        zlib krb5 e2fsprogs keyutils
       )
       BASIC_PACKAGES=(${PACMAN_PACKAGES[*]} filesystem)
       EXTRA_PACKAGES=(
-        $$pkg_group haveged syslinux
+        $$pkg_group haveged
       )
       DEFAULT_REPO_URL="http://mirrors.kernel.org/archlinux"
       DEFAULT_ARCH=`uname -m`
@@ -180,35 +178,29 @@
       EOF
 
 - call_arch_boostrap:
-  - exec_out: |
-        if [ $$enable_cache = true ]; then
-            [[ ! -f "$$rootfs_download_path/.kameleon_timestamp"  ]] || CACHE_AVAILABLE=1
-        fi
-        [[ -n $CACHE_AVAILABLE  ]] || \
-          bash $$kameleon_cwd/arch-bootstrap.sh -a $$arch -r $$mirror $$rootfs_download_path \
-            && date +%s > $$rootfs_download_path/.kameleon_timestamp
+  - exec_out: bash $KAMELEON_WORKDIR/arch-bootstrap.sh -a $$arch -r $$mirror $$rootfs
   - on_clean:
-    - umount_out: $$rootfs_download_path/proc
-    - umount_out: $$rootfs_download_path/dev
+    - umount_out: $$rootfs/proc
+    - umount_out: $$rootfs/dev
 
 - enable_sshd_service:
   - exec_out: |
-      chroot $$rootfs_download_path \
+      chroot $$rootfs \
         ln -sf \
           '/usr/lib/systemd/system/sshd.service' \
           '/etc/systemd/system/multi-user.target.wants/sshd.service'
 
 - enable_dhcp_service:
   - exec_out: |
-      chroot $$rootfs_download_path \
+      chroot $$rootfs \
         ln -sf \
           '/usr/lib/systemd/system/dhcpcd.service' \
           '/etc/systemd/system/multi-user.target.wants/dhcpcd.service'
 
 - add_nobody_user:  ## To allow sshd to run correctly
-  - exec_out: echo "nobody:x:99:99:nobody:/:/bin/false" >> $$rootfs_download_path/etc/passwd
-  - exec_out: echo "nobody:x:99:" >> $$rootfs_download_path/etc/group
-  - exec_out: echo "nobody:x:14871::::::" >> $$rootfs_download_path/etc/shadow
+  - exec_out: echo "nobody:x:99:99:nobody:/:/bin/false" >> $$rootfs/etc/passwd
+  - exec_out: echo "nobody:x:99:" >> $$rootfs/etc/group
+  - exec_out: echo "nobody:x:14871::::::" >> $$rootfs/etc/shadow
 
 - configure_pacman:
   - on_setup_init:

data/templates/steps/bootstrap/debian/debootstrap.yaml

@@ -1,19 +1,18 @@
 # # Bootstrap
-- enable_cache: true
-
 - debootstrap:
   - check_cmd_out: debootstrap
-  - exec_out: mkdir -p $$rootfs_download_path
+  - exec_out: mkdir -p $$rootfs
   - exec_out: |
-        if [ $$enable_cache = true ]; then
-            [[ ! -f "$$rootfs_download_path/.kameleon_timestamp"  ]] || CACHE_AVAILABLE=1
-        fi
-        [[ -n $CACHE_AVAILABLE  ]] || \
-          debootstrap --no-check-gpg --arch=$$arch --include="$$include_pkg" $$release $$rootfs_download_path $$repository \
-          && date +%s > $$rootfs_download_path/.kameleon_timestamp
-  - exec_out: cat /etc/resolv.conf > $$rootfs_download_path/etc/resolv.conf
+      debootstrap \
+      --variant=$$variant \
+      --no-check-gpg \
+      --arch=$$arch \
+      --include="$$include_pkg" \
+      $$release \
+      $$rootfs \
+      $$repository
   - write_out:
-    - $$rootfs_download_path/etc/network/interfaces
+    - $$rootfs/etc/network/interfaces
     - |
       auto lo
       iface lo inet loopback

data/templates/steps/bootstrap/debian/debootstrap_arm.yaml

@@ -4,26 +4,18 @@
 - debootstrap:
   - check_cmd_out: debootstrap
   - check_cmd_out: qemu-arm-static
-  - exec_out: |
-        if [ $$enable_cache = true ]; then
-            [[ ! -f "$$rootfs_download_path/.kameleon_timestamp"  ]] || CACHE_AVAILABLE=1
-        fi
-        if [ -n $CACHE_AVAILABLE  ]; then
-          mkdir -p $$rootfs_download_path
-          debootstrap --no-check-gpg --foreign --variant=minbase --arch=$$arch --include="$$include_pkg" $$release $$rootfs_download_path $$repository
-          QEMU_USER_PATH=$(which qemu-arm-static)
-          cp $QEMU_USER_PATH $$rootfs_download_path/usr/bin/qemu-arm-static
-          chroot $$rootfs_download_path /usr/bin/qemu-arm-static -cpu cortex-a9 /bin/sh /debootstrap/debootstrap --second-stage
-          echo "deb $$repository wheezy main contrib non-free" > $$rootfs_download_path/etc/apt/sources.list
-          chroot $$rootfs_download_path /usr/bin/qemu-arm-static -cpu cortex-a9 /bin/sh apt-get update
-          chroot $$rootfs_download_path /usr/bin/qemu-arm-static -cpu cortex-a9 /bin/sh apt-get install -y --force-yes vim
-          date +%s > $$rootfs_download_path/.kameleon_timestamp
-        fi
-  - exec_out: false
-  - exec_out: date +%s > $$rootfs_download_path/.kameleon_timestamp
-  - exec_out: cat /etc/resolv.conf > $$rootfs_download_path/etc/resolv.conf
+  - exec_out:|
+        mkdir -p $$rootfs
+        debootstrap --no-check-gpg --foreign --variant=minbase --arch=$$arch --include="$$include_pkg" $$release $$rootfs $$repository
+        QEMU_USER_PATH=$(which qemu-arm-static)
+        cp $QEMU_USER_PATH $$rootfs/usr/bin/qemu-arm-static
+        chroot $$rootfs /usr/bin/qemu-arm-static -cpu cortex-a9 /bin/sh /debootstrap/debootstrap --second-stage
+        echo "deb $$repository wheezy main contrib non-free" > $$rootfs/etc/apt/sources.list
+        chroot $$rootfs /usr/bin/qemu-arm-static -cpu cortex-a9 /bin/sh apt-get update
+        chroot $$rootfs /usr/bin/qemu-arm-static -cpu cortex-a9 /bin/sh apt-get install -y --force-yes vim
+  - exec_out: cat /etc/resolv.conf > $$rootfs/etc/resolv.conf
   - write_out:
-    - $$rootfs_download_path/etc/network/interfaces
+    - $$rootfs/etc/network/interfaces
     - |
       auto lo
       iface lo inet loopback

data/templates/steps/bootstrap/fedora/init_pxeboot.yaml

@@ -0,0 +1,13 @@
+- download_pxeboot_initrd:
+  - download_file_out:
+    - $$pxe_initrd_url
+    - $$rootfs/boot/initrd.img
+  - on_setup_init:
+    - exec_in: rm -f /boot/initrd.img
+
+- download_pxeboot_vmlinuz:
+  - download_file_out:
+    - $$pxe_vmlinuz_url
+    - $$rootfs/boot/vmlinuz
+  - on_setup_init:
+    - exec_in: rm -f /boot/vmlinuz

data/templates/steps/bootstrap/fedora/yum_bootstrap.yaml

@@ -0,0 +1,45 @@
+- fix_yum:
+  - check_cmd_out: yum
+  - exec_out: sed -i "s/opts.ssl_verify_host/2/g" /usr/lib/pymodules/python2.7/urlgrabber/grabber.py
+
+- init_rpm_db:
+  - check_cmd_out: rpm
+  - exec_out: mkdir -p $$rootfs/var/lib/rpm
+  - exec_out: rpm --root $$rootfs --initdb
+
+- fetch_release_package:
+  - check_cmd_out: lynx
+  - exec_out: RELEASE_PACKAGE_URL=$(lynx $$mirror_packages_url -dump -listonly -nonumbers | grep $${distrib}-release | head -1)
+  - exec_out: |
+      if [ -z "${RELEASE_PACKAGE_URL-unset}" ]; then
+          fail "$${distrib}-release package not found!"
+      fi
+
+- install_distrib_release:
+  - download_file_out:
+    - $RELEASE_PACKAGE_URL
+    - $KAMELEON_WORKDIR/$${distrib}-release.rpm
+  - exec_out: rpm --root $$rootfs -ivh --force-debian --nodeps $KAMELEON_WORKDIR/$${distrib}-release.rpm
+
+- install_yum:
+  - exec_out: ln -sf $$rootfs/etc/pki/ /etc/pki
+  - exec_out: yum --installroot $$rootfs -y install yum
+  - exec_out: echo $${release} > $$rootfs/etc/yum/vars/releasever
+
+- mount_chroot:
+  - exec_out: mount -o bind /dev  $$rootfs/dev
+  - exec_out: mount -o bind /dev/pts $$rootfs/dev/pts
+  - exec_out: mount -t proc /proc  $$rootfs/proc
+  - exec_out: mount -t sysfs /sys  $$rootfs/sys
+  - exec_out: cp /etc/resolv.conf $$rootfs/etc/resolv.conf
+
+- install_packages:
+  - exec_out: chroot $$rootfs yum install --releasever=$$release -y $$include_pkgs
+
+- umount_chroot:
+  - on_clean:
+    - umount_out: $$rootfs/sys
+    - umount_out: $$rootfs/proc
+    - umount_out: $$rootfs/dev/pts
+    - umount_out: $$rootfs/dev
+    - exec_out: rm -f $$rootfs/etc/resolv.conf

data/templates/steps/bootstrap/initialize_disk.yaml

@@ -0,0 +1,16 @@
+# Initialize disk
+
+- partition_disk:
+  - check_cmd_out: parted
+  - exec_out: |
+      echo "Partitioning disk..."
+      parted -s $${disk_device} mklabel msdos
+      parted -s -a none $${disk_device} mkpart primary 64s 100%
+      parted -s $${disk_device} set 1 boot on
+  - exec_out: |
+      echo Creating root partition...
+      mkfs.$$filesystem_type -q $${disk_device}1 || fail cannot create / ext4
+
+- mount_mountdir:
+  - exec_out: mkdir -p $$rootfs
+  - exec_out:  "echo Mounting root partition... ;  mount $${disk_device}1 $$rootfs || fail cannot mount /"

data/templates/steps/bootstrap/initialize_disk_chroot.yaml

@@ -35,7 +35,7 @@
   # this miscrostep must be done again ensure that the nbd device is
   # detached
   - on_checkpoint: redo
-  - on_export_clean:
+  - on_setup_clean:
     - exec_out: echo "sync" ; sync
     - exec_out: qemu-nbd -d $$nbd_device
     - exec_out: "pgrep qemu-nbd | xargs -I {} kill -9 {} || true"
@@ -55,7 +55,7 @@
   - on_checkpoint: redo
   - exec_out: mkdir -p $$rootfs
   - exec_out:  "echo Mounting root partition... ;  mount $${nbd_device}p1 $$rootfs || fail cannot mount /"
-  - on_export_clean:
+  - on_setup_clean:
     - exec_out: "echo try umount $$rootfs... ; mountpoint -q $$rootfs && umount -f -l $$rootfs || true"
 
 - copy_rootfs:
@@ -67,18 +67,14 @@
         --exclude '/dev/*' \
         --exclude '/proc/*' \
         --exclude '/sys/*' \
-        $$rootfs_download_path/* $$rootfs
+        $$rootfs/* $$rootfs
   - exec_out: echo "sync..." ; sync
 
 - create_fstab:
-  - write_out:
-    - $$rootfs/etc/fstab
-    - |
-      # /etc/fstab: static file system information.
-      #
-      # Use 'blkid' to print the universally unique identifier for a
-      # nbd_device; this may be used with UUID= as a more robust way to name nbd_devices
-      # that works even if disks are added and removed. See fstab(5).
-      #
-      # <file system> <mount point>   <type>  <options>       <dump>  <pass>
-      UUID=`blkid -s UUID -o value $${nbd_device}p1` /               $$filesystem_type    errors=remount-ro  0       1
+  - on_setup_init:
+    - write_out:
+      - $$rootfs/etc/fstab
+      - |
+        # /etc/fstab: static file system information.
+        # <file system> <mount point>   <type>  <options>       <dump>  <pass>
+        UUID=`blkid -s UUID -o value $${nbd_device}p1` /               $$filesystem_type    errors=remount-ro  0       1

data/templates/steps/bootstrap/install_requirements.yaml

@@ -0,0 +1,3 @@
+- apt_install:
+  - exec_out: apt-get update
+  - exec_out: apt-get -y --force-yes install $$packages 2>&1

data/templates/steps/bootstrap/prepare_docker.yaml

@@ -14,19 +14,19 @@
 - configure_ssh_access:
   - exec_out: echo -e  'y\n' | ssh-keygen -q -t dsa -f $$insecure_ssh_key -N ''
   - exec_out: cat $$insecure_ssh_key
-  - exec_out: chroot $$rootfs_download_path mkdir -p /root/.ssh
+  - exec_out: chroot $$rootfs mkdir -p /root/.ssh
   - exec_out: |
-        cat $${insecure_ssh_key}.pub > $$rootfs_download_path/root/.ssh/authorized_keys
-        cat $${insecure_ssh_key}.pub > $$rootfs_download_path/root/.ssh/kameleon_insecure_public_key
-        chmod 600 $$rootfs_download_path/root/.ssh/authorized_keys
-        chmod 755 $$rootfs_download_path/root/.ssh
+        cat $${insecure_ssh_key}.pub > $$rootfs/root/.ssh/authorized_keys
+        cat $${insecure_ssh_key}.pub > $$rootfs/root/.ssh/kameleon_insecure_public_key
+        chmod 600 $$rootfs/root/.ssh/authorized_keys
+        chmod 755 $$rootfs/root/.ssh
   - on_clean:
-    - exec_out: rm -rf $$rootfs_download_path/root/.ssh
+    - exec_out: rm -rf $$rootfs/root/.ssh
 
 - import_to_docker:
   - check_cmd_out: docker
   - exec_out: echo "Importing $$docker_image to docker..."
-  - exec_out: tar -C $$rootfs_download_path -c . | $DOCKER import - $$docker_image:base
+  - exec_out: tar -C $$rootfs -c . | docker import - $$docker_image:base
 
 - create_ssh_config:
   - write_out:

data/templates/steps/bootstrap/prepare_qemu.yaml

@@ -1,35 +1,32 @@
 - insecure_ssh_key: $$kameleon_cwd/insecure_ssh_key
 
-- mount_chroot:
-  - check_cmd_out: chroot
-  - exec_out: mount -o bind /dev  $$rootfs/dev
-  - exec_out: mount -o bind /dev/pts $$rootfs/dev/pts
-  - exec_out: mount -t proc /proc  $$rootfs/proc
-  - exec_out: mount -t sysfs /sys  $$rootfs/sys
-  - exec_out: test -f $$rootfs/etc/mtab || cat /proc/mounts > $$rootfs/etc/mtab
+- download_boot2kameleon_iso:
+  - download_file_local:
+    - $$boot2kameleon_url
+    - $$kameleon_cwd/boot2kameleon.iso
 
-- umount_chroot:
-  - on_bootstrap_clean:
-    - exec_out: echo try umount $$rootfs/sys... ; mountpoint -q $$rootfs/sys && umount -f -l $$rootfs/sys  || true
-    - exec_out: echo try umount $$rootfs/proc... ; mountpoint -q $$rootfs/proc && umount  -f -l $$rootfs/proc  || true
-    - exec_out: echo try umount $$rootfs/dev/pts... ; mountpoint -q $$rootfs/dev/pts && umount -f -l $$rootfs/dev/pts  || true
-    - exec_out: echo try umount $$rootfs/dev... ; mountpoint -q $$rootfs/dev && umount -f -l $$rootfs/dev  || true
+- create_initial_image:
+  - check_cmd_local: qemu-img
+  - exec_local: |
+      rm -f $$qemu_image_disk
+      qemu-img create -f qcow2 $$qemu_image_disk $$qemu_image_size
+
+- delete_initial_image:
+  - on_checkpoint: skip
+  - on_export_clean:
+    - exec_local: rm -f $$qemu_image_disk
 
 - configure_ssh_access:
-  - exec_out: echo -e  'y\n' | ssh-keygen -q -t dsa -f $$insecure_ssh_key -N ''
-  - exec_out: cat $$insecure_ssh_key
-  - exec_out: chroot $$rootfs mkdir -p /root/.ssh
-  - exec_out: |
-        cat $${insecure_ssh_key}.pub | tee -a $$rootfs/root/.ssh/authorized_keys
-        cat $${insecure_ssh_key}.pub > $$rootfs/root/.ssh/kameleon_insecure_public_key
-        chmod 600 $$rootfs/root/.ssh/authorized_keys
-        chmod 755 $$rootfs/root/.ssh
+  - download_file_local:
+    - $$insecure_ssh_key_url
+    - $$insecure_ssh_key
+  - exec_local: chmod 600 $$insecure_ssh_key
 
 - create_ssh_config:
-  - write_out:
+  - write_local:
     - $$ssh_config_file
     - |
-      Host $$kameleon_recipe_name
+      Host $${kameleon_recipe_name}
       HostName 127.0.0.1
       Port $${qemu_ssh_port}
       User root
@@ -40,8 +37,5 @@
       IdentitiesOnly yes
       LogLevel FATAL
       ForwardAgent yes
-      ControlPath /tmp/$${kameleon_short_uuid}%r@%h:%p
-      ControlMaster auto
-      ControlPersist yes
       Compression yes
       Protocol 2