From 84c924944f713bedd998597b94c08d75d6826ba6 Mon Sep 17 00:00:00 2001 From: Ueda Naoaki Date: Sun, 14 Jan 2024 13:06:18 +0900 Subject: Modify and add an RPi4 ignition --- Makefile | 7 +++++-- config.bu | 16 ++++++---------- config.ign | 29 +++++++++++++---------------- parts/rpi4-hostname.bu | 8 ++++++++ parts/timezone.bu | 6 ++++++ parts/users.bu | 9 +++++++++ rpi4.bu | 8 ++++++++ rpi4.ign | 21 +++++++++++++++++++++ 8 files changed, 76 insertions(+), 28 deletions(-) create mode 100644 parts/rpi4-hostname.bu create mode 100644 parts/timezone.bu create mode 100644 parts/users.bu create mode 100644 rpi4.bu create mode 100644 rpi4.ign diff --git a/Makefile b/Makefile index 38a1ac3..aa01cfa 100644 --- a/Makefile +++ b/Makefile @@ -2,5 +2,8 @@ BUTANE := podman run --rm --interactive --security-opt label=disable --volume ${ -include custom.mk -config.ign: config.bu - $(BUTANE) --pretty --strict $< > $@ +.PHONY: all +all: config.ign rpi4.ign + +%.ign: %.bu $(wildcard parts/*) + $(BUTANE) --pretty --strict $*.bu -d ./ > $@ diff --git a/config.bu b/config.bu index a46ffb5..ef24b42 100644 --- a/config.bu +++ b/config.bu @@ -1,11 +1,7 @@ variant: fcos -version: 1.4.0 -passwd: - users: - - name: nao - groups: - - sudo - ssh_authorized_keys: - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKpHdp0FGkOPQa+EfX1vx5dJv4/iL010bYcWX7Ekjfot - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN2YZ8KMBWGGO5NnQj8RkQ9u85/g5K5mCKWLrZHJf78p - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDxnZ/DjjELnTTGMuqWLo4J3r3fugET2M/qABBaZjtny +version: 1.5.0 +ignition: + config: + merge: + - local: parts/users.bu + - local: parts/timezone.bu diff --git a/config.ign b/config.ign index ef81f07..4c2876d 100644 --- a/config.ign +++ b/config.ign @@ -1,20 +1,17 @@ { "ignition": { - "version": "3.3.0" - }, - "passwd": { - "users": [ - { - "groups": [ - "sudo" - ], - "name": "nao", - "sshAuthorizedKeys": [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKpHdp0FGkOPQa+EfX1vx5dJv4/iL010bYcWX7Ekjfot", - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN2YZ8KMBWGGO5NnQj8RkQ9u85/g5K5mCKWLrZHJf78p", - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDxnZ/DjjELnTTGMuqWLo4J3r3fugET2M/qABBaZjtny" - ] - } - ] + "config": { + "merge": [ + { + "compression": "gzip", + "source": "data:;base64,H4sIAAAAAAAC/5SMy26yQBhA9zzFt/+jMOpEZMftR7lZGhKUjZnCIJc6gzNA1advbPsC7k5OTs5EREPYYEBVcKlMVMiGMwPQHM81pSdSfpWGAjBKKuQTAGbAyIUaUHBBfwSAlPWJjEPNRfOg5amj97/2t5eyntFygTHagGmapr2MH8RGn7mzQ3Hq4qfbBf227LX/Xrd/S8g/tzqg6YZLf1qpTagh7eNYZIe127UVH15dx4tjrgeRlXneHscsafX3LtmMOlbPOMAXO8hCkW/9aq33r66dG8tVp23dkKWpF43XLOQrfymW1Xh200WkXk3LInk7sLvyHQAA//8EudoaawEAAA==" + }, + { + "compression": "", + "source": "data:;base64,dmFyaWFudDogZmNvcwp2ZXJzaW9uOiAxLjUuMApzdG9yYWdlOgogIGxpbmtzOgogICAgLSBwYXRoOiAvZXRjL2xvY2FsdGltZQogICAgICB0YXJnZXQ6IC4uL3Vzci9zaGFyZS96b25laW5mby9Bc2lhL1Rva3lvCg==" + } + ] + }, + "version": "3.4.0" } } diff --git a/parts/rpi4-hostname.bu b/parts/rpi4-hostname.bu new file mode 100644 index 0000000..f371947 --- /dev/null +++ b/parts/rpi4-hostname.bu @@ -0,0 +1,8 @@ +variant: fcos +version: 1.5.0 +storage: + files: + - path: /etc/hostname + mode: 0644 + contents: + inline: pi4fcos1 diff --git a/parts/timezone.bu b/parts/timezone.bu new file mode 100644 index 0000000..ee9ea9a --- /dev/null +++ b/parts/timezone.bu @@ -0,0 +1,6 @@ +variant: fcos +version: 1.5.0 +storage: + links: + - path: /etc/localtime + target: ../usr/share/zoneinfo/Asia/Tokyo diff --git a/parts/users.bu b/parts/users.bu new file mode 100644 index 0000000..357f556 --- /dev/null +++ b/parts/users.bu @@ -0,0 +1,9 @@ +variant: fcos +version: 1.5.0 +passwd: + users: + - name: core + ssh_authorized_keys: + - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKpHdp0FGkOPQa+EfX1vx5dJv4/iL010bYcWX7Ekjfot + - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN2YZ8KMBWGGO5NnQj8RkQ9u85/g5K5mCKWLrZHJf78p + - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDxnZ/DjjELnTTGMuqWLo4J3r3fugET2M/qABBaZjtny diff --git a/rpi4.bu b/rpi4.bu new file mode 100644 index 0000000..fee1595 --- /dev/null +++ b/rpi4.bu @@ -0,0 +1,8 @@ +variant: fcos +version: 1.5.0 +ignition: + config: + merge: + - local: parts/users.bu + - local: parts/timezone.bu + - local: parts/rpi4-hostname.bu diff --git a/rpi4.ign b/rpi4.ign new file mode 100644 index 0000000..e838c8b --- /dev/null +++ b/rpi4.ign @@ -0,0 +1,21 @@ +{ + "ignition": { + "config": { + "merge": [ + { + "compression": "gzip", + "source": "data:;base64,H4sIAAAAAAAC/5SMy26yQBhA9zzFt/+jMOpEZMftR7lZGhKUjZnCIJc6gzNA1advbPsC7k5OTs5EREPYYEBVcKlMVMiGMwPQHM81pSdSfpWGAjBKKuQTAGbAyIUaUHBBfwSAlPWJjEPNRfOg5amj97/2t5eyntFygTHagGmapr2MH8RGn7mzQ3Hq4qfbBf227LX/Xrd/S8g/tzqg6YZLf1qpTagh7eNYZIe127UVH15dx4tjrgeRlXneHscsafX3LtmMOlbPOMAXO8hCkW/9aq33r66dG8tVp23dkKWpF43XLOQrfymW1Xh200WkXk3LInk7sLvyHQAA//8EudoaawEAAA==" + }, + { + "compression": "", + "source": "data:;base64,dmFyaWFudDogZmNvcwp2ZXJzaW9uOiAxLjUuMApzdG9yYWdlOgogIGxpbmtzOgogICAgLSBwYXRoOiAvZXRjL2xvY2FsdGltZQogICAgICB0YXJnZXQ6IC4uL3Vzci9zaGFyZS96b25laW5mby9Bc2lhL1Rva3lvCg==" + }, + { + "compression": "gzip", + "source": "data:;base64,H4sIAAAAAAAC/yyNTarDMAyE9z7FXODlB/y60G2EqzSCRAqWyPmLS2Y1zPDx3dyVLQlb8yi39FA3wjr9T0uJ9M4foQJsekiMAvzh4twJs2Sbd480PuX3AKe/hbC8an2G5pZi+aAjaoeaEC6tw7mWbwAAAP//HoeGtoMAAAA=" + } + ] + }, + "version": "3.4.0" + } +} -- cgit v1.2.3-54-g00ecf