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

(#2190228) Support defining mount units on the kernel command line #398

Closed
wants to merge 7 commits into from
Closed

(#2190228) Support defining mount units on the kernel command line #398

wants to merge 7 commits into from

Conversation

dtardon
Copy link
Member

@dtardon dtardon commented Jun 20, 2023 •
edited by jamacku
Loading

Resolves: #2190228

@mergify mergify bot added the pr/needs-ci Formerly needs-ci label Jun 20, 2023
@systemd-rhel-bot systemd-rhel-bot added the pr/needs-review Formerly needs-review label Jun 20, 2023
@systemd-rhel-bot systemd-rhel-bot changed the title Support defining mount units on the kernel command line (#2190228) Support defining mount units on the kernel command line Jun 20, 2023
@systemd-rhel-bot systemd-rhel-bot added the tracker/unapproved Formerly needs-acks label Jun 20, 2023
@mergify mergify bot removed the pr/needs-ci Formerly needs-ci label Jun 20, 2023
@systemd-rhel-bot systemd-rhel-bot removed pr/needs-review Formerly needs-review tracker/unapproved Formerly needs-acks labels Jul 12, 2023
yuwata and others added 7 commits July 18, 2023 12:58
@yuwata @dtardon
nulstr-util: make ret_size in strv_make_nulstr() optional
0813100 
(cherry picked from commit 16cda99c737714d6d259e45808e39f94408d90bd)

Related: #2190228
@yuwata @dtardon
fstab-generator: split out several functions from parse_fstab()
0bbebc5 
No functional changes, just refactoring and preparation for later
commits.

(cherry picked from commit cfeb4d378ecd1ea50c0a0248c384e49983511fa8)

Related: #2190228
@yuwata @dtardon
fstab-generator: call add_swap() earlier
a0d1a65 
As 'where' field will be ignored for swap entry.

(cherry picked from commit 256604ccddd41a16de329ff792c5f49d6750e510)

Related: #2190228
@yuwata @dtardon
fstab-generator: refuse invalid mount point path in fstab earlier
f80121b 
(cherry picked from commit 6742eca13497dd9dd548ba3e2ced2588d82720ac)

Related: #2190228
@yuwata @dtardon
fstab-generator: fix error code propagation in run_generator()
72272aa 
Previously, some errors might be ignored.

(cherry picked from commit 2646f1844553b5d9c6109ad6b1b86da0b6b1f248)

Related: #2190228
@yuwata @dtardon
fstab-generator: support defining mount units through kernel command …
0bf5d42 
…line

Now, the following kernel command line options are supported:
  systemd.mount-extra=what:where:fstype:options
  systemd.swap-extra=what:options

Closes #27260.

(cherry picked from commit 55365b0a233ae3024411fd0815ad930e20f6a3d6)

Resolves: #2190228
@mrc0mmand @dtardon
fstab-generator: use correct swap name var
d36e2ce 
Follow-up to 9445623363.

(cherry picked from commit 3aed25932891d447b5a7ceec6ab61813c06fb0ec)

Related: #2190228
@dtardon dtardon force-pushed the bz2190228-cmdline-mount-units branch from 360f288 to d36e2ce Compare July 18, 2023 11:12
@dtardon dtardon requested a review from msekletar July 18, 2023 11:12
@github-actions
Copy link

github-actions bot commented Jul 18, 2023 •
edited
Loading

Commit validation

Tracker - 2190228

The following commits meet all requirements

commit upstream
0813100 - nulstr-util: make ret_size in strv_make_nulstr() optional systemd/systemd@16cda99
0bbebc5 - fstab-generator: split out several functions from parse_fstab() systemd/systemd@cfeb4d3
a0d1a65 - fstab-generator: call add_swap() earlier systemd/systemd@256604c
f80121b - fstab-generator: refuse invalid mount point path in fstab earlier systemd/systemd@6742eca
72272aa - fstab-generator: fix error code propagation in run_generator() systemd/systemd@2646f18
0bf5d42 - fstab-generator: support defining mount units through kernel command l… systemd/systemd@55365b0
d36e2ce - fstab-generator: use correct swap name var systemd/systemd@3aed259

Tracker validation

Failed

🔴 Tracker #2190228 has not been approved

Success

🟢 Tracker #2190228 has set desired product: Red Hat Enterprise Linux 8
🟢 Tracker #2190228 has set desired component: systemd

Pull Request validation

Failed

🔴 Failed or pending checks - Tracker Validation[failure]
🔴 Approval - missing or changes were requested.

Success

🟢 Review - Reviewed by a member

@mergify mergify bot added the pr/needs-ci Formerly needs-ci label Jul 18, 2023
github-advanced-security[bot]
github-advanced-security bot found potential problems Jul 18, 2023
View reviewed changes
src/fstab-generator/fstab-generator.c Dismissed Show resolved Hide resolved
src/fstab-generator/fstab-generator.c Dismissed Show dismissed Hide dismissed
@mergify mergify bot removed the pr/needs-ci Formerly needs-ci label Jul 18, 2023
@systemd-rhel-bot systemd-rhel-bot added tracker/unapproved Formerly needs-acks and removed tracker/unapproved Formerly needs-acks labels Aug 15, 2023
@systemd-rhel-bot systemd-rhel-bot added tracker/unapproved Formerly needs-acks and removed tracker/unapproved Formerly needs-acks labels Aug 31, 2023
@systemd-rhel-bot systemd-rhel-bot added the tracker/unapproved Formerly needs-acks label Sep 7, 2023
@github-actions github-actions bot changed the title (#2190228) Support defining mount units on the kernel command line (2190228) Support defining mount units on the kernel command line Sep 19, 2023
@jamacku jamacku changed the title (2190228) Support defining mount units on the kernel command line (#2190228) Support defining mount units on the kernel command line Sep 19, 2023
@github-actions github-actions bot added pr/changes-requested pr/needs-ci Formerly needs-ci pr/needs-review Formerly needs-review and removed pr/changes-requested labels Oct 20, 2023
@github-actions github-actions bot added tracker/missing Formerly needs-bz and removed tracker/missing Formerly needs-bz labels Nov 29, 2023
@github-actions GitHub Actions

This comment was marked as duplicate.

Sign in to view
@jamacku
Copy link
Member

jamacku commented Jan 18, 2024

@dtardon Could you please have a look at the conflict in fstab-generator.c. Thank you

Also please reference the RHEL-5989 instead of #2190228

jamacku
jamacku requested changes Jan 18, 2024
View reviewed changes
Copy link
Member

@jamacku jamacku left a comment

Choose a reason for hiding this comment

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

Related upstream follow-ups:

We should include them as well.

@github-actions github-actions bot added pr/changes-requested and removed pr/needs-review Formerly needs-review labels Jan 18, 2024
@jamacku
Copy link
Member

jamacku commented Feb 5, 2024

It's too late for RHEL 8, hence closing this PR.

@jamacku jamacku closed this Feb 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jamacku jamacku jamacku requested changes

@msekletar msekletar Awaiting requested review from msekletar

Assignees
No one assigned
Labels
dont-merge needs-rebase pr/changes-requested pr/needs-ci Formerly needs-ci tracker/unapproved Formerly needs-acks
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@dtardon @jamacku @msekletar @systemd-rhel-bot @yuwata @mrc0mmand