Update peach-config to new package name

2021-07-23 23:23:04 -04:00 · 2021-07-23 23:23:04 -04:00 · d35ca5da53
parent b78422103b
commit d35ca5da53
4 changed files with 172 additions and 3 deletions
--- a/build_debian_base.sh
+++ b/build_debian_base.sh
@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# remove old files
+rm -f raspi_3.img
+rm -f raspi_3.img.xz
+rm -f raspi_3.log
+rm -f peach-img-manifest.log
+
+# build image
+make raspi_3.img
+
+mv raspi_3.img ~/computer/projects/peachcloud/debian_base.img
+# compress image
+echo "++ successful image build of debian base"
--- a/raspi_base.yayml
+++ b/raspi_base.yayml
@ -0,0 +1,157 @@
+# NOTE: this is a special yaml which is just used for making an image for testing the peach-config testing script
+# the point is to make an image that is all ready to go, except for running peach-config
+# to allow for quick testing
+
+steps:
+  - mkimg: "{{ output }}"
+    size: 2000M
+
+  - mklabel: msdos
+    device: "{{ output }}"
+
+  - mkpart: primary
+    fs-type: 'fat32'
+    device: "{{ output }}"
+    start: 0%
+    end: 20%
+    tag: /boot
+
+  - mkpart: primary
+    device: "{{ output }}"
+    start: 20%
+    end: 100%
+    tag: /
+
+  - kpartx: "{{ output }}"
+
+  - mkfs: vfat
+    partition: /boot
+    label: RASPIFIRM
+
+  - mkfs: ext4
+    partition: /
+    label: RASPIROOT
+
+  - mount: /
+
+  - mount: /boot
+    mount-on: /
+    dirname: '/boot/firmware'
+
+  - unpack-rootfs: /
+
+  - qemu-debootstrap: buster
+    mirror: http://deb.debian.org/debian
+    target: /
+    arch: arm64
+    components:
+    - main
+    - contrib
+    - non-free
+    unless: rootfs_unpacked
+
+  - create-file: /etc/apt/sources.list
+    trailing-newline: '1'
+    contents: |
+      deb http://deb.debian.org/debian buster main contrib non-free
+      deb http://deb.debian.org/debian-security buster/updates main contrib non-free
+      # Backports are _not_ enabled by default.
+      # Enable them by uncommenting the following line:
+      # deb http://deb.debian.org/debian buster-backports main contrib non-free
+
+    unless: rootfs_unpacked
+
+  - chroot: /
+    shell: |
+      apt-get update
+    unless: rootfs_unpacked
+
+  - apt: install
+    packages:
+    - ssh
+    - parted
+    - dosfstools
+    - wireless-tools
+    - wpasupplicant
+    - raspi3-firmware
+    - linux-image-arm64
+    - firmware-brcm80211
+    tag: /
+    unless: rootfs_unpacked
+
+  - cache-rootfs: /
+    unless: rootfs_unpacked
+
+  - shell: |
+      echo "rpi3-$(date +%Y%m%d)" > "${ROOT?}/etc/hostname"
+
+      # Allow root logins locally with no password
+      sed -i 's,root:[^:]*:,root::,' "${ROOT?}/etc/shadow"
+
+      install -m 644 -o root -g root rootfs/etc/fstab "${ROOT?}/etc/fstab"
+
+      #not needed for peach
+      install -m 644 -o root -g root rootfs/etc/network/interfaces.d/eth0 "${ROOT?}/etc/network/interfaces.d/eth0"
+      #install -m 600 -o root -g root rootfs/etc/network/interfaces.d/wlan0 "${ROOT?}/etc/network/interfaces.d/wlan0"
+
+      install -m 755 -o root -g root rootfs/usr/local/sbin/rpi-set-sysconf "${ROOT?}/usr/local/sbin/rpi-set-sysconf"
+      install -m 644 -o root -g root rootfs/etc/systemd/system/rpi-set-sysconf.service "${ROOT?}/etc/systemd/system/"
+      install -m 644 -o root -g root rootfs/boot/firmware/sysconf.txt "${ROOT?}/boot/firmware/sysconf.txt"
+      mkdir -p "${ROOT?}/etc/systemd/system/basic.target.requires/"
+      ln -s /etc/systemd/system/rpi-set-sysconf.service "${ROOT?}/etc/systemd/system/basic.target.requires/rpi-set-sysconf.service"
+
+      install -m 755 -o root -g root rootfs/usr/sbin/rpi-resizerootfs "${ROOT?}/usr/sbin/rpi-resizerootfs"
+      install -m 644 -o root -g root rootfs/etc/systemd/system/rpi-resizerootfs.service "${ROOT?}/etc/systemd/system/"
+      mkdir -p "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/"
+      ln -s /etc/systemd/system/rpi-resizerootfs.service "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/rpi-resizerootfs.service"
+
+      install -m 644 -o root -g root rootfs/etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/"
+      mkdir -p "${ROOT?}/etc/systemd/system/multi-user.target.requires/"
+      ln -s /etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi-generate-ssh-host-keys.service"
+      rm -f "${ROOT?}"/etc/ssh/ssh_host_*_key*
+    root-fs: /
+
+  # Copy the relevant device tree files to the boot partition
+  - chroot: /
+    shell: |
+      install -m 644 -o root -g root /usr/lib/linux-image-*-arm64/broadcom/bcm*rpi*.dtb /boot/firmware/
+
+  # Clean up archive cache (likely not useful) and lists (likely outdated) to
+  # reduce image size by several hundred megabytes.
+  - chroot: /
+    shell: |
+      apt-get clean
+      rm -rf /var/lib/apt/lists
+
+  # Modify the kernel commandline we take from the firmware to boot from
+  # the partition labeled raspiroot instead of forcing it to mmcblk0p2
+  - chroot: /
+    shell: |
+      ls -aR /boot
+      sed -i 's/.dev.mmcblk0p2/LABEL=RASPIROOT/' /boot/firmware/cmdline.txt
+
+  # BEGINNING OF PEACH CONFIG
+  - shell: |
+      echo "This debian/peach base image was configured as a basic image for testing peach-config on $(date +%Y%m%d) with peach-img-builder version 0.1.0" > "${ROOT?}/srv/peach-img-provenance.log"
+    root-fs: /
+
+  - apt: install
+    packages:
+      - git
+      - python3
+      - python3-pip
+      - wget
+      - gnupg2
+      - sudo
+    tag: /
+
+  - chroot: /
+    shell: |
+        /usr/sbin/useradd -m -p $(echo pc | openssl passwd -1 -stdin) -g sudo -s /bin/bash peachtest
+  # END OF PEACH CONFIG
+
+  # TODO(https://github.com/larswirzenius/vmdb2/issues/24): remove once vmdb
+  # clears /etc/resolv.conf on its own.
+  - shell: |
+      rm "${ROOT?}/etc/resolv.conf"
+    root-fs: /
--- a/raspi_master.yaml
+++ b/raspi_master.yaml
@ -150,8 +150,7 @@ steps:
      apt-key add /tmp/pubkey.gpg
      apt-get update
      apt-get install -y peach-config
-      #/usr/bin/peach-config setup -i -n -d peach
-      /usr/bin/peach-config 
+      RUST_LOG=info /usr/bin/peach-config setup -i -n -d

  # lastly log which versions of microservices were installed and copy the provenance to the host machine
  - chroot: /
--- a/templates/release_index.html
+++ b/templates/release_index.html
@ -27,7 +27,7 @@
 <h1>PeachCloud Package Builds</h1>
 <p>The above image contains the following packages:</p>
 <ul>
-    <li><a href="http://apt.peachcloud.org/pool/buster/main/p/peach-config/python3-peach-config_{{packages['python3-peach-config']}}_all.deb">peach-config</a> - {{packages["python3-peach-config"]}}</li>
+    <li><a href="http://apt.peachcloud.org/pool/buster/main/p/peach-config/peach-config_{{packages['peach-config']}}_all.deb">peach-config</a> - {{packages["peach-config"]}}</li>
    <li><a href="http://apt.peachcloud.org/pool/buster/main/p/peach-buttons/peach-buttons_{{packages['peach-buttons']}}_arm64.deb">peach-buttons</a> - {{packages["peach-buttons"]}}</li>
    <li><a href="http://apt.peachcloud.org/pool/buster/main/p/peach-buttons/peach-menu_{{packages['peach-menu']}}_arm64.deb">peach-menu</a> - {{packages["peach-menu"]}}</li>
    <li><a href="http://apt.peachcloud.org/pool/buster/main/p/peach-monitor/peach-monitor_{{packages['peach-monitor']}}_arm64.deb">peach-monitor</a> - {{packages["peach-monitor"]}}</li>