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.

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

factory: handle properly snapd_recovery_mode based on modeenv value #214

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions factory/usr/lib/systemd/system-generators/journald-console
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#!/bin/sh
if ! grep -q 'snapd_recovery_mode=install' /proc/cmdline
then

mode="$(/usr/libexec/core/get-mode mode)" || mode="$(/usr/libexec/core/get-arg snapd_recovery_mode)" || mode="run"

if [ "${mode}" = "run" ]; then
# remove any previous overrides
rm -rf /run/systemd/journald.conf.d/core-override.conf
exit 0
fi

Expand Down
7 changes: 7 additions & 0 deletions factory/usr/lib/the-modeenv
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ if [ "${mode}" = "run" ]; then
elif [ -f /run/mnt/ubuntu-boot/uboot/ubuntu/boot.sel ]; then
echo '/run/mnt/ubuntu-boot/uboot/ubuntu /boot/uboot none bind 0 0' >> /run/image.fstab
fi
# if there is override for journald.conf, remove it, it has ForwardToConsole=true
# also modify generator, as current mode is now new run mode
if [ -f /run/systemd/journald.conf.d/core-override.conf ]; then
rm /run/systemd/journald.conf.d/core-override.conf
cmdline_mode="$(/usr/libexec/core/get-arg snapd_recovery_mode)
sed -i 's/snapd_recovery_mode=run/snapd_recovery_mode='"${cmdline_mode}"'/g' /usr/lib/systemd/system-generators/journald-console
fi
Copy link
Contributor

Choose a reason for hiding this comment

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

is this hunk still needed, given the improved generator? cause in core22 pull request it is now not needed, or am i missing some other core20 vs core22 differences?

fi
mount -o bind /run/image.fstab /sysroot/etc/fstab
umount -lf /sysroot/run
Expand Down
Loading