Skip to content

Commit

Permalink
Update patches for systemd 257 (#8)
Browse files Browse the repository at this point in the history
  • Loading branch information
fwilhe authored Dec 17, 2024
1 parent d482197 commit 1d0a3e7
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 28 deletions.
6 changes: 3 additions & 3 deletions patches/install_pam_systemd_user.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff -Naur a/debian/systemd.install b/debian/systemd.install
--- a/debian/systemd.install
+++ b/debian/systemd.install
@@ -4,6 +4,7 @@
@@ -3,6 +3,7 @@
etc/credstore/
etc/credstore.encrypted/
etc/init.d/
etc/kernel/install.d/
+etc/pam.d/systemd-user
<pkg.systemd.upstream> etc/profile.d/70-systemd-shell-extra.sh
etc/profile.d/70-systemd-shell-extra.sh
etc/ssh/ssh_config.d/20-systemd-ssh-proxy.conf
etc/systemd/journald.conf
12 changes: 0 additions & 12 deletions patches/remove_test.patch

This file was deleted.

1 change: 0 additions & 1 deletion patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ configure.patch
install-initrd.patch
install_pam_systemd_user.patch
add-systemd-run0-install-target.patch
remove_test.patch
11 changes: 2 additions & 9 deletions prepare_source
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
git_src --branch v256.8 https://github.com/systemd/systemd.git
tmp_deb=$(mktemp -d)
# TODO: create a import_upstream_patches/debian_git, similar to git_src
git clone --depth 1 --recurse-submodules -b "debian/256.7-3" https://salsa.debian.org/systemd-team/systemd.git "$tmp_deb"
cp -r "${tmp_deb}/debian" "${dir}/src/"
rm -rf "${tmp_deb}"
apt_src systemd
import_upstream_patches
apply_patches

version="256.8-0"
message="Update to 256.8-0"
6 changes: 3 additions & 3 deletions upstream_patches/reboot_on_err.patch
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ index 068aa3b54a..0110b60ef3 100644
</variablelist>
</refsect1>

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
diff --git a/src/boot/boot.c b/src/boot/boot.c
index ecbb4e0509..25e2b5df34 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
--- a/src/boot/boot.c
+++ b/src/boot/boot.c
@@ -91,6 +91,7 @@ typedef struct {
bool auto_poweroff;
bool auto_reboot;
Expand Down

0 comments on commit 1d0a3e7

Please sign in to comment.