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

update systemd to v245 #916

Merged
merged 6 commits into from
Apr 21, 2020
Merged

Conversation

bcressey
Copy link
Contributor

Issue number:
#865

Description of changes:
Updates systemd to v245. Enables the repart tool for declarative repartitioning. Syncs build options. Shifts relevant files into the console subpackage.

Adds libfdisk package to util-linux, needed as a dependency for repart. Fixes license files.

Minor tweak to release to fix an upgrade issue with prepare-local. Minor tweak to rpm2img to assign a fixed UUID to the data partition.

Testing done:
Built aws-dev variant and tested locally.

Confirmed that:

  • /usr/lib/systemd/systemd-sulogin-shell debug works to start a debug shell
  • systemd-repart can add or grow a partition on the root device
  • license files are in the expected directories under /usr/share/licenses for util-linux subpackages.

Built aws-k8s-1.15 variant and tested in a cluster. Confirmed that sonobuoy tests pass.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

systemd's repart utility depends on libfdisk.

Signed-off-by: Ben Cressey <[email protected]>
Applying the %license attribute to a file with a relative path causes
it to be copied into a directory named for the parent package.

By using an absolute path, we can arrange for subpackages to include
their own copy of the corresponding license.

Signed-off-by: Ben Cressey <[email protected]>
@bcressey bcressey requested review from iliana and tjkirch April 21, 2020 18:16
@@ -187,7 +188,7 @@ dd if="${PRIVATE_IMAGE}" of="${DISK_IMAGE}" conv=notrunc bs=1M seek=2005
# BOTTLEROCKET-DATA
truncate -s 1G "${DATA_IMAGE}"
sgdisk --clear \
-n 0:1M:1023M -c 0:"BOTTLEROCKET-DATA" -t 0:8300 \
-n 0:1M:1023M -c 0:"BOTTLEROCKET-DATA" -t 0:"${BOTTLEROCKET_DATA_TYPECODE}" \
Copy link
Contributor

Choose a reason for hiding this comment

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

Any particular reason why we don't want to use the standard "Linux data" partition label?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wanted to leave that for other disks that might show up, like EBS volumes.

packages/systemd/systemd.spec Outdated Show resolved Hide resolved
@bcressey bcressey force-pushed the systemd-update branch 2 times, most recently from 54ac459 to 28ad365 Compare April 21, 2020 21:33
packages/systemd/systemd.spec Outdated Show resolved Hide resolved
This syncs the build options with changes between 240 and 245.

We also enable the repart tool and its dependencies. Although repart
only supports the root device today, it could be useful when we add
support for an initrd, or when we have variants with only one block
device.

Signed-off-by: Ben Cressey <[email protected]>
Features related to passwords and emergency debugging assume that an
interactive shell will be present for use on the console. Variants
that do not include a shell also do not need the related files.

The new sulogin helper enables the single-user login shell to work as
expected for development and debugging purposes.

Signed-off-by: Ben Cressey <[email protected]>
This allows tools to find the partition by UUID as well as by label.

Signed-off-by: Ben Cressey <[email protected]>
This fixes a potential upgrade issue for systemd 245, where oneshots
should have RemainAfterExit=yes so that they are not started again
after they exit successfully.

Signed-off-by: Ben Cressey <[email protected]>
@bcressey bcressey merged commit d6db47b into bottlerocket-os:develop Apr 21, 2020
@bcressey bcressey deleted the systemd-update branch May 14, 2020 21:39
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