Skip to content

Commit

Permalink
Enable selinux on Ubuntu
Browse files Browse the repository at this point in the history
Signed-off-by: Mauro Morales <[email protected]>
  • Loading branch information
mauromorales committed Jun 6, 2023
1 parent 5cb6baa commit e837a80
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
6 changes: 0 additions & 6 deletions images/Dockerfile.ubuntu-arm-rpi
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,6 @@ RUN ln -s /usr/bin/grub-editenv /usr/bin/grub2-editenv
RUN systemctl enable systemd-networkd
RUN systemctl enable ssh

# workaround https://github.com/systemd/systemd/issues/12231
# see also: https://github.com/OSInside/kiwi/issues/1015
# TODO: backport patch into packages
COPY images/dracut-missing-overlay-dirs.patch /
RUN cd /usr/lib/dracut/modules.d/90dmsquash-live && patch < /dracut-missing-overlay-dirs.patch && rm -rf /dracut-missing-overlay-dirs.patch

# Fixup sudo perms
RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo

Expand Down
5 changes: 1 addition & 4 deletions overlay/files-ubuntu/etc/cos/bootargs.cfg
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
set kernel=/boot/vmlinuz
if [ -n "$recoverylabel" ]; then
# Removed console=ttyS0 (don't use it), and also rd.neetnet=1 which results in dupliate ips
# Added fancy vga=795 nomodeset
set kernelcmd="console=tty1 console=ttyS0 root=live:LABEL=$recoverylabel rd.live.dir=/ rd.live.squashimg=$img panic=5 rd.cos.oemlabel=COS_OEM"
else
# set kernelcmd="console=tty1 root=LABEL=$label cos-img/filename=$img panic=5 security=selinux selinux=1 rd.cos.oemlabel=COS_OEM rd.neednet=0 vga=795 nomodeset"
set kernelcmd="console=tty1 console=ttyS0 root=LABEL=$label cos-img/filename=$img panic=5 security=selinux selinux=0 rd.cos.oemlabel=COS_OEM rd.neednet=0 vga=795"
set kernelcmd="console=tty1 console=ttyS0 root=LABEL=$label cos-img/filename=$img panic=5 security=selinux selinux=1 rd.cos.oemlabel=COS_OEM rd.neednet=0 vga=795"
fi

set initramfs=/boot/initrd

0 comments on commit e837a80

Please sign in to comment.