fix: correct Fedora 40 detection, and be more verbose about version
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.
合并状态:已合并 合并于 2025-01-12 关闭于 2025-01-12 3 条评论