Skip to content

OSModifier: Restore SELinux config file update for UKI-based boot#266

Merged
elainezhao1 merged 1 commit into
mainfrom
user/elaine/emu-selinux
Jun 10, 2025
Merged

OSModifier: Restore SELinux config file update for UKI-based boot#266
elainezhao1 merged 1 commit into
mainfrom
user/elaine/emu-selinux

Conversation

@elainezhao1
Copy link
Copy Markdown
Contributor

@elainezhao1 elainezhao1 commented Jun 9, 2025

This PR restores a missing call to UpdateSELinuxModeInConfigFile() in the SELinux setup logic. It was unintentionally removed earlier.


Checklist

  • Tests added/updated
  • Documentation updated (if needed)
  • Code conforms to style guidelines

@elainezhao1 elainezhao1 requested a review from a team as a code owner June 9, 2025 23:56
return err
}

err = imagecustomizerlib.UpdateSELinuxModeInConfigFile(selinuxMode, dummyChroot)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Can a test be added to ensure this isn't removed in future?

@elainezhao1 elainezhao1 merged commit f7b394b into main Jun 10, 2025
8 checks passed
@elainezhao1 elainezhao1 deleted the user/elaine/emu-selinux branch June 10, 2025 17:16
elainezhao1 added a commit that referenced this pull request Jun 13, 2025
…cenarios (#269)

<!-- Description: Please provide a summary of the changes and the
motivation behind them. -->
a follow up for
#266
Enhance boot customization logic to distinguish GRUB and UKI scenarios

- Introduce explicit checks for /boot/grub2/grub.cfg and
/etc/default/grub to determine if GRUB is in use.
- Conditionally apply GRUB-specific logic (e.g., kernel command line
updates, SELinux boot parameters) only when GRUB is present.
- Refactor SELinux handling into updateSELinuxForGrubBasedBoot and
updateSELinuxForUkiBoot for clarity and separation of concerns.

---

### **Checklist**
- [ ] Tests added/updated
- [ ] Documentation updated (if needed)
- [ ] Code conforms to style guidelines
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.

3 participants