-
Notifications
You must be signed in to change notification settings - Fork 273
dracut/30ignition/module-setup.sh: include groupmod binary in initramfs #2190
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -14,9 +14,12 @@ depends() { | |||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| install_ignition_unit() { | ||||||||||||||||||||
| local unit="$1"; shift | ||||||||||||||||||||
| local target="${1:-ignition-complete.target}"; shift | ||||||||||||||||||||
| local instantiated="${1:-$unit}"; shift | ||||||||||||||||||||
| local unit="$1" | ||||||||||||||||||||
prestist marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||||||||||||||
| shift | ||||||||||||||||||||
| local target="${1:-ignition-complete.target}" | ||||||||||||||||||||
| shift | ||||||||||||||||||||
| local instantiated="${1:-$unit}" | ||||||||||||||||||||
| shift | ||||||||||||||||||||
|
Comment on lines
+17
to
+22
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. While you're refactoring this for style, you can simplify the argument parsing. Using positional parameters directly (
Suggested change
|
||||||||||||||||||||
| inst_simple "$moddir/$unit" "$systemdsystemunitdir/$unit" | ||||||||||||||||||||
| # note we `|| exit 1` here so we error out if e.g. the units are missing | ||||||||||||||||||||
| # see https://github.com/coreos/fedora-coreos-config/issues/799 | ||||||||||||||||||||
|
|
@@ -33,6 +36,7 @@ install() { | |||||||||||||||||||
| # present | ||||||||||||||||||||
| inst_multiple -o \ | ||||||||||||||||||||
| groupadd \ | ||||||||||||||||||||
| groupmod \ | ||||||||||||||||||||
| groupdel \ | ||||||||||||||||||||
| mkfs.btrfs \ | ||||||||||||||||||||
| mkfs.ext4 \ | ||||||||||||||||||||
|
|
@@ -110,23 +114,22 @@ install() { | |||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| installkernel() { | ||||||||||||||||||||
| # required by hyperv platform to read kvp from the kernel | ||||||||||||||||||||
| instmods hv_utils | ||||||||||||||||||||
| # required by hyperv platform to read kvp from the kernel | ||||||||||||||||||||
| instmods hv_utils | ||||||||||||||||||||
|
|
||||||||||||||||||||
| # required by applehv platform to read ignition file through vsock | ||||||||||||||||||||
| instmods -c vsock | ||||||||||||||||||||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmm, between this formatting change and the "shift" changes above, I think we can keep the formatting the same or make it an intentional commit along so that functional and stylistic choices are separated. |
||||||||||||||||||||
| instmods -c vmw_vsock_virtio_transport_common | ||||||||||||||||||||
| instmods -c vmw_vsock_virtio_transport | ||||||||||||||||||||
| # required by applehv platform to read ignition file through vsock | ||||||||||||||||||||
| instmods -c vsock | ||||||||||||||||||||
| instmods -c vmw_vsock_virtio_transport_common | ||||||||||||||||||||
| instmods -c vmw_vsock_virtio_transport | ||||||||||||||||||||
|
|
||||||||||||||||||||
| # required for cex card early initialization | ||||||||||||||||||||
| if [[ ${DRACUT_ARCH:-$(uname -m)} == s390x ]]; then | ||||||||||||||||||||
| # required for cex card early initialization | ||||||||||||||||||||
| if [[ ${DRACUT_ARCH:-$(uname -m)} == s390x ]]; then | ||||||||||||||||||||
| instmods -c zcrypt_cex4 | ||||||||||||||||||||
| instmods -c pkey_cca | ||||||||||||||||||||
| fi | ||||||||||||||||||||
| fi | ||||||||||||||||||||
|
|
||||||||||||||||||||
| # required by nvidiabluefield platform to read ignition file through bootfifo sysfs interface | ||||||||||||||||||||
| if [[ ${DRACUT_ARCH:-$(uname -m)} == aarch64 ]]; then | ||||||||||||||||||||
| # required by nvidiabluefield platform to read ignition file through bootfifo sysfs interface | ||||||||||||||||||||
| if [[ ${DRACUT_ARCH:-$(uname -m)} == aarch64 ]]; then | ||||||||||||||||||||
| instmods -c mlxbf_bootctl | ||||||||||||||||||||
| fi | ||||||||||||||||||||
| fi | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
Uh oh!
There was an error while loading. Please reload this page.