-
Notifications
You must be signed in to change notification settings - Fork 363
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.
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
Fstab handling moves to blivet #6160
base: main
Are you sure you want to change the base?
Conversation
fb3c0b9
to
18bb618
Compare
18bb618
to
8481ca5
Compare
/kickstart-test --testtype storage |
/kickstart-test --testtype smoke |
There are some test failures in Web UI tests here. Some are because the PR is not rebased, (I will rebase to recheck) but some (the home-reuse scenario) tests look like real failures. I will debug these and get back to you |
Anaconda handling fstab is something that should be done by blivet. This moves the fstab logic into the blivet. Crypttab and blkidtab handling is not supported by blivet yet so it remains mostly unchanged (for now)
8481ca5
to
2989795
Compare
if device.type == "btrfs volume" and "subvol=" in options: | ||
log.debug("subvolume from %s for %s not found", options, devspec) | ||
continue | ||
# If a btrfs volume is found but a subvolume is expected, ignore the volume. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vojtechtrefny For some reason I think this does not work as expected. The Web UI test fail because the mount-points do not have subvolumes in the GetExistingSystems information for mount points.
My test has an fstab like this:
UUID=0d5f616b-6146-4a37-b7f7-9810fb3ed940 / btrfs compress=zstd:1,defaults,subvol=root 0 1
UUID=7a3fd253-11ba-432e-9d9a-98f07dfc5caa /boot ext4 defaults 0 0
UUID=0d5f616b-6146-4a37-b7f7-9810fb3ed940 /home btrfs compress=zstd:1,subvol=home 0 0
UUID=0d5f616b-6146-4a37-b7f7-9810fb3ed940 /var btrfs compress=zstd:1,subvol=var 0 0
UUID=D69D-DAED /boot/efi vfat defaults,umask=0077,shortname=winnt 0 0
The object for existing systems that I get from the API is:
[
{
"devices": {
"t": "as",
"v": [
"BTRFS-0d5f616b-6146-4a37-b7f7-9810fb3ed940",
"vda3",
"BTRFS-0d5f616b-6146-4a37-b7f7-9810fb3ed940",
"BTRFS-0d5f616b-6146-4a37-b7f7-9810fb3ed940",
"vda2"
]
},
"mount-points": {
"t": "a{ss}",
"v": {
"/": "BTRFS-0d5f616b-6146-4a37-b7f7-9810fb3ed940",
"/boot": "vda3",
"/home": "BTRFS-0d5f616b-6146-4a37-b7f7-9810fb3ed940",
"/var": "BTRFS-0d5f616b-6146-4a37-b7f7-9810fb3ed940",
"/boot/efi": "vda2"
}
},
"os-name": {
"t": "s",
"v": "Fedora Linux 43 for x86_64"
}
}
]
The subvolumes are not put correctly.
Rebased and updated version of #5793 Requires some fixes and changes in blivet that are not yet released so I am marking this as blocked. Blivet 3.12 will be available in Fedora 42, but this targets Fedora 43.