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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

vojtechtrefny
Copy link
Contributor

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.

@vojtechtrefny vojtechtrefny added blocked Don't merge this pull request! f43 labels Feb 13, 2025
@vojtechtrefny vojtechtrefny marked this pull request as draft February 13, 2025 12:00
@vojtechtrefny
Copy link
Contributor Author

/kickstart-test --testtype storage

@vojtechtrefny vojtechtrefny marked this pull request as ready for review March 3, 2025 13:38
@vojtechtrefny vojtechtrefny removed the blocked Don't merge this pull request! label Mar 3, 2025
@KKoukiou
Copy link
Contributor

KKoukiou commented Mar 6, 2025

/kickstart-test --testtype smoke

@KKoukiou KKoukiou self-requested a review March 6, 2025 11:42
@KKoukiou
Copy link
Contributor

KKoukiou commented Mar 7, 2025

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)
@KKoukiou KKoukiou force-pushed the main_fstab-blivet branch from 8481ca5 to 2989795 Compare March 7, 2025 10:42
@KKoukiou KKoukiou temporarily deployed to gh-cockpituous March 7, 2025 10:42 — with GitHub Actions Inactive
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.
Copy link
Contributor

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

3 participants