Skip to content

Comments

initrd-setup-root: Set up more /var directories from packages#60

Merged
pothos merged 1 commit intoflatcar-masterfrom
kai/tmpfiles
Apr 4, 2023
Merged

initrd-setup-root: Set up more /var directories from packages#60
pothos merged 1 commit intoflatcar-masterfrom
kai/tmpfiles

Conversation

@pothos
Copy link
Member

@pothos pothos commented Mar 30, 2023 •
edited
Loading

The base_image_var.conf contents are generated during image build and
don't originally come from tmpfiles rules but from package
installation. For those rules coming from a package's tmpfiles I think
t's enough to let them do the job at their regular boot stage but for
those not from tmpfiles we don't really know whether this works for
them, so I added it as precaution. Also, add info on where
/var/log/journal gets set up.

How to use

Backport to Alpha

Testing done

Done

pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Mar 30, 2023
@pothos
sys-kernel/bootengine: Run tmpfiles to set up /var/log from initrd
e879cd7 
This pulls in flatcar/bootengine#60
to fix the persisting of the journal on first boot.
krnowak
krnowak reviewed Mar 30, 2023
View reviewed changes
dracut/99setup-root/initrd-setup-root Outdated
Comment on lines 90 to 91
baselayout-home.conf base_image_var.conf \
var.conf
Copy link
Member

@krnowak krnowak Mar 30, 2023

Choose a reason for hiding this comment

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

Where the base_image_var.conf and var.conf come from?

Copy link
Member Author

@pothos pothos Mar 30, 2023

Choose a reason for hiding this comment

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

All these files are under /sysroot/usr/lib/tmpfiles.d/

Copy link
Contributor

@tormath1 tormath1 Mar 30, 2023

Choose a reason for hiding this comment

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

I got an error from the initramfs when trying to apply this conf:

                bash-5.1# systemd-tmpfiles --root=/sysroot --create var.conf
                /sysroot/usr/lib/tmpfiles.d/var.conf:15: Failed to resolve group 'utmp'.

Copy link
Member

@krnowak krnowak Mar 30, 2023

Choose a reason for hiding this comment

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

Sorry for the confusion. I meant that I know that baselayout-home.conf comes from our baselayout project, but I don't know from which project base_image_var.conf and var.conf come from. I couldn't find them in systemd, init or baselayout. That's why I'm asking.

Copy link
Member Author

@pothos pothos Mar 30, 2023

Choose a reason for hiding this comment

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

base_image_var.conf is generated based on package contents, var.conf comes from systemd.

Ok, sounds like we should not add var.conf directly but only copy the wanted line somehow

Copy link
Member

@krnowak krnowak Mar 30, 2023

Choose a reason for hiding this comment

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

Ok, sounds like we should not add var.conf directly but only copy the wanted line somehow

flatcar-tmpfiles in baselayout could also copy the utmp group to solve the issue Mathieu had.

@pothos pothos mentioned this pull request Mar 30, 2023
Merged
2 tasks
@tormath1 tormath1 mentioned this pull request Mar 30, 2023
Closed
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Mar 30, 2023
@pothos
Use tmpfiles to set up /var/log from initrd
778a481 
This pulls in flatcar/bootengine#60
and flatcar/baselayout#29
to fix the persisting of the journal on first boot.
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Mar 30, 2023
@pothos
Use tmpfiles to set up /var/log from initrd
3db2d51 
This pulls in flatcar/bootengine#60
and flatcar/baselayout#29
to fix the persisting of the journal on first boot.
@pothos pothos mentioned this pull request Mar 30, 2023
Merged
tormath1
tormath1 reviewed Mar 30, 2023
View reviewed changes
dracut/99setup-root/initrd-setup-root Outdated
baselayout.conf baselayout-usr.conf \
baselayout-home.conf
baselayout-home.conf base_image_var.conf \
var.conf
Copy link
Contributor

@tormath1 tormath1 Mar 30, 2023

Choose a reason for hiding this comment

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

Suggested change
var.conf
systemd-tmpfiles --root=/sysroot --create var.conf --exclude-prefix /var/log/wtmp --exclude-prefix /var/log/btmp --exclude-prefix /var/log/lastlog

Copy link
Member Author

@pothos pothos Mar 30, 2023

Choose a reason for hiding this comment

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

Ah, interesting, I went with flatcar/baselayout#29 to only work on Flatcar-specific things and be independent from systemd changes

@tormath1
Copy link
Contributor

tormath1 commented Mar 30, 2023

Note: it's possible to quickly identify if the system is persisting logs by running: journactl --verify: if you only see /run/log/journal/* it means the issue is still present.
I'm looking to provide tests to avoid future regressions.

pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Mar 31, 2023
@pothos
Use tmpfiles to set up /var/log from initrd
a7611e6 
This pulls in flatcar/bootengine#60
and flatcar/baselayout#29
to fix the persisting of the journal on first boot.
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Mar 31, 2023
@pothos
Use tmpfiles to set up /var/log from initrd
7de92b8 
This pulls in flatcar/bootengine#60
and flatcar/baselayout#29
to fix the persisting of the journal on first boot.
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Apr 3, 2023
@pothos
Use tmpfiles to set up /var/log from initrd
bb0f886 
This pulls in flatcar/bootengine#60
and flatcar/baselayout#29
to fix the persisting of the journal on first boot.
@pothos
Copy link
Member Author

pothos commented Apr 3, 2023 •
edited
Loading

Looks ok now:

journalctl --verify
PASS: /run/log/journal/c7ff69fdb5844e33a22092259bad1823/system.journal                                                                             
PASS: /var/log/journal/6716a3388bb147ec955254cbe893efc6/system.journal

After the reboot I also see the first boot:

journalctl --list-boots
IDX BOOT ID                          FIRST ENTRY                 LAST ENTRY                 
 -1 272c012b16a04d55b5c6d67f1ce8c85e Mon 2023-04-03 12:47:37 UTC Mon 2023-04-03 12:50:49 UTC
  0 e953f09c5c494cf2a61dc1c13f27f2a6 Mon 2023-04-03 12:50:54 UTC Mon 2023-04-03 12:51:12 UTC

@pothos pothos marked this pull request as ready for review April 3, 2023 12:51
@pothos pothos requested a review from a team April 3, 2023 12:52
krnowak
krnowak reviewed Apr 3, 2023
View reviewed changes
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Apr 4, 2023
@pothos
Use tmpfiles to set up /var/log from initrd
da34d6a 
This pulls in flatcar/bootengine#60
and flatcar/baselayout#29
to fix the persisting of the journal on first boot.
@pothos pothos changed the title initrd-setup-root: Run tmpfiles to set up /var/log initrd-setup-root: Set up more /var directories from packages Apr 4, 2023
@pothos
initrd-setup-root: Set up more /var directories from packages
2bfa534 
The base_image_var.conf contents are generated during image build and
don't originally come from tmpfiles rules but from package
installation. For those rules coming from a package's tmpfiles I think
t's enough to let them do the job at their regular boot stage but for
those not from tmpfiles we don't really know whether this works for
them, so I added it as precaution. Also, add info on where
/var/log/journal gets set up.
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Apr 4, 2023
@pothos
Use tmpfiles to set up /var/log from initrd
a509c0d 
This pulls in flatcar/bootengine#60
and flatcar/baselayout#29
to fix the persisting of the journal on first boot.
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Apr 4, 2023
@pothos
Use tmpfiles to set up /var/log/journal/ from initrd
84cf198 
This pulls in flatcar/bootengine#60
and flatcar/baselayout#29
to fix the persisting of the journal on first boot.
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Apr 4, 2023
@pothos
Use tmpfiles to set up /var/log/journal/ from initrd
4e11464 
This pulls in flatcar/bootengine#60
and flatcar/baselayout#29
to fix the persisting of the journal on first boot.
@pothos pothos merged commit d3cc0f4 into flatcar-master Apr 4, 2023
@pothos pothos deleted the kai/tmpfiles branch April 4, 2023 15:44
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Apr 4, 2023
@pothos
Use tmpfiles to set up /var/log/journal/ from initrd
d81b0a0 
This pulls in flatcar/bootengine#60
and flatcar/baselayout#29
to fix the persisting of the journal on first boot.
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Apr 4, 2023
@pothos
Use tmpfiles to set up /var/log/journal/ from initrd
719a27b 
This pulls in flatcar/bootengine#60
and flatcar/baselayout#29
to fix the persisting of the journal on first boot.
t-lo pushed a commit to flatcar/scripts that referenced this pull request Apr 13, 2023
@pothos
Use tmpfiles to set up /var/log/journal/ from initrd
fe700e9 
This pulls in flatcar/bootengine#60
and flatcar/baselayout#29
to fix the persisting of the journal on first boot.
t-lo pushed a commit to flatcar/scripts that referenced this pull request Apr 17, 2023
@pothos
Use tmpfiles to set up /var/log/journal/ from initrd
a59c004 
This pulls in flatcar/bootengine#60
and flatcar/baselayout#29
to fix the persisting of the journal on first boot.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@krnowak krnowak krnowak approved these changes

@tormath1 tormath1 tormath1 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@pothos @tormath1 @krnowak