particle-os/debian-image-builder-frontend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

src: move the first boot service into constants.ts

Browse source 
I don't think there's a value in having the unit encoded in base64.
It looks fishy, and it's error prone. We discovered that the
custom-first-boot.service file in aux was different than the base64-
encoded string. There was nothing malicious, but we apparently forgot
to rerun the Makefile target.

Instead, we can just put the raw script into constants.js and base64-
encode it on the fly. The cost is close to zero.

This way, we can also get rid of the aux dir, and of the Makefile
target. 🧹
This commit is contained in:
Ondřej Budai 2024-10-24 17:29:08 +02:00 • committed by Ondřej Budai
parent 493649f766
commit 12da2f7c43
3 changed files with 21 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -1,10 +1,7 @@
FISTBOOT_SERVICE := $(shell base64 -w0 < aux/custom-first-boot.service)
help:
@cat Makefile
src/constants.ts: aux/custom-first-boot.service
sed -i "s/.*FIRST_BOOT_SERVICE_DATA.*/export const FIRST_BOOT_SERVICE_DATA = '$(FISTBOOT_SERVICE)';/" $@
@cat Makefiles
.PHONY: prep
prep: src/constants.ts

19
aux/custom-first-boot.service
View file

@ -1,19 +0,0 @@
[Unit]
Description=Custom first boot script
ConditionFileIsExecutable=/usr/local/sbin/custom-first-boot
ConditionPathExists=!/var/local/.custom-first-boot-done
Wants=network-online.target
Wants=osbuild-first-boot.target
After=network-online.target
After=osbuild-first-boot.service
[Service]
Type=oneshot
ExecStart=/usr/local/sbin/custom-first-boot
ExecStartPost=/usr/bin/touch /var/local/.custom-first-boot-done
RemainAfterExit=yes
[Install]
WantedBy=basic.target
WantedBy=multi-user.target
WantedBy=graphical.target

23
src/constants.ts
View file

@ -223,9 +223,26 @@ export const EPEL_9_REPO_DEFINITION = {
export const DEBOUNCED_SEARCH_WAIT_TIME = 500;
export const UNIQUE_VALIDATION_DELAY = 300;
// Use `make` to generate the following line.
// prettier-ignore
export const FIRST_BOOT_SERVICE_DATA = 'W1VuaXRdCkRlc2NyaXB0aW9uPUN1c3RvbSBmaXJzdCBib290IHNjcmlwdApDb25kaXRpb25GaWxlSXNFeGVjdXRhYmxlPS91c3IvbG9jYWwvc2Jpbi9jdXN0b20tZmlyc3QtYm9vdApDb25kaXRpb25GaXJzdEJvb3Q9eWVzCgpXYW50cz1maXJzdC1ib290LWNvbXBsZXRlLnRhcmdldApXYW50cz1uZXR3b3JrLW9ubGluZS50YXJnZXQKV2FudHM9b3NidWlsZC1maXJzdC1ib290LnRhcmdldApCZWZvcmU9Zmlyc3QtYm9vdC1jb21wbGV0ZS50YXJnZXQKQWZ0ZXI9bmV0d29yay1vbmxpbmUudGFyZ2V0CkFmdGVyPW9zYnVpbGQtZmlyc3QtYm9vdC5zZXJ2aWNlCgpbU2VydmljZV0KVHlwZT1vbmVzaG90CkV4ZWNTdGFydD0vdXNyL2xvY2FsL3NiaW4vY3VzdG9tLWZpcnN0LWJvb3QKUmVtYWluQWZ0ZXJFeGl0PXllcwoKW0luc3RhbGxdCldhbnRlZEJ5PWJhc2ljLnRhcmdldApXYW50ZWRCeT1tdWx0aS11c2VyLnRhcmdldApXYW50ZWRCeT1ncmFwaGljYWwudGFyZ2V0Cg==';
export const FIRST_BOOT_SERVICE_DATA = btoa(`[Unit]
Description=Custom first boot script
ConditionFileIsExecutable=/usr/local/sbin/custom-first-boot
ConditionPathExists=!/var/local/.custom-first-boot-done
Wants=network-online.target
Wants=osbuild-first-boot.target
After=network-online.target
After=osbuild-first-boot.service
[Service]
Type=oneshot
ExecStart=/usr/local/sbin/custom-first-boot
ExecStartPost=/usr/bin/touch /var/local/.custom-first-boot-done
RemainAfterExit=yes
[Install]
WantedBy=basic.target
WantedBy=multi-user.target
WantedBy=graphical.target
`);
export const FIRST_BOOT_SERVICE = 'custom-first-boot';