Skip to content
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

Jump to bottom

overlay.d: add udev rule for creating stable symlink to boot disk #1308

Merged
merged 1 commit into from
Feb 2, 2022
Merged

overlay.d: add udev rule for creating stable symlink to boot disk #1308

merged 1 commit into from
Feb 2, 2022

Conversation

nikita-dubrovskii
Copy link
Contributor

@nikita-dubrovskii nikita-dubrovskii commented Oct 26, 2021 •
edited
Loading

Creates '/dev/disk/coreos-root-disk' symlink to boot disk for
use by Ignition config, therefore 'storage.disks' section
could be defined without hardcoding /dev/sda, /dev/vda, etc.

Issue: coreos/fedora-coreos-tracker#759

@nikita-dubrovskii nikita-dubrovskii mentioned this pull request Oct 26, 2021
Closed
bgilbert
bgilbert reviewed Nov 4, 2021
View reviewed changes
Copy link
Contributor

@bgilbert bgilbert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, this looks great. Some questions about dependencies, and I'm not sure about the partx/trigger/settle part.

overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-root-symlink.service Outdated Show resolved Hide resolved
overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-root-symlink.service Outdated Show resolved Hide resolved
overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/create-root-symlink.sh Outdated Show resolved Hide resolved
overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/create-root-symlink.sh Outdated
Comment on lines 9 to 14
for dev in $(lsblk -o NAME --noheadings --nodeps --list --paths); do
partx -u ${dev}
done

udevadm trigger
udevadm settle
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What problem is this code solving? Is there a more targeted way of doing it than retriggering every device?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for some reason on s390x WWN is not always present in lsblk output, so this udev/partx code is used to mitigate that problem

overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/module-setup.sh Outdated Show resolved Hide resolved
@bgilbert
Copy link
Contributor

bgilbert commented Nov 4, 2021

Also, I agree with coreos/coreos-assembler#2517 (comment) that the kola test should move into this repo.

@nikita-dubrovskii
Copy link
Contributor Author

Also, I agree with coreos/coreos-assembler#2517 (comment) that the kola test should move into this repo.

done.

@nikita-dubrovskii
Copy link
Contributor Author

coreos/ignition#1278

jlebon
jlebon reviewed Jan 28, 2022
View reviewed changes
Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use boot instead of root? It's mostly equivalent because all we care about for this is pre-ignition-disks in which case boot and root are on the same disk. But I like boot because that's what #1269 targets, so we know we'll only have a single boot filesystem.

overlay.d/05core/usr/lib/udev/rules.d/99-zz-coreos-stable-root.rules Outdated Show resolved Hide resolved
overlay.d/05core/usr/lib/udev/rules.d/99-zz-coreos-stable-root.rules Outdated Show resolved Hide resolved
overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-disk-contains-fs.sh Outdated Show resolved Hide resolved
overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-disk-contains-fs.sh Outdated Show resolved Hide resolved
tests/kola/ignition/stable-root/test.sh Outdated
Comment on lines 10 to 13
ok() {
echo "ok" "$@"
}

fatal() {
echo "$@" >&2
exit 1
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check out the other tests which use commonlib.sh to get these functions.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

other ignition tests use copy-paste )

@nikita-dubrovskii nikita-dubrovskii changed the title overlay.d: create symlink to the disk holding root partition overlay.d: add udev rule for creating stable symlink to boot disk Jan 31, 2022
jlebon
jlebon previously approved these changes Feb 1, 2022
View reviewed changes
overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-teardown-initramfs.sh Outdated Show resolved Hide resolved
overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/module-setup.sh Outdated Show resolved Hide resolved
overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/module-setup.sh Outdated Show resolved Hide resolved
overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-disk-contains-fs.sh
if [[ "$name" =~ ${disk}p?[[:digit:]] ]] && [[ -e "/sys/block/$disk/$name/start" ]];
then
eval $(udevadm info --query=property -n /dev/$name | grep -e ID_FS_LABEL -e PARTNAME)
if [[ "${ID_FS_LABEL:-}" == "$label" ]] || [[ "${PARTNAME:-}" == "$label" ]]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ID_FS_LABEL is not always available.

Ahh OK. Hmm, that's unfortunate. Using the partition name rather than the filesystem label is not as good because we have expectations around the latter but not necessarily the former (e.g. I don't think anything would actually break if we have multiple partitions labeled boot). OTOH, it's not unreasonable to extend our requirement to partition names. So... let's roll with it!

@nikita-dubrovskii
overlay.d: add udev rule for creating stable symlink to boot disk
3cb083d 
Creates '/dev/disk/coreos-boot-disk' symlink to boot disk for
use by Ignition config, therefore 'storage.disks' section
could be defined without hardcoding /dev/sda, /dev/vda, etc.

Issue: coreos/fedora-coreos-tracker#759

Signed-off-by: Nikita Dubrovskii <nikita@linux.ibm.com>
jlebon
jlebon approved these changes Feb 2, 2022
View reviewed changes
Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

@jlebon jlebon merged commit 6d7b9ad into coreos:testing-devel Feb 2, 2022
@jlebon jlebon mentioned this pull request Feb 2, 2022
Closed
@jlebon jlebon mentioned this pull request Feb 4, 2022
Closed
@bgilbert bgilbert mentioned this pull request Feb 22, 2022
Closed
@miabbott miabbott mentioned this pull request Mar 22, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bgilbert bgilbert bgilbert left review comments

@jlebon jlebon jlebon approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nikita-dubrovskii @bgilbert @jlebon