Skip to content

Commit

Permalink
Merge pull request #836 from bottlerocket-os/systemd-no-color
Browse files Browse the repository at this point in the history
Add systemd.log_color=0 to remove ANSI color escapes from console log
  • Loading branch information
tjkirch committed Mar 9, 2020
2 parents 32c5660 + 0662df3 commit d0ecc27
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/rpm2img
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ set timeout="0"
menuentry "Bottlerocket OS ${VERSION_ID}" {
linux (\$root)/vmlinuz root=/dev/dm-0 rootwait ro init=/sbin/preinit \\
console=tty0 console=ttyS0 random.trust_cpu=on selinux=1 enforcing=1 \\
systemd.log_target=journal-or-kmsg net.ifnames=0 biosdevname=0 \\
dm_verity.max_bios=-1 dm_verity.dev_wait=1 \\
systemd.log_target=journal-or-kmsg systemd.log_color=0 net.ifnames=0 \\
biosdevname=0 dm_verity.max_bios=-1 dm_verity.dev_wait=1 \\
dm-mod.create="root,,,ro,0 $VERITY_DATA_512B_BLOCKS verity $VERITY_VERSION PARTUUID=\$boot_uuid/PARTNROFF=1 PARTUUID=\$boot_uuid/PARTNROFF=2 \\
$VERITY_DATA_BLOCK_SIZE $VERITY_HASH_BLOCK_SIZE $VERITY_DATA_4K_BLOCKS 1 $VERITY_HASH_ALGORITHM $VERITY_ROOT_HASH $VERITY_SALT 1 restart_on_corruption"
}
Expand Down

0 comments on commit d0ecc27

Please sign in to comment.