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

Adopt new layout for files/, env/, hooks/ #302

Merged
merged 1 commit into from
Mar 24, 2025
Merged

Adopt new layout for files/, env/, hooks/ #302

merged 1 commit into from
Mar 24, 2025

Conversation

zeha
Copy link
Member

@zeha zeha commented Jan 30, 2025 •
edited
Loading

Implements @akorn's "alternate layout" from #267

@zeha zeha requested a review from mika January 30, 2025 16:15
@zeha zeha self-assigned this Jan 30, 2025
@zeha zeha changed the title minifai: adapt to new layout of files/, env/, hooks/ Adopt new layout for files/, env/, hooks/ Jan 30, 2025
@zeha zeha marked this pull request as ready for review January 30, 2025 16:18
@zeha zeha force-pushed the zeha/minifai-layout branch from f83fff0 to 1091d24 Compare January 30, 2025 17:51
@zeha zeha mentioned this pull request Jan 30, 2025
Draft
2 tasks
@zeha zeha force-pushed the zeha/minifai-layout branch 2 times, most recently from 359f688 to 5e2e9a1 Compare January 30, 2025 21:48
akorn
akorn reviewed Jan 31, 2025
View reviewed changes
usr/lib/grml-live/minifai
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe it's just me, but I find the fcopy logic hard to follow without comments. The function and variable names aren't really intuitive for me.

mika
mika reviewed Jan 31, 2025
View reviewed changes
Copy link
Member

@mika mika left a comment

Choose a reason for hiding this comment

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

You used my migration script from #301, right?

Basically LGTM, if we're all fine with switching to this approach.
We should probably provide proper documentation and debian/NEWS information regarding this change?

@zeha
Copy link
Member Author

zeha commented Jan 31, 2025 •
edited
Loading

I used the script from #301 yes. Maybe you want to put NEWS and migration advice into #301?

Regarding docs, we'll need general docs on how things work once we've walked away from how FAI works. Not sure where to put it; probably a new file in docs/?

@mika
Copy link
Member

mika commented Jan 31, 2025

I used the script from #301 yes. Maybe you want to put NEWS and migration advice into #301?

ACK, good idea!

Regarding docs, we'll need general docs on how things work once we've walked away from how FAI works. Not sure where to put it; probably a new file in docs/?

Indeed, that sounds like a good idea as well!

@zeha
Adopt new layout for files/, class/, hooks/
3a4bd41 
files/<path>/<CLASS> becomes files/<CLASS>/<path>.
class/<CLASS>.var becomes env/<CLASS>.
hooks/<hookname>.<CLASS> becomes hooks/<CLASS>/<hookname>.
@zeha zeha force-pushed the zeha/minifai-layout branch from 5e2e9a1 to 3a4bd41 Compare March 24, 2025 08:32
@zeha
Copy link
Member Author

zeha commented Mar 24, 2025

(Rebased)

mika added a commit that referenced this pull request Mar 24, 2025
@mika
Provide migration script migrate-to-minifai
09fdf0d 
Executing it converts our existing config/* from FAI layout (e.g.
config/files/$FILENAME/$CLASS) into the new minifai layout (e.g.
config/files/$CLASS/$FILENAME).

See #267 +
    #302
@mika mika merged commit 70fa78a into master Mar 24, 2025
12 checks passed
@zeha zeha deleted the zeha/minifai-layout branch March 24, 2025 10:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mika mika mika left review comments

@akorn akorn akorn left review comments

Assignees

@zeha zeha

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@zeha @mika @akorn