mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-06 01:41:35 +01:00
sys-apps/ignition, sys-kernel/bootengine: Migrate Ignition unit files
The Ignition units are only used in the initramfs and are intertwined with several other units in bootengine. Move them into bootengine for simplicity.
This commit is contained in:
parent
4e1aa74339
commit
b54b3e3c28
@ -1,22 +0,0 @@
|
||||
[Unit]
|
||||
Description=Ignition (disks)
|
||||
DefaultDependencies=false
|
||||
|
||||
Requires=local-fs-pre.target
|
||||
Before=local-fs-pre.target
|
||||
|
||||
# setup networking
|
||||
Wants=systemd-networkd.service
|
||||
After=systemd-networkd.service
|
||||
|
||||
# generate resolv.conf
|
||||
Wants=systemd-resolved.service
|
||||
After=systemd-resolved.service
|
||||
|
||||
# prevent racing with sgdisk and its subsequent udev activity
|
||||
After=disk-uuid.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
EnvironmentFile=/run/ignition.env
|
||||
ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=disks
|
||||
@ -1,27 +0,0 @@
|
||||
[Unit]
|
||||
Description=Ignition (files)
|
||||
DefaultDependencies=false
|
||||
Before=initrd-parse-etc.service
|
||||
|
||||
Requires=initrd-root-fs.target
|
||||
After=initrd-root-fs.target
|
||||
|
||||
Requires=ignition-disks.service
|
||||
After=ignition-disks.service
|
||||
|
||||
# setup the root filesystem before we try do things like create users on it.
|
||||
Requires=initrd-setup-root.service
|
||||
After=initrd-setup-root.service
|
||||
|
||||
# setup networking
|
||||
Wants=systemd-networkd.service
|
||||
After=systemd-networkd.service
|
||||
|
||||
# generate resolv.conf
|
||||
Wants=systemd-resolved.service
|
||||
After=systemd-resolved.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
EnvironmentFile=/run/ignition.env
|
||||
ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=files
|
||||
@ -1,12 +0,0 @@
|
||||
[Unit]
|
||||
DefaultDependencies=false
|
||||
Before=initrd-switch-root.target
|
||||
|
||||
OnFailure=emergency.target
|
||||
OnFailureJobMode=replace-irreversibly
|
||||
|
||||
Requires=ignition-disks.service
|
||||
After=ignition-disks.service
|
||||
|
||||
Requires=ignition-files.service
|
||||
After=ignition-files.service
|
||||
@ -31,8 +31,4 @@ src_compile() {
|
||||
|
||||
src_install() {
|
||||
newbin ${GOBIN}/internal ${PN}
|
||||
|
||||
systemd_dounit "${FILESDIR}"/ignition.target
|
||||
systemd_dounit "${FILESDIR}"/ignition-disks.service
|
||||
systemd_dounit "${FILESDIR}"/ignition-files.service
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com"
|
||||
if [[ "${PV}" == 9999 ]]; then
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
else
|
||||
CROS_WORKON_COMMIT="797d0610fb66b67f2b375f6b61f0ac5c21fe30ea"
|
||||
CROS_WORKON_COMMIT="00323315b0fee43cfc9c4f5eeea77d9f523473ea"
|
||||
KEYWORDS="amd64 arm arm64 x86"
|
||||
fi
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user