Skip to content

Revert "ignition-ostree-mount-sysroot" #434

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
cgwalters merged 1 commit into from
May 29, 2020
Merged

Revert "ignition-ostree-mount-sysroot" #434

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
1 change: 0 additions & 1 deletion ...sr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-firstboot-sysroot.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,4 @@ Before=ostree-prepare-root.service ignition-remount-sysroot.service
[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=-/run/sysroot.env
ExecStart=/usr/sbin/ignition-ostree-mount-sysroot
1 change: 0 additions & 1 deletion ...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
Expand Up @@ -21,5 +21,4 @@ Before=ostree-prepare-root.service
[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=-/run/sysroot.env
ExecStart=/usr/sbin/ignition-ostree-mount-sysroot
5 changes: 1 addition & 4 deletions overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-sysroot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ set -euo pipefail
# In the future this will be augmented with a check for whether
# or not we've reprovisioned the rootfs, since we don't want to
# force on prjquota there.
rootpath="${ROOT_DEVICE_PATH:-/dev/disk/by-label/root}"

# If root is on a multipath device, we use that one.
# this link is created by our own udev rule.
rootpath=/dev/disk/by-label/root
if ! [ -b "${rootpath}" ]; then
echo "ignition-ostree-mount-sysroot: Failed to find ${rootpath}" 1>&2
exit 1
Expand Down