.gitignore

@@ -1,4 +1,3 @@
 /build/
 parameters.env
-*.img
-*.img.*
+*.img

README.md

@@ -48,10 +48,8 @@ tar -xzvf build/rpi-cloud-init.tgz -C /mnt/rpi-boot
 Place a decompressed Ubuntu Server `*.img` file in the project directory and
 use `img-config.sh` to both build the project and dope the boot partition of `*.img` file directly
 
-**Note**: Must be run from an account with `sudo` permissions
-
 ```bash
-./img-config.sh ubuntu-20.04.1-preinstalled-server-arm64+raspi.img
+sudo ./img-config.sh ubuntu-20.04.1-preinstalled-server-arm64+raspi.img
 ```
 
 ## Roadmap

build.sh

@@ -16,7 +16,9 @@ $(cat src/user-data)
 ~" > build/cloud-init/user-data
 
 cp src/meta-data build/cloud-init/
-cp src/*.sh build/cloud-init/
+cp src/initial-setup.sh build/cloud-init/
+cp src/install-torch.sh build/cloud-init/
+cp src/torch-agent_0.0.4-1_all.deb build/cloud-init/
 
 mkdir build/cloud-init/torch-config
 cp -r $TORCH_CONFIG_DIR/* build/cloud-init/torch-config/
@@ -24,4 +26,4 @@ cp -r $TORCH_CONFIG_DIR/* build/cloud-init/torch-config/
 tar -C build -czvf build/rpi-cloud-init.tgz cmdline.txt cloud-init
 
 rm -rf build/cloud-init
-rm build/cmdline.txt
+rm build/cmdline.txt

img-config.sh

@@ -1,15 +1,12 @@
 #!/bin/bash
 
-[ $# -eq 0 ] && { echo "Usage: $0 IMG_FILE"; exit 1; }
-
 SECTOR_BYTES=512
 SECTOR_START=2048
 OFFSET=$(($SECTOR_BYTES*$SECTOR_START))
 
 ./build.sh
 mkdir -p boot-part
-sudo mount -o rw,loop,offset=$OFFSET $1 ./boot-part
+mount -o rw,loop,offset=$OFFSET $1 ./boot-part
 tar -xzvf build/rpi-cloud-init.tgz -C boot-part
-sudo umount ./boot-part
-rmdir ./boot-part
-rm -rf ./build
+umount ./boot-part
+rmdir ./boot-part

src/initial-setup.sh

@@ -2,29 +2,29 @@
 
 export DEBIAN_FRONTEND=noninteractive
 
-apt-get -y purge \
- cloud-init cloud-guest-utils \
- cloud-initramfs-copymods cloud-initramfs-dyn-netconf \
+apt-get -y purge\
+ cloud-init cloud-guest-utils\
+ cloud-initramfs-copymods cloud-initramfs-dyn-netconf\
  open-iscsi
 rm -rf /etc/cloud/ /var/lib/cloud/
 
 apt-get update
 
-apt-get -y \
- -o Dpkg::Options::="--force-confdef" \
- -o Dpkg::Options::="--force-confold" \
+apt-get -y\
+ -o Dpkg::Options::="--force-confdef"\
+ -o Dpkg::Options::="--force-confold"\
  upgrade
 
-apt-get -y install \
- vim \
- gparted \
- libc6:armhf libstdc++6:armhf \
- lxterminal \
+apt-get -y install\
+ vim\
+ gparted\
+ libc6:armhf libstdc++6:armhf\
+ lxterminal\
  usbmount
 
 # Workaround for usbmount bug on Bionic
 mkdir -p /etc/systemd/system/systemd-udevd.service.d
-echo "[Service]\nMountFlags=shared\n" > \
+echo "[Service]\nMountFlags=shared\n" >\
  /etc/systemd/system/systemd-udevd.service.d/override.conf
 systemctl daemon-reload
 service systemd-udevd --full-restart

src/install-torch.sh

@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
+apt-get -y install /boot/firmware/cloud-init/torch-agent_0.0.4-1_all.deb
 cp -r /boot/firmware/cloud-init/torch-config/* /etc/torch/
 chown torch -R /etc/torch
 systemctl daemon-reload
-systemctl enable torch-agent
+systemctl enable torch-agent

src/user-data

@@ -14,38 +14,20 @@ users:
     ssh_authorized_keys:
       - $SSH_PUBKEY
 
-apt:
-  sources:
-    rudefox.list:
-      source: "deb https://repo.rudefox.io/repository/apt-release focal main"
-      key: |
-        -----BEGIN PGP PUBLIC KEY BLOCK-----
-        
-        mQENBF98c5oBCADb1LGtaxRg6pCHadJ72XVgkOkdrCBs7TElovYeX1y/pj1kUmSN
-        +RO0Ax0YlHxKpuicIEU3HzL8qJ0FbB9ShGnYXxVhxn4HuVSvVpqcExCK2Dkz2g2+
-        0HpmDsptcsHpvTr0JiPClr4GgbeJuoz5kBOwmE8uQ5NswUysvkOWnlht1ILZMGat
-        wimqQaJbZ57TI+q3GPCRaWc2bwRoFS/bVjQrZ18fkRcdUsWLcy0JuipoBklWbKSP
-        VT1kfwz+akhyjiNO8F9n+5JYDi6vbZIwucQMcsLkZyvhdhLPfd37jjdFFF7EIG4d
-        tsF50JzbpAEt4FfHDvyEgfOTE+CWU52CS5EBABEBAAG0H1RPUmNoLUFnZW50IDxi
-        amR3ZWNrQGdtYWlsLmNvbT6JAU4EEwEKADgWIQQU2IX2LS4EHRNbm77btWA5gL84
-        gwUCX3xzmgIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRDbtWA5gL84g5pq
-        B/48M4WZLfoeLNuw39MEDXF7WSDglF5qle7I8AnB0OTxER1WZO8ZiZcHjZChINXY
-        qTglpfdj525cD2s7ClFkFMsvAUy+th/otguac41DZcbiJUQoNAHbu3rAdnEHERxU
-        8at6us1kgou5Cd+zz9a6LbusUte4MCTGx/yAd0mNrZqkMO8v0Rb0VvKZhm658RXp
-        y8ExNfZYRLy1qH5K+ucL78dczAeIMyYlEUXJpFVvR7vgpMOQuIcSA7ez4gXNWmwp
-        rgzJtFxzVo1RGDujlcjqJxH02KXo52KRmkXxfF8gF3Rkt4pNuCgw9v9flvBg9dEb
-        fwqgmqM4gR+TXquJ7e9wnvly
-        =VE78
-        -----END PGP PUBLIC KEY BLOCK-----
-
-packages: ['torch-agent']
-
 runcmd:
+  # Disable optional PAM features for faster SSH login
+#  - 'mv /etc/pam.d/sshd /etc/pam.d/sshd.bak'
+#  - 'sed "s/^session[ \t]\+optional/#\0/" /etc/pam.d/sshd.bak > /etc/pam.d/sshd'
+
+  # Back up the SSH default config and activate the new config
+#  - 'mv /etc/ssh/sshd_config /etc/ssh/sshd_config.bak'
+#  - 'mv /etc/ssh/sshd_config.new /etc/ssh/sshd_config'
+#  - 'service ssh reload'
 
   # Multi-arch support on aarch64
   - 'dpkg --add-architecture armhf'
 
-  # Run setup scripts
+  # Run optional script for additoinal package setup
   - '/boot/firmware/cloud-init/initial-setup.sh'
-  - '/boot/firmware/cloud-init/configure-torch.sh'
-  - 'reboot now'
+  - '/boot/firmware/cloud-init/install-torch.sh'
+  - 'reboot now'