Commit Graph

147 Commits

Author SHA1 Message Date
luoyaoming 228576c30d
!19 rv64g架构 test报错 nocheck
Merge pull request !19 from 范小气/openkylin/yangtze
2024-03-04 09:03:41 +00:00
fanxiaoqi 602d8a5fb0 update debian/changelog 2024-03-04 08:48:14 +00:00
fanxiaoqi d60703cb83 add rv64g nocheck 2024-03-04 08:41:44 +00:00
handsome_feng 1996d44829 Update changelog 2023-10-23 16:57:50 +08:00
handsome_feng ba805f4ebd Set DefaultTimeoutStopSec to 10s 2023-10-23 16:57:27 +08:00
luoyaoming a06e25d63e
!11 modify control info
Merge pull request !11 from niubix/openkylin/yangtze
2023-08-25 07:40:26 +00:00
廖先福 44ee64ef02 changelog:251.4-ok1.5 2023-08-25 14:04:56 +08:00
廖先福 e822cf9085 change control info 2023-08-25 14:02:05 +08:00
zhangtianxiong 2e71a0c7fc
!10 修复安全漏洞CVE-2022-4415
Merge pull request !10 from tianqisu/openkylin/yangtze
2023-07-28 03:43:02 +00:00
sutianqi 7f0fa072cc Repair CVE-2022-4415 2023-07-27 18:52:01 +08:00
shilongzhen d0b44858ad changelog: 251.4-ok1.3
Signed-off-by: shilongzhen <shilongzhen@kylinos.cn>
2023-06-16 13:41:25 +08:00
shilongzhen 8b57fd2604 timesyncd: modify ntp server to ntp4.aliyun.com ntp3.aliyun.com ntp2.aliyun.com ntp1.aliyun.com
Signed-off-by: shilongzhen <shilongzhen@kylinos.cn>
2023-06-16 12:51:42 +08:00
liaoxianfu 9536016e82 rebuild source for openKylin 2023-04-26 15:09:23 +08:00
liaoxianfu 2ddea675c0 rebuild source for openKylin 2023-04-19 17:20:02 +08:00
liaoxianfu 2ccc1a2333 fix build error 2023-04-13 09:25:22 +08:00
liaoxianfu cb85f497c8 change debian/source/format to native 2023-04-13 09:24:34 +08:00
liaoxianfu b3b933d320 Merge branch 'patch-queue/openkylin/yangtze' into openkylin/yangtze 2023-04-12 17:15:38 +08:00
Dan Streetman e494d322b6 [PATCH] add CAP_LINUX_IMMUTABLE to systemd-machined, so it can handle machinectl read-only requests
From 137d162c42ed858613afc3d7493d08d4ae6d5c1b Mon Sep 17 00:00:00 2001
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1991829
Origin: upstream, https://github.com/systemd/systemd/pull/24697

Without this, the 'machinectl read-only ...' command always fails.

Gbp-Pq: Name lp1991829-add-CAP_LINUX_IMMUTABLE-to-systemd-machined-so-it-ca.patch
2023-04-12 17:15:02 +08:00
Nick Rosbrook cded1f2655 test: deny-list TEST-36-NUMAPOLICY on ppc64el
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1989969


Gbp-Pq: Name lp1989969-test-deny-list-TEST-36-NUMAPOLICY-on-ppc64el.patch
2023-04-12 17:15:02 +08:00
Nick Rosbrook f32148f4f5 test: denylist TEST-29-PORTABLE again
Bug: https://github.com/systemd/systemd/issues/24147


Gbp-Pq: Name test-denylist-TEST-29-PORTABLE-again.patch
2023-04-12 17:15:02 +08:00
Nick Rosbrook 09544f1357 Workaround timezone issues cause by Ubuntu Core's read-only /etc
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1981042
Bug-Ubuntu: https://bugs.launchpad.net/snappy/+bug/1953172
Forwarded: not-needed (part of read-only /etc workaround)
Last-Update: 2022-07-20

This is another patch in a series of existing ones working around this issue
on Ubuntu Core.
Last-Update: 2022-07-20
Gbp-Pq: Name lp1981042-core-firstboot-workaround-timezone-issues-caused-by-Ubunt.patch
2023-04-12 17:15:02 +08:00
Nick Rosbrook d91da2aa04 test: copy libgcc_s.so.1 to TPM2 test image on Debian-like systems
Forwarded: https://github.com/systemd/systemd/pull/23858

On Debian, cryptsetup does not link against libgcc_s.so.1 which leads to
the following test failure in TEST-70-TPM2:

 systemd[1]: Starting testsuite-70.service...
 systemd[329]: testsuite-70.service: Executing: /usr/lib/systemd/tests/testdata/units/testsuite-70.sh
 testsuite-70.sh[329]: + export SYSTEMD_LOG_LEVEL=debug
 testsuite-70.sh[329]: + SYSTEMD_LOG_LEVEL=debug
 testsuite-70.sh[329]: + img=/var/tmp/test.img
 testsuite-70.sh[329]: + dd if=/dev/zero of=/var/tmp/test.img bs=1024k count=20 status=none
 testsuite-70.sh[329]: + echo -n passphrase
 testsuite-70.sh[329]: + cryptsetup luksFormat -q --use-urandom /var/tmp/test.img /tmp/passphrase
 testsuite-70.sh[333]: libgcc_s.so.1 must be installed for pthread_exit to work
 testsuite-70.sh[329]: /usr/lib/systemd/tests/testdata/units/testsuite-70.sh: line 12:   333 Aborted                 (core dumped) cryptsetup luksFormat -q --use-urandom $img /tmp/passphrase

To fix this, manually install libgcc_s.so.1 to the test image if running
on Debian-like systems.

Gbp-Pq: Name test-copy-libgcc_s.so.1-to-TPM2-test-image-on-Debian-like.patch
2023-04-12 17:15:01 +08:00
Nick Rosbrook 06464651bb test: increase QEMU_MEM for some tests
These tests have a tendency to fail with OOM on the autopkgtest
infrastructure. Increase QEMU_MEM to try and alleviate that.

Gbp-Pq: Name test-increase-QEMU_MEM-for-some-tests.patch
2023-04-12 17:15:01 +08:00
Nick Rosbrook c6708c2c93 hwdb: implement --root option for systemd-hwdb query
Origin: upstream, beff73f94e

Currently, the systemd-hwdb --root flag only has an effect for the
'update' verb. It would be useful to be able to use the --root option
for the 'query' verb too (e.g. for testing a hwdb.bin created with
systemd-hwdb update --root <path>).

Use sd_hwdb_new_from_path to initialize the hwdb if --root is passed to
systemd-hwdb query.

Note that this functionality was not added to 'udevadm hwdb' since that
command is deprecated.

Gbp-Pq: Name hwdb-implement-root-option-for-systemd-hwdb-query.patch
2023-04-12 17:15:01 +08:00
Nick Rosbrook 30a3e9744c sd-hwdb: add sd_hwdb_new_from_path
Origin: upstream, 60f0ba7556

The existing sd_hwdb_new function always initializes the hwdb from the
first successful hwdb.bin it finds from hwdb_bin_paths. This means there
is currently no way to initialize a hwdb from an explicit path, which
would be useful for systemd-hwdb query.

Add sd_hwdb_new_from_path to allow a sd_hwdb to be initialized from a
custom path outside of hwdb_bin_paths.

Gbp-Pq: Name sd-hwdb-add-sd_hwdb_new_from_path.patch
2023-04-12 17:15:01 +08:00
Alexander Graf dd1b8d8f17 pstore: Run after modules are loaded
Origin: upstream, 70e74a5997
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1978079
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1981622
Last-Updated: 2022-07-22

The original commit has been modified to not load mtdpstore.


Gbp-Pq: Name lp1978079-pstore-Run-after-modules-are-loaded.patch
2023-04-12 17:15:01 +08:00
Lukas Märdian 8f40ec0c13 Don't override Ubuntu's default sysctl values (LP: #1962038)
Gbp-Pq: Topic debian
Gbp-Pq: Name UBUNTU-Don-t-override-Ubuntu-s-default-sysctl-values-LP-1962038.patch
2023-04-12 17:15:01 +08:00
Lukas Märdian 68c507102c Deny-list TEST-55-OOMD on ppc64el
Gbp-Pq: Name deny-list-TEST-55-OOMD-on-ppc64el.patch
2023-04-12 17:15:01 +08:00
Lukas Märdian cfe94d168d [PATCH] Revert "tests: add test case for UMask=+BindPaths= combination"
This test currently fails inside privileged LXD containers (LP: #1959013)

This reverts commit ae53f4b5e48860b473c4d05958486a77f84ecc6d.

Gbp-Pq: Name 0001-Revert-tests-add-test-case-for-UMask-BindPaths-combi.patch
2023-04-12 17:15:01 +08:00
Lukas Märdian 980bb35a9b [PATCH] Revert "sd-dhcp: do not use detect_container() to guess udev is running or not"
This reverts commit 0299deab53d2a087727a5d04c1500c322c48b63e.

Gbp-Pq: Name lp1950794-Revert-sd-dhcp-do-not-use-detect_container-to-guess-.patch
2023-04-12 17:15:01 +08:00
Balint Reczey c3b6a0bf73 Deny-list TEST-10-ISSUE-2467 on all architectures because it is still flaky
Gbp-Pq: Topic debian
Gbp-Pq: Name UBUNTU-deny-list-TEST-10-ISSUE-2467.patch
2023-04-12 17:15:01 +08:00
Ubuntu Developers fe12b0154a skip disk/by-uuid for bcache devices
blkid reports bcache superblock dev.uuid as a filesystem UUID but it actually
is not a filesystem, it's the UUID of the backing device, which is maintained
at /dev/bcache/by-uuid instead of /dev/disk/by-uuid.

  [Forwarding Note]

  There is an on-going discussion upstream whether this patch should exist.
  This patch is not a FIX to LP: #1861941, but can work as a mitigation. The
  FIX for LP: #1861941 is the bcache-tools (0003-Add-bcache-export-cached-
  helper.patch).

  Ryan Harper arguments are that blkid - and/or udev default rules - should skip
  devices with "ID_FS_TYPE = bcache" by default from creating symlinks at
  /dev/disk/{by-uuid,by-label}/{ID_FS_UUID_ENC,ID_FS_LABEL_ENC} just because
  those devices aren't meant to be used directly (as they are backing devices
  to bcache). Actually this is what was causing the issue fixed by bcache-tools
  udev rules: symlink management for bcache backing devices were removing
  /dev/bcache/xxx symlinks.

  Considering that this is a minor delta, and I agree to Ryan's arguments, of
  not having /dev/disk/by-uuid/xxx symlinks to devices that should not be
  accessed directly, thus giving a better experience to end user, I'm keeping
  this until either upstream provides it by default OR the patch
  0003-Add-bcache-export-cached-helper.patch can be removed from bcache-tools
  because udev and/or libblkid started differentiating UUID_CACHED and FS_UUID
  when doing /dev/disk/ symlinks.

  -
  rafaeldtinoco

Author: Ryan Harper <ryan.harper@canonical.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1861941
Forwarded: https://github.com/systemd/systemd/pull/16317
Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com>
Last-Update: 2020-07-23

Gbp-Pq: Name lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch
2023-04-12 17:15:01 +08:00
Balint Reczey 54e60e503c src/test/test-execute.c: Skip the parts of test-execute in LXC which are failing there
LP: #1878051

Gbp-Pq: Topic debian
Gbp-Pq: Name UBUNTU-src-test-test-execute.c-Skip-parts-of-test-execute-in-con.patch
2023-04-12 17:15:01 +08:00
Balint Reczey aebfc098c5 src/test/test-mount-util.c: Skip parts of test-mount-util in LXC
LP: #1878051

Gbp-Pq: Topic debian
Gbp-Pq: Name UBUNTU-src-test-testmount-util.c-Skip-parts-of-test-mount-util-in-LXC.patch
2023-04-12 17:15:01 +08:00
Balint Reczey 6143a04008 Revert "network: if /sys is rw, then udev should be around"
The change broke networking in LXD containers

This reverts commit 96d7083c5499b264ecebd6a30a92e0e8fda14cd5.

LP: #1857123

Gbp-Pq: Name Revert-network-if-sys-is-rw-then-udev-should-be-around.patch
2023-04-12 17:15:01 +08:00
Balint Reczey 8c22a9772c systemd-resolved: Default to Cache=no-negative
LP: #1895418
Thanks: Dimitri John Ledkov for the suggestion and
Co-authored-by: Dan Streetman <ddstreet@canonical.com>

Gbp-Pq: Topic debian
Gbp-Pq: Name UBUNTU-resolved-default-no-negative-caching.patch
2023-04-12 17:15:01 +08:00
Balint Reczey c2d73f4061 Revert "cgroup: Continue unit reset if cgroup is busy"
LP: #1844879

This reverts commit 0219b3524f414e23589e63c6de6a759811ef8474.
Forwarded: https://github.com/systemd/systemd/issues/13629

Gbp-Pq: Topic debian
Gbp-Pq: Name UBUNTU-Revert-cgroup-Continue-unit-reset-if-cgroup-is-busy.patch
2023-04-12 17:15:01 +08:00
Balint Reczey 97f04d4ef2 Revert "namespace: be more careful when handling namespacing failures gracefully"
This partially reverts commit 1beab8b0d0ff2d7d1436b52d4a0c3d56dc908962.

Until after the lowest LXD version running this packaged systemd contains
a6b7807033

The first LXD version fixed is 3.10. Ubuntu 18.04 LTS has LXD 3.0.3 and is
supported until 2028.

Gbp-Pq: Topic debian
Gbp-Pq: Name UBUNTU-Revert-namespace-be-more-careful-when-handling-namespacin.patch
2023-04-12 17:15:01 +08:00
Ratchanan Srirattanamet cebf2e3e9e Fix timezone setting on read-only etc
Origin: other
Bug-Ubuntu: https://bugs.launchpad.net/snappy/+bug/1650688
Forwarded: not-needed (part of read-only /etc workaround)
Last-Update: 2021-09-24

Due to our read-only /etc workaround, the localtime link on such
system ends up in /etc/writable, not /etc. To make the link target
correct in both normal and such systems, makes the path absolute.

On Ubuntu Core, this eliminates the need for the wrapper script, and
makes the DBus interface work properly.

This patch can be dropped once LP: #1953172 got resolved
Last-Update: 2021-09-24
Gbp-Pq: Topic debian
Gbp-Pq: Name UBUNTU-Fix-timezone-setting-on-read-only-etc.patch
2023-04-12 17:15:01 +08:00
Michael Vogt 088a2c6e1e Fix retrieving timezone on read-only /etc
Origin: vendor, https://bugs.launchpad.net/snappy/+bug/1650688/comments/46
Bug-Ubuntu: https://bugs.launchpad.net/snappy/+bug/1650688
Forwarded: not-needed (part of read-only /etc workaround)
Last-Update: 2021-09-24

get_timezone() retrieve it by reading the link destination of
/etc/localtime, which on systems with read-only /etc will always point
to /etc/writable. Makes this function aware of the /etc/writable
redirection and handle it.

[ratchanan@ubports.com: add descrtiption and other metadata.]

This patch can be dropped once LP: #1953172 got resolved
Last-Update: 2021-09-24
Gbp-Pq: Topic debian
Gbp-Pq: Name timedatectl-lp1650688.patch
2023-04-12 17:15:01 +08:00
Martin Pitt db8013a71f Support system-image read-only /etc
On Ubuntu Phone with readonly /etc we symlink
/etc/{adjtime,localtime,timezone,hostname,machine-info} to /etc/writable/, so
we need to update those files instead if the original files are symlinks into
/etc/writable/.

Forwarded: OMGno, this is a rather nasty hack until we fix system-image to get a writable /etc
Bug-Ubuntu: https://launchpad.net/bugs/1227520

Gbp-Pq: Topic debian
Gbp-Pq: Name UBUNTU-Support-system-image-read-only-etc.patch
2023-04-12 17:15:01 +08:00
Dimitri John Ledkov 3c857da754 test-sleep: skip test_fiemap upon inapproriate ioctl for device.
On v4.4 kernels, on top of btrfs ephemeral lxd v3.0 containers generate this
other error code, instead of not supported. Skip the test for both error codes.

Gbp-Pq: Topic debian
Gbp-Pq: Name UBUNTU-test-sleep-skip-test_fiemap-upon-inapproriate-ioctl-.patch
2023-04-12 17:15:01 +08:00
Dimitri John Ledkov 8e2aa5d1ba units: block CAP_SYS_MODULE units in containers too
lxd/lxc usually keep the usernamespace capabilities, whilst in practice one
does not have these in the initial namespace. Thus add additional condition
!container, such that sys-kernel-config.mount and systemd-modules.load.service
are not started in the lxd containers. This should make default lxd containers
start non-degraded.

Gbp-Pq: Topic debian
Gbp-Pq: Name UBUNTU-units-block-CAP_SYS_MODULE-units-in-containers-too.patch
2023-04-12 17:15:01 +08:00
Dimitri John Ledkov ec70b9c595 journald.service: set Nice=-1 to dodge watchdog on soft lockups.
LP: #1696970
(cherry picked from commit c5b77c35b4ec0e1812702240f272fbeea3ad4152)

Gbp-Pq: Topic debian
Gbp-Pq: Name UBUNTU-journald.service-set-Nice-1-to-dodge-watchdog-on-soft-loc.patch
2023-04-12 17:15:01 +08:00
Dimitri John Ledkov 467cd0daab wait-online: exit, if no links are managed.
(cherry picked from commit 19d11f607ac0f8b1e31f72a8e9d3d44371b9dadb)

Gbp-Pq: Topic debian
Gbp-Pq: Name UBUNTU-wait-online-exit-if-no-links-are-managed.patch
2023-04-12 17:15:01 +08:00
Dimitri John Ledkov ad8f8fbfa7 test/test-functions: launch qemu with -vga none
When booting ppc64el virtual machines, they require seabios, unless -vga none
is specified. Since we do a direct kernel & initrd boot, with -nographic, we
really have no need for vga or seabios in this case.

Gbp-Pq: Topic debian
Gbp-Pq: Name UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch
2023-04-12 17:15:01 +08:00
Michael Vogt e9472cfba6 Add "AssumedApparmorLabel=unconfined" to timedate1 dbus service file
A change in apparmor mediates auto-activation attempts now through
AppArmor: https://cgit.freedesktop.org/dbus/dbus/commit/?id=dc25979eb

This breaks the snapd time{zone,server}-control interfaces which limt
sending dbus message to a (label=unconfined) org.freedesktop.timedate1
peers.

By adding the AssumedApparmorLabel=unconfined label the snapd interfaces
work again.

LP: #1749000

Gbp-Pq: Topic debian
Gbp-Pq: Name UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch
2023-04-12 17:15:01 +08:00
Dimitri John Ledkov 7b011c410b units: set ConditionVirtualization=!private-users on journald audit socket
As it fails to start in an unpriviledged container.

Gbp-Pq: Topic debian
Gbp-Pq: Name Ubuntu-units-set-ConditionVirtualization-private-users-on-j.patch
2023-04-12 17:15:01 +08:00
Dimitri John Ledkov 9309f43aba Set UseDomains to true, by default, on Ubuntu.
On Ubuntu, fallback DNS servers are disabled, therefore we do not leak queries
to a preset 3rd party by default. In resolved, dnssec is also disabled by
default, as too much of the internet is broken and using Ubuntu users to debug
the internet is not very productive - most of the time the end-user cannot fix
or know how to notify the site owners about the dnssec mistakes. Inherintally
the DHCP acquired DNS servers are therefore trusted, and are free to spoof
records. Not trusting DNS search domains, in such scenario, provides limited
security or privacy benefits. From user point of view, this also appears to be
a regression from previous Ubuntu releases which do trust DHCP acquired search
domains by default.

Therefore we are enabling UseDomains by default on Ubuntu.

Users may override this setting in the .network files by specifying
[DHCP|IPv6AcceptRA] UseDomains=no|route options.

Gbp-Pq: Topic debian
Gbp-Pq: Name Ubuntu-UseDomains-by-default.patch
2023-04-12 17:15:01 +08:00
Michael Biebl 602b640645 Downgrade a couple of warnings to debug
If a package still ships only a SysV init script or if a service file or
tmpfile uses /var/run, downgrade those messages to debug. We can use
lintian to detect those issues.
For service files and tmpfiles in /etc, keep the warning, as those files
are typically added locally and aren't checked by lintian.

Closes: #981407

Gbp-Pq: Topic debian
Gbp-Pq: Name Downgrade-a-couple-of-warnings-to-debug.patch
2023-04-12 17:15:01 +08:00