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

fix: correct Fedora 40 detection, and be more verbose about version #13

Merged
merged 1 commit into from
Jan 12, 2025

Conversation

ABotelho23
Copy link
Contributor

@ABotelho23 ABotelho23 commented Jan 12, 2025

The below snippet from 1_prune.sh:

# Merge /usr/etc to /etc
# OSTree will error out if both dirs exist
# And rpm-ostree will be confused and use only one of them
if [ -d ./usr/etc ]; then
    echo
    echo WARNING: FOUND /usr/etc. MERGING TO ETC FOR COMPATIBILITY
    echo EXPECT PERMISSIONS ISSUES ON THE MERGED PATHS
    echo The following files from /usr/etc will be merged to /etc:
    tree ./usr/etc

    echo
    $RSYNC ./usr/etc/ ./etc
    rm -rf ./usr/etc
fi

# Move /etc to /usr/etc
mv ./etc ./usr/

seems to tell me that there is no /etc/os-release, only a /usr/etc/os-release, which means Fedora 40 images have been getting "detected" as "Fedora 40".

I've also added some output for when Fedora 41+ gets detected.

@antheas
Copy link
Collaborator

antheas commented Jan 12, 2025

you only replaced the -f check and left the check below as is

@ABotelho23
Copy link
Contributor Author

yup, one sec

@ABotelho23
Copy link
Contributor Author

Fixed.

@antheas antheas merged commit 0aee79e into hhd-dev:master Jan 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants