underpost 2.8.814 → 2.8.816

package/README.md

@@ -68,7 +68,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.814
+## underpost ci/cd cli v2.8.816
 
 ### Usage: `underpost [options] [command]`
   ```

package/bin/deploy.js

@@ -51,52 +51,50 @@ logger.info('argv', process.argv);
 
 const [exe, dir, operator] = process.argv;
 
-const updateVirtualRoot = async ({ IP_ADDRESS, architecture, host, nfsHostPath, ipaddr, update, gatewayip }) => {
-  // <consumer_key>:<consumer_token>:<secret>
-  const MAAS_API_TOKEN = shellExec(`maas apikey --username ${process.env.MAAS_ADMIN_USERNAME}`, {
-    stdout: true,
-  }).trim();
-  const [consumer_key, consumer_token, secret] = MAAS_API_TOKEN.split(`\n`)[0].split(':');
-  const chronyConfPath = `/etc/chrony/chrony.conf`;
-  const timezone = 'America/New_York';
-
-  const timeZoneSteps = [
-    `export DEBIAN_FRONTEND=noninteractive`,
-
-    `ln -fs /usr/share/zoneinfo/${timezone} /etc/localtime`,
-
-    `sudo dpkg-reconfigure --frontend noninteractive tzdata`,
-  ];
-  const keyboardSteps = [
-    `sudo locale-gen en_US.UTF-8`,
-    `sudo update-locale LANG=en_US.UTF-8`,
-    `sudo sed -i 's/XKBLAYOUT="us"/XKBLAYOUT="es"/' /etc/default/keyboard`,
-    `sudo dpkg-reconfigure --frontend noninteractive keyboard-configuration`,
-    `sudo systemctl restart keyboard-setup.service`,
-  ];
-  // #  - ${JSON.stringify([...timeZoneSteps, ...chronySetUp(chronyConfPath)])}
-  const installSteps = [
-    `cat <<EOF | tee /etc/apt/sources.list
+const chronyConfPath = `/etc/chrony/chrony.conf`;
+
+const timezone = 'America/New_York';
+
+const timeZoneSteps = [
+  `export DEBIAN_FRONTEND=noninteractive`,
+
+  `ln -fs /usr/share/zoneinfo/${timezone} /etc/localtime`,
+
+  `sudo dpkg-reconfigure --frontend noninteractive tzdata`,
+];
+const keyboardSteps = [
+  `sudo locale-gen en_US.UTF-8`,
+  `sudo update-locale LANG=en_US.UTF-8`,
+  `sudo sed -i 's/XKBLAYOUT="us"/XKBLAYOUT="es"/' /etc/default/keyboard`,
+  `sudo dpkg-reconfigure --frontend noninteractive keyboard-configuration`,
+  `sudo systemctl restart keyboard-setup.service`,
+];
+// #  - ${JSON.stringify([...timeZoneSteps, ...chronySetUp(chronyConfPath)])}
+const installSteps = [
+  `cat <<EOF | tee /etc/apt/sources.list
 deb http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse
 deb http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse
 deb http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse
 EOF`,
 
-    `apt update -qq`,
-    `apt -y full-upgrade`,
-    `apt install -y xinput x11-xkb-utils usbutils`,
-    // `apt install -y cloud-init=25.1.2-0ubuntu0~24.04.1`,
-    `apt install -y cloud-init systemd-sysv openssh-server sudo locales udev util-linux systemd-sysv iproute2 netplan.io ca-certificates curl wget chrony`,
-    `ln -sf /lib/systemd/systemd /sbin/init`,
-
-    `apt-get update`,
-    `DEBIAN_FRONTEND=noninteractive apt-get install -y apt-utils`,
-    `DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata kmod keyboard-configuration console-setup`,
-  ];
-
-  let steps = [
-    // Configure cloud-init for MAAS
-    `cat <<EOF_MAAS_CFG > /etc/cloud/cloud.cfg.d/90_maas.cfg
+  `apt update -qq`,
+  `apt -y full-upgrade`,
+  `apt install -y xinput x11-xkb-utils usbutils`,
+  // `apt install -y cloud-init=25.1.2-0ubuntu0~24.04.1`,
+  `apt install -y cloud-init systemd-sysv openssh-server sudo locales udev util-linux systemd-sysv iproute2 netplan.io ca-certificates curl wget chrony`,
+  `ln -sf /lib/systemd/systemd /sbin/init`,
+
+  `apt-get update`,
+  `DEBIAN_FRONTEND=noninteractive apt-get install -y apt-utils`,
+  `DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata kmod keyboard-configuration console-setup iputils-ping`,
+];
+
+const cloudConfigFactory = (
+  { IP_ADDRESS, architecture, host, nfsHostPath, ipaddr, update, gatewayip },
+  { consumer_key, consumer_secret, token_key, token_secret },
+) => [
+  // Configure cloud-init for MAAS
+  `cat <<EOF_MAAS_CFG > /etc/cloud/cloud.cfg.d/90_maas.cfg
 #cloud-config
 
 hostname: ${host}
@@ -114,37 +112,48 @@ hostname: ${host}
 datasource_list: [ MAAS ]
 datasource:
   MAAS:
-    metadata_url: http://${IP_ADDRESS}:5240/MAAS/metadata
-    consumer_key: ${consumer_key}
-    token_key: ${consumer_token}
-    token_secret: ${secret}
-users:
-  - name: rpiadmin
-    sudo: ['ALL=(ALL) NOPASSWD:ALL']
-    shell: /bin/bash
-    lock_passwd: true
-    ssh_authorized_keys:
-      - ${fs.readFileSync(`/home/dd/engine/engine-private/deploy/id_rsa.pub`, 'utf8')}
+    metadata_url: http://${IP_ADDRESS}:5240/MAAS/metadata/
+    ${
+      process.argv.includes('reset')
+        ? ''
+        : `consumer_key: ${consumer_key}
+    consumer_secret: ${consumer_secret}
+    token_key: ${token_key}
+    token_secret: ${token_secret}`
+    }
 
 
+users:
+- name: ${process.env.MAAS_ADMIN_USERNAME}
+  sudo: ['ALL=(ALL) NOPASSWD:ALL']
+  shell: /bin/bash
+  lock_passwd: false
+  groups: sudo,users,admin,wheel,lxd
+  plain_text_passwd: '${process.env.MAAS_ADMIN_USERNAME}'
+  ssh_authorized_keys:
+    - ${fs.readFileSync(`/home/dd/engine/engine-private/deploy/id_rsa.pub`, 'utf8')}
+
+# manage_resolv_conf: true
+# resolv_conf:
+#   nameservers: [8.8.8.8]
+
 # keyboard:
 #   layout: es
 
-  
 # check timedatectl on host
 # timezone: America/Santiago
-timezone: ${timezone}
+# timezone: ${timezone}
 
 ntp:
   enabled: true
   servers:
-    - ${IP_ADDRESS}
+    - ${process.env.MAAS_NTP_SERVER}
   ntp_client: chrony
-  config:
-    confpath: ${chronyConfPath}
-    packages:
-      - chrony
-    service_name: chrony
+#   config:
+#     confpath: ${chronyConfPath}
+#     packages:
+#       - chrony
+#     service_name: chrony
 
 # ssh:
 #   allow-pw: false
@@ -165,9 +174,9 @@ network:
   version: 2
   ethernets:
     ${process.env.RPI4_INTERFACE_NAME}:
-        dhcp4: true
-        addresses:
-          - ${ipaddr}/24
+      dhcp4: true
+      addresses:
+        - ${ipaddr}/24
 #         routes:
 #           - to: default
 #             via: ${gatewayip}
@@ -175,7 +184,7 @@ network:
 # chpasswd:
 #   expire: false
 #   users:
-#   - {name: rpiadmin, password: changeme, type: text}
+#   - {name: root, password: changeme, type: text}
 
 final_message: "The system is up, after $UPTIME seconds"
 
@@ -192,87 +201,88 @@ runcmd:
   - echo "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
   - echo "Init runcmd"
   - echo "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
+
+# If this is set, 'root' will not be able to ssh in and they
+# will get a message to login instead as the default $user
+disable_root: true
+
+# This will cause the set+update hostname module to not operate (if true)
+preserve_hostname: false
+
+# The modules that run in the 'init' stage
+cloud_init_modules:
+  - migrator
+  - seed_random
+  - bootcmd
+  - write-files
+  - growpart
+  - resizefs
+  - disk_setup
+  - mounts
+  - set_hostname
+  - update_hostname
+  - update_etc_hosts
+  - ca-certs
+  - rsyslog
+  - users-groups
+  - ssh
+
+# The modules that run in the 'config' stage
+cloud_config_modules:
+# Emit the cloud config ready event
+# this can be used by upstart jobs for 'start on cloud-config'.
+  - emit_upstart
+  - snap_config
+  - ssh-import-id
+  - locale
+  - set-passwords
+  - grub-dpkg
+  - apt-pipelining
+  - apt-configure
+  - ntp
+  - timezone
+  - disable-ec2-metadata
+  - runcmd
+  - byobu
+
+# The modules that run in the 'final' stage
+cloud_final_modules:
+  - snappy
+  - package-update-upgrade-install
+#  - fan
+#  - landscape
+#  - lxd
+#  - puppet
+  - chef
+  - salt-minion
+  - mcollective
+  - rightscale_userdata
+  - scripts-vendor
+  - scripts-per-once
+  - scripts-per-boot
+  - scripts-per-instance
+  - scripts-user
+  - ssh-authkey-fingerprints
+  - keys-to-console
+#  - phone-home
+  - final-message
+#  - power-state-change
 EOF_MAAS_CFG`,
-  ];
+];
 
-  const runSteps = (steps = []) => {
-    const script = steps
-      .map(
-        (s, i) => `echo "step ${i + 1}/${steps.length}: ${s.split('\n')[0]}"
+const runSteps = (nfsHostPath, steps = []) => {
+  const script = steps
+    .map(
+      (s, i) => `echo "step ${i + 1}/${steps.length}: ${s.split('\n')[0]}"
 ${s}`,
-      )
-      .join('\n');
+    )
+    .join('\n');
 
-    const cmd = `sudo chroot ${nfsHostPath} /usr/bin/qemu-aarch64-static /bin/bash <<'EOF_OUTER'
+  const cmd = `sudo chroot ${nfsHostPath} /usr/bin/qemu-aarch64-static /bin/bash <<'EOF_OUTER'
 ${script}
 EOF_OUTER`;
 
-    shellExec(cmd);
-  };
-
-  if (update) {
-    // --reboot
-    shellExec(`sudo chroot ${nfsHostPath} /usr/bin/qemu-aarch64-static /bin/bash <<'EOF'
-sudo cloud-init clean --logs --seed --configs all --machine-id
-sudo rm -rf /var/lib/cloud/*
-EOF`);
-
-    if (fs.existsSync(`${nfsHostPath}/var/log/`)) {
-      fs.writeFileSync(`${nfsHostPath}/var/log/cloud-init.log`, '', 'utf8');
-      fs.writeFileSync(`${nfsHostPath}/var/log/cloud-init-output.log`, '', 'utf8');
-    }
-
-    runSteps(steps);
-  } else {
-    runSteps(installSteps.concat(steps));
-
-    shellExec(`sudo chroot ${nfsHostPath} /usr/bin/qemu-aarch64-static /bin/bash <<'EOF'
-echo "nameserver ${process.env.MAAS_DNS}" | tee /etc/resolv.conf > /dev/null
-apt update
-EOF`);
-    fs.writeFileSync(
-      `${nfsHostPath}/dns.sh`,
-      `rm /etc/resolv.conf
-echo 'nameserver 8.8.8.8' > /run/systemd/resolve/stub-resolv.conf
-ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf`,
-      'utf8',
-    );
-
-    runSteps([
-      // `date -s "${shellExec(`date '+%Y-%m-%d %H:%M:%S'`, { stdout: true }).trim()}"`,
-      // `date`,
-      ...timeZoneSteps,
-      ...chronySetUp(chronyConfPath),
-      ...keyboardSteps,
-    ]);
-
-    runSteps([
-      `useradd -m -s /bin/bash -G sudo root`,
-      `echo 'root:root' | chpasswd`,
-      `mkdir -p /home/root/.ssh`,
-      `echo '${fs.readFileSync(
-        `/home/dd/engine/engine-private/deploy/id_rsa.pub`,
-        'utf8',
-      )}' > /home/root/.ssh/authorized_keys`,
-      `chown -R root /home/root/.ssh`,
-      `chmod 700 /home/root/.ssh`,
-      `chmod 600 /home/root/.ssh/authorized_keys`,
-    ]);
-  }
-
-  logger.info('Check virtual root user config');
-  {
-    const cmd = `sudo chroot ${nfsHostPath} /usr/bin/qemu-aarch64-static /bin/bash <<'EOF_OUTER'
-echo -e "\n=== Current date/time ==="
-date '+%Y-%m-%d %H:%M:%S'
-echo -e "\n=== Keyboard layout ==="
-cat /etc/default/keyboard
-echo -e "\n=== Registered users ==="
-cut -d: -f1 /etc/passwd
-EOF_OUTER`;
-
-    shellExec(cmd);
-  }
+  shellExec(cmd);
 };
 
 const chronySetUp = (path) => {
@@ -336,6 +346,162 @@ logdir /var/log/chrony
   ];
 };
 
+const installUbuntuUnderpostTools = (nfsHostPath) => {
+  fs.mkdirSync(`${nfsHostPath}/underpost`, { recursive: true });
+
+  logger.info('Build', `${nfsHostPath}/underpost/date.sh`);
+  fs.writeFileSync(
+    `${nfsHostPath}/underpost/date.sh`,
+    `${timeZoneSteps.join('\n')}
+${chronySetUp(chronyConfPath).join('\n')}
+`,
+    'utf8',
+  );
+
+  logger.info('Build', `${nfsHostPath}/underpost/keyboard.sh`);
+  fs.writeFileSync(
+    `${nfsHostPath}/underpost/keyboard.sh`,
+    `${keyboardSteps.join('\n')}
+`,
+    'utf8',
+  );
+
+  logger.info('Build', `${nfsHostPath}/underpost/dns.sh`);
+  // echo "nameserver ${process.env.MAAS_DNS}" | tee /etc/resolv.conf > /dev/null
+  fs.writeFileSync(
+    `${nfsHostPath}/underpost/dns.sh`,
+    `rm /etc/resolv.conf
+echo 'nameserver 8.8.8.8' > /run/systemd/resolve/stub-resolv.conf
+ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf`,
+    'utf8',
+  );
+
+  logger.info('Build', `${nfsHostPath}/underpost/help.sh`);
+  fs.writeFileSync(
+    `${nfsHostPath}/underpost/help.sh`,
+    `echo "=== Cloud init utils ==="
+echo "sudo cloud-init --all-stages"
+echo "sudo cloud-init clean --logs --seed --configs all --machine-id --reboot"
+echo "sudo cloud-init init --local"
+echo "sudo cloud-init init"
+echo "sudo cloud-init modules --mode=config"
+echo "sudo cloud-init modules --mode=final"`,
+    'utf8',
+  );
+
+  logger.info('Build', `${nfsHostPath}/underpost/test.sh`);
+  fs.writeFileSync(
+    `${nfsHostPath}/underpost/test.sh`,
+    `echo -e "\n=== Current date/time ==="
+date '+%Y-%m-%d %H:%M:%S'
+echo -e "\n=== Keyboard layout ==="
+cat /etc/default/keyboard
+echo -e "\n=== Registered users ==="
+cut -d: -f1 /etc/passwd
+    `,
+    'utf8',
+  );
+
+  logger.info('Build', `${nfsHostPath}/underpost/config-path.sh`);
+  fs.writeFileSync(`${nfsHostPath}/underpost/config-path.sh`, `echo "/etc/cloud/cloud.cfg.d/90_maas.cfg"`, 'utf8');
+
+  shellExec(`sudo rm -rf ${nfsHostPath}/root/.ssh`);
+  shellExec(`sudo rm -rf ${nfsHostPath}/home/root/.ssh`);
+
+  fs.copySync(`/root/.ssh`, `${nfsHostPath}/root/.ssh`);
+
+  logger.info('Run', `${nfsHostPath}/underpost/test.sh`);
+  runSteps(nfsHostPath, [
+    `chmod +x /underpost/date.sh`,
+    `chmod +x /underpost/keyboard.sh`,
+    `chmod +x /underpost/dns.sh`,
+    `chmod +x /underpost/help.sh`,
+    `chmod +x /underpost/config-path.sh`,
+    `chmod +x /underpost/test.sh`,
+    `sudo chmod 700 ~/.ssh/`,
+    `sudo chmod 600 ~/.ssh/authorized_keys`,
+    `sudo chmod 644 ~/.ssh/known_hosts`,
+    `sudo chmod 600 ~/.ssh/id_rsa`,
+    `sudo chmod 600 /etc/ssh/ssh_host_ed25519_key`,
+    `chown -R root:root ~/.ssh`,
+    `/underpost/test.sh`,
+  ]);
+};
+
+const updateVirtualRoot = async ({ IP_ADDRESS, architecture, host, nfsHostPath, ipaddr, update, gatewayip }) => {
+  // <consumer_key>:<consumer_token>:<secret>
+  // <consumer_key>:<consumer_secret>:<token_key>:<token_secret>
+  // maas apikey --with-names --username ${process.env.MAAS_ADMIN_USERNAME}
+  // maas ${process.env.MAAS_ADMIN_USERNAME} account create-authorisation-token
+  // maas apikey --generate --username ${process.env.MAAS_ADMIN_USERNAME}
+  // https://github.com/CanonicalLtd/maas-docs/issues/647
+
+  const parts = shellExec(`maas apikey --with-names --username ${process.env.MAAS_ADMIN_USERNAME}`, {
+    stdout: true,
+  })
+    .trim()
+    .split(`\n`)[0]
+    .split(':');
+
+  let consumer_key, consumer_secret, token_key, token_secret;
+
+  if (parts.length === 4) {
+    [consumer_key, consumer_secret, token_key, token_secret] = parts;
+  } else if (parts.length === 3) {
+    [consumer_key, token_key, token_secret] = parts;
+    consumer_secret = '""';
+    token_secret = token_secret.split(' MAAS consumer')[0].trim();
+  } else {
+    throw new Error('Invalid token format');
+  }
+
+  logger.info('Maas api token generated', { consumer_key, consumer_secret, token_key, token_secret });
+
+  if (update) {
+    // --reboot
+    if (process.argv.includes('reset'))
+      shellExec(`sudo chroot ${nfsHostPath} /usr/bin/qemu-aarch64-static /bin/bash <<'EOF'
+sudo cloud-init clean --logs --seed --configs all --machine-id
+sudo rm -rf /var/lib/cloud/*
+EOF`);
+
+    if (fs.existsSync(`${nfsHostPath}/var/log/`)) {
+      fs.writeFileSync(`${nfsHostPath}/var/log/cloud-init.log`, '', 'utf8');
+      fs.writeFileSync(`${nfsHostPath}/var/log/cloud-init-output.log`, '', 'utf8');
+    }
+  } else {
+    runSteps(nfsHostPath, installSteps);
+    runSteps(nfsHostPath, [
+      `useradd -m -s /bin/bash -G sudo root`,
+      `echo 'root:root' | chpasswd`,
+      `mkdir -p /home/root/.ssh`,
+      `echo '${fs.readFileSync(
+        `/home/dd/engine/engine-private/deploy/id_rsa.pub`,
+        'utf8',
+      )}' > /home/root/.ssh/authorized_keys`,
+      `chown -R root /home/root/.ssh`,
+      `chmod 700 /home/root/.ssh`,
+      `chmod 600 /home/root/.ssh/authorized_keys`,
+    ]);
+    runSteps(nfsHostPath, [
+      // `date -s "${shellExec(`date '+%Y-%m-%d %H:%M:%S'`, { stdout: true }).trim()}"`,
+      // `date`,
+      ...timeZoneSteps,
+      ...chronySetUp(chronyConfPath),
+      ...keyboardSteps,
+    ]);
+  }
+
+  runSteps(
+    nfsHostPath,
+    cloudConfigFactory(
+      { IP_ADDRESS, architecture, host, nfsHostPath, ipaddr, update, gatewayip },
+      { consumer_key, consumer_secret, token_key, token_secret },
+    ),
+  );
+  installUbuntuUnderpostTools(nfsHostPath);
+};
+
 try {
   switch (operator) {
     case 'save':
@@ -1519,7 +1685,9 @@ EOF`);
       dotenv.config({ path: `${getUnderpostRootPath()}/.env`, override: true });
       const IP_ADDRESS = getLocalIPv4Address();
       const serverip = IP_ADDRESS;
-      const tftpRoot = process.env.TFTP_ROOT;
+      const tftpRoot = process.argv.includes('v3.0')
+        ? `/var/snap/maas/common/maas/boot-resources/snapshot-20250720-162718`
+        : process.env.TFTP_ROOT;
       const ipaddr = process.env.RPI4_IP;
       const netmask = process.env.NETMASK;
       const gatewayip = process.env.GATEWAY_IP;
@@ -1769,7 +1937,9 @@ EOF`);
         zipFirmwareName,
         zipFirmwareUrl,
         interfaceName,
-        nfsHost;
+        nfsHost,
+        bootResourcesPath,
+        bootKernelPath;
 
       switch (process.argv[3]) {
         case 'rpi4mb':
@@ -1787,7 +1957,7 @@ EOF`);
           resource = resources.find((o) => o.architecture === 'arm64/ga-24.04' && o.name === 'ubuntu/noble');
           name = resource.name;
           architecture = resource.architecture;
-          resource = resources.find((o) => o.name === name && o.architecture === architecture);
+          // resource = resources.find((o) => o.name === name && o.architecture === architecture);
           nfsServerRootPath = `${process.env.NFS_EXPORT_PATH}/rpi4mb`;
           // ,anonuid=1001,anongid=100
           // etcExports = `${nfsServerRootPath} *(rw,all_squash,sync,no_root_squash,insecure)`;
@@ -1799,21 +1969,33 @@ EOF`);
             'no_subtree_check',
             'insecure',
           ]})`;
-          const resourceData = JSON.parse(
-            shellExec(`maas ${process.env.MAAS_ADMIN_USERNAME} boot-resource read ${resource.id}`, {
-              stdout: true,
-              silent: true,
-              disableLog: true,
-            }),
-          );
-          const bootFiles = resourceData.sets[Object.keys(resourceData.sets)[0]].files;
-          const suffix = architecture.match('xgene') ? '.xgene' : '';
+          if (process.argv.includes('v3.0')) {
+            bootResourcesPath = `/var/snap/maas/common/maas/boot-resources/snapshot-20250720-162718`;
+            bootKernelPath = `/var/snap/maas/common/maas/boot-resources/snapshot-20250720-162718/ubuntu/arm64/hwe-24.04/noble/stable`;
+            kernelFilesPaths = {
+              'vmlinuz-efi': `${bootKernelPath}/boot-kernel`,
+              'initrd.img': `${bootKernelPath}/boot-initrd`,
+              squashfs: `${bootKernelPath}/squashfs`,
+            };
+          } else {
+            const resourceData = JSON.parse(
+              shellExec(`maas ${process.env.MAAS_ADMIN_USERNAME} boot-resource read ${resource.id}`, {
+                stdout: true,
+                silent: true,
+                disableLog: true,
+              }),
+            );
+            const bootFiles = resourceData.sets[Object.keys(resourceData.sets)[0]].files;
+            const suffix = architecture.match('xgene') ? '.xgene' : '';
+            bootResourcesPath = `/var/snap/maas/common/maas/image-storage/bootloaders/uefi/arm64`;
+            bootKernelPath = `/var/snap/maas/common/maas/image-storage`;
+            kernelFilesPaths = {
+              'vmlinuz-efi': `${bootKernelPath}/${bootFiles['boot-kernel' + suffix].filename_on_disk}`,
+              'initrd.img': `${bootKernelPath}/${bootFiles['boot-initrd' + suffix].filename_on_disk}`,
+              squashfs: `${bootKernelPath}/${bootFiles['squashfs'].filename_on_disk}`,
+            };
+          }
 
-          kernelFilesPaths = {
-            'vmlinuz-efi': bootFiles['boot-kernel' + suffix].filename_on_disk,
-            'initrd.img': bootFiles['boot-initrd' + suffix].filename_on_disk,
-            squashfs: bootFiles['squashfs'].filename_on_disk,
-          };
           const protocol = 'tcp'; // v3 -> tcp, v4 -> udp
 
           const mountOptions = [
@@ -1876,7 +2058,7 @@ EOF`);
 
           //   identity:
           //     hostname: rpi4
-          //     username: rpiadmin
+          //     username: root
           //     password: "{{PASSWORD}}"
 
           //   ssh:
@@ -1937,52 +2119,18 @@ BOOT_ORDER=0x21`;
       switch (process.argv[3]) {
         case 'rpi4mb':
           {
-            // subnet DHCP snippets
-            // # UEFI ARM64
-            // if option arch = 00:0B {
-            //   filename "rpi4mb/pxe/grubaa64.efi";
-            // }
-            // elsif option arch = 00:13 {
-            //   filename "http://<IP_ADDRESS>:5248/images/bootloaders/uefi/arm64/grubaa64.efi";
-            //   option vendor-class-identifier "HTTPClient";
-            // }
             for (const file of ['bootaa64.efi', 'grubaa64.efi']) {
-              shellExec(
-                `sudo cp -a /var/snap/maas/common/maas/image-storage/bootloaders/uefi/arm64/${file} ${tftpRoot}${tftpSubDir}/pxe/${file}`,
-              );
+              shellExec(`sudo cp -a ${bootResourcesPath}/${file} ${tftpRoot}${tftpSubDir}/pxe/${file}`);
             }
-            // const file = 'bcm2711-rpi-4-b.dtb';
-            // shellExec(
-            //   `sudo cp -a  ${firmwarePath}/${file} /var/snap/maas/common/maas/image-storage/bootloaders/uefi/arm64/${file}`,
-            // );
-
-            // const ipxeSrc = fs
-            //   .readFileSync(`${tftpRoot}/ipxe.cfg`, 'utf8')
-            //   .replaceAll('amd64', 'arm64')
-            //   .replaceAll('${next-server}', IP_ADDRESS);
-            // fs.writeFileSync(`${tftpRoot}/ipxe.cfg`, ipxeSrc, 'utf8');
 
             {
               for (const file of Object.keys(kernelFilesPaths)) {
-                shellExec(
-                  `sudo cp -a /var/snap/maas/common/maas/image-storage/${kernelFilesPaths[file]} ${tftpRoot}${tftpSubDir}/pxe/${file}`,
-                );
+                shellExec(`sudo cp -a ${kernelFilesPaths[file]} ${tftpRoot}${tftpSubDir}/pxe/${file}`);
               }
-              // const configTxtSrc = fs.readFileSync(`${firmwarePath}/config.txt`, 'utf8');
-              // fs.writeFileSync(
-              //   `${tftpRoot}${tftpSubDir}/config.txt`,
-              //   configTxtSrc
-              //     .replace(`kernel=kernel8.img`, `kernel=vmlinuz`)
-              //     .replace(`# max_framebuffers=2`, `max_framebuffers=2`)
-              //     .replace(`initramfs initramfs8 followkernel`, `initramfs initrd.img followkernel`),
-              //   'utf8',
-              // );
-
-              // grub:
-              // set root=(pxe)
-
-              // UNDERPOST.NET UEFI/GRUB/MAAS RPi4 commissioning (ARM64)
-              const menuentryStr = 'underpost.net rpi4mb maas commissioning (ARM64)';
+
+              fs.mkdirSync(`${tftpRoot}/grub`, { recursive: true });
+
+              const menuentryStr = 'UNDERPOST.NET UEFI/GRUB/MAAS RPi4 commissioning (ARM64)';
               const grubCfgPath = `${tftpRoot}/grub/grub.cfg`;
               fs.writeFileSync(
                 grubCfgPath,
@@ -2086,29 +2234,30 @@ BOOT_ORDER=0x21`;
           };
           machine.hostname = machine.hostname.replaceAll(' ', '').replaceAll('.', '');
 
-          try {
-            let newMachine = shellExec(
-              `maas ${process.env.MAAS_ADMIN_USERNAME} machines create ${Object.keys(machine)
-                .map((k) => `${k}="${machine[k]}"`)
-                .join(' ')}`,
-              {
-                silent: true,
-                stdout: true,
-              },
-            );
-            newMachine = machineFactory(JSON.parse(newMachine));
-            machines.push(newMachine);
-            console.log(newMachine);
-            // commissioning_scripts=90-verify-user.sh
-            shellExec(
-              `maas ${process.env.MAAS_ADMIN_USERNAME} machine commission ${newMachine.system_id} enable_ssh=1 skip_bmc_config=1 skip_networking=1 skip_storage=1`,
-              {
-                silent: true,
-              },
-            );
-          } catch (error) {
-            logger.error(error, error.stack);
-          }
+          if (machine.hostname.match('generic-host'))
+            try {
+              let newMachine = shellExec(
+                `maas ${process.env.MAAS_ADMIN_USERNAME} machines create ${Object.keys(machine)
+                  .map((k) => `${k}="${machine[k]}"`)
+                  .join(' ')}`,
+                {
+                  silent: true,
+                  stdout: true,
+                },
+              );
+              newMachine = machineFactory(JSON.parse(newMachine));
+              machines.push(newMachine);
+              console.log(newMachine);
+              // commissioning_scripts=90-verify-user.sh
+              shellExec(
+                `maas ${process.env.MAAS_ADMIN_USERNAME} machine commission ${newMachine.system_id} enable_ssh=1 skip_bmc_config=1 skip_networking=1 skip_storage=1`,
+                {
+                  silent: true,
+                },
+              );
+            } catch (error) {
+              logger.error(error, error.stack);
+            }
         }
         // if (discoveries.length > 0) {
         //   shellExec(

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.814
+## underpost ci/cd cli v2.8.816
 
 ### Usage: `underpost [options] [command]`
   ```

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.8.814'
+      engine.version: '2.8.816'
     networks:
       - load-balancer
 

package/manifests/deployment/dd-template-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-template-development-blue
-          image: localhost/rockylinux9-underpost:v2.8.814
+          image: localhost/rockylinux9-underpost:v2.8.816
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-template-development-green
-          image: localhost/rockylinux9-underpost:v2.8.814
+          image: localhost/rockylinux9-underpost:v2.8.816
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/manifests/maas/maas-setup.sh

@@ -2,6 +2,7 @@
 set -euo pipefail
 
 sudo snap install jq
+# sudo snap install --channel=3.0/stable maas
 sudo snap install maas
 
 # Get default interface and IP address

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.814",
+    "version": "2.8.816",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/index.js

@@ -32,7 +32,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.814';
+  static version = 'v2.8.816';
   /**
    * Repository cli API
    * @static