Skip to content

ignition-ostree: Split unit for sysroot mounting #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jlebon merged 1 commit into from
Oct 31, 2019
Merged

ignition-ostree: Split unit for sysroot mounting #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...ree/ignition-ostree-mount-sysroot.service → ...on-ostree-mount-firstboot-sysroot.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
[Unit]
Description=Mount OSTree /sysroot
Description=Ignition OSTree: Mount (firstboot) /sysroot
# These dependencies should match the "other" in
# ignition-ostree-mount-subsequent-sysroot.service
DefaultDependencies=false
# If root is specified, then systemd's generator will win
ConditionKernelCommandLine=!root
ConditionKernelCommandLine=ostree
ConditionPathExists=!/run/ostree-live

# There can be only one, Highlander style
Conflicts=ignition-ostree-mount-subsequent-sysroot.service
Before=initrd-root-fs.target
After=ignition-disks.service
# These have an explicit dependency on After=sysroot.mount today
Expand Down
23 changes: 23 additions & 0 deletions ...r/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-subsequent-sysroot.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[Unit]
Description=CoreOS: Mount (subsequent) /sysroot
# These dependencies should match the "other" in
# ignition-ostree-mount-firsboot-sysroot.service
DefaultDependencies=false
# If root is specified, then systemd's generator will win
ConditionKernelCommandLine=!root
ConditionKernelCommandLine=ostree
ConditionPathExists=!/run/ostree-live
# There can be only one, Highlander style
Conflicts=ignition-ostree-mount-firstboot-sysroot.service
# And in contrast to the firstboot, we expect
# the root device to be ready.
Requires=dev-disk-by\x2dlabel-root.device
After=dev-disk-by\x2dlabel-root.device
Before=initrd-root-fs.target
# This has an explicit dependency on After=sysroot.mount today
Before=ostree-prepare-root.service

[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/sbin/ignition-ostree-mount-sysroot
23 changes: 11 additions & 12 deletions overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,26 @@ depends() {
}

install_ignition_unit() {
unit=$1; shift
local unit=$1; shift
local target=${1:-complete}
inst_simple "$moddir/$unit" "$systemdsystemunitdir/$unit"
ln_r "../$unit" "$systemdsystemunitdir/ignition-complete.target.requires/$unit"
local targetpath="$systemdsystemunitdir/ignition-${target}.target.requires/"
mkdir -p "${initdir}/${targetpath}"
ln_r "../$unit" "${targetpath}/${unit}"
}

install() {
inst_multiple \
systemd-sysusers \
systemd-tmpfiles

mkdir -p "$initdir/$systemdsystemunitdir/ignition-complete.target.requires"
for x in mount populate; do
install_ignition_unit ignition-ostree-${x}-var.service
inst_script "$moddir/ignition-ostree-${x}-var.sh" "/usr/sbin/ignition-ostree-${x}-var"
done

install_ignition_unit ignition-ostree-mount-var.service
inst_script "$moddir/ignition-ostree-mount-var.sh" \
"/usr/sbin/ignition-ostree-mount-var"

install_ignition_unit ignition-ostree-populate-var.service
inst_script "$moddir/ignition-ostree-populate-var.sh" \
"/usr/sbin/ignition-ostree-populate-var"

install_ignition_unit ignition-ostree-mount-sysroot.service
install_ignition_unit ignition-ostree-mount-firstboot-sysroot.service
install_ignition_unit ignition-ostree-mount-subsequent-sysroot.service subsequent
inst_script "$moddir/ignition-ostree-mount-sysroot.sh" \
"/usr/sbin/ignition-ostree-mount-sysroot"
}