common.yaml

@@ -5,6 +5,7 @@ ignition:
   config:
     merge:
     - local: sshkeys.ign
+    - local: collectd.ign
     - local: local_exporter.ign
     - local: notify-shutdown.ign
     - local: ssh-host-certs.ign

flash.zsh

@@ -67,28 +67,18 @@ function hybridize_gpt() {
 function install_coreos() {
     local ignition="$1"
     local dev="$2"
-    local url="$3"
-    local console="$4"
 
-    if [ -z "${url}" ]; then
-        set -- -a aarch64 -s stable
-    else
-        set -- --image-url "${url}"
-    fi
-    if [ -n "${console}" ]; then
-        set -- "$@" --console "${console}"
-    fi
-
-    coreos-installer install "$@" \
+    coreos-installer install \
+        -a aarch64 \
+        -s stable \
         -i "${ignition}" \
+        --console ttyS0,115200n8 \
         "${dev}"
     sync; sync; sync
 }
 
 function parse_args() {
     pi=4
-    image_url=
-    console=ttyS0,115200n8
     while [ $# -gt 0 ]; do
         case "$1" in
         --pi)
@@ -98,20 +88,6 @@ function parse_args() {
         --pi=*)
             pi=${1#--pi=}
             ;;
-        --image-url)
-            shift
-            image_url=${1}
-            ;;
-        --image-url=*)
-            image_url=${1#--image-url=}
-            ;;
-        --console)
-            shift
-            console=${1}
-            ;;
-        --console=*)
-            console=${1#--console=}
-            ;;
         *)
             if [ -z "${ignition-}" ]; then
                 ignition="${1}"
@@ -152,7 +128,7 @@ if [ $(id -u) -ne 0 ]; then
     exec sudo "$0" "$@"
 fi
 
-install_coreos "${ignition}" "${dev}" "${image_url}" "${console}"
+install_coreos "${ignition}" "${dev}"
 
 case "${pi}" in
 2|3)

install-packages.service

@@ -4,11 +4,12 @@ Description=Install additional packages
 After=network-online.target
 Wants=network-online.target
 Before=zincati.service
+Before=systemd-user-sessions.service
 ConditionPathExists=/etc/ignition/packages.d
 ConditionPathExists=!/etc/ignition/packages.installed
 
 [Service]
-Type=idle
+Type=oneshot
 RemainAfterExit=yes
 ExecStart=/bin/sh /etc/ignition/install-packages.sh
 ExecStartPost=/bin/touch /etc/ignition/packages.installed

install-packages.sh

@@ -5,8 +5,6 @@ if [ ! -d /etc/ignition/packages.d ]; then
     exit 0
 fi
 
-set -e
-
 cat /etc/ignition/packages.d/* | xargs rpm-ostree install --apply-live -y
 
 systemctl preset-all --preset-mode=enable-only

serial-console.yaml

@@ -1,15 +0,0 @@
-variant: fcos
-version: 1.4.0
-ignition:
-  config:
-    merge:
-    - local: packages.ign
-
-storage:
-  files:
-  - path: /etc/ignition/packages.d/serial-console
-    mode: 0644
-    contents:
-      inline: |
-        picocom
-        tmux

serial1.yaml

@@ -1,59 +0,0 @@
-variant: fcos
-version: 1.4.0
-
-ignition:
-  config:
-    merge:
-    - local: fix-hybrid-mbr.ign
-    - local: common.ign
-    - local: zram.ign
-    - local: cfg.ign
-    - local: serial-console.ign
-
-passwd:
-  users:
-  - name: root
-    password_hash: '$6$rounds=656000$Dwv1aYtPgIZ3qgrW$3NULGiOIBcNUwNJsk0WjaIZx2uDCapejz7A/DwYGiZWVXvm5KLjW5lAh0zhzAfF6M.rXxi/YBygaNaN2XAAj5/'
-
-# Attempting to add a user to any group other than adm, wheel, sudo, or
-# systemd-journal causes Ignition to fail:
-#
-#     useradd: group 'dialout' does not exist
-#
-# Work-around:
-#
-#     sed -n '/^dialout:/s/.*/\0core/p' /lib/group | sudo tee -a /etc/group
-#
-# See also: https://discussion.fedoraproject.org/t/groupadd-usermod-dont-always-work-in-coreos/41735
-# See also: https://github.com/coreos/rpm-ostree/issues/49
-#
-#  - name: core
-#    groups:
-#    - adm
-#    - wheel
-#    - sudo
-#    - dialout
-#    - systemd-journal
-
-storage:
-  files:
-  - path: /etc/hostname
-    mode: 0644
-    contents:
-      inline: serial1.pyrocufflink.blue
-
-  - path: /etc/NetworkManager/system-connections/enu1u1.nmconnection
-    mode: 0600
-    contents:
-      inline: |
-        [connection]
-        id=enu1u1
-        type=ethernet
-        interface-name=enu1u1
-
-        [ipv4]
-        address1=172.30.0.13/26,172.30.0.1
-        dns=172.30.0.1;
-        dns-search=pyrocufflink.blue;
-        method=manual
-        may-fail=false