From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 33B4E15800A for ; Sat, 22 Jul 2023 20:50:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A0E1E07E6; Sat, 22 Jul 2023 20:50:42 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E3D6E07E6 for ; Sat, 22 Jul 2023 20:50:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 474DD340CEE for ; Sat, 22 Jul 2023 20:50:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71690BF2 for ; Sat, 22 Jul 2023 20:50:38 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1690058932.e92f7252b53bce0359a7dedbf02d5d6cb3dc1c44.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/systemd-254_rc2.ebuild sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: e92f7252b53bce0359a7dedbf02d5d6cb3dc1c44 X-VCS-Branch: master Date: Sat, 22 Jul 2023 20:50:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e30cccb1-cd72-4a33-87ab-ad7d0a98b666 X-Archives-Hash: 7397eb443db4d32d09e30417a509fd2f commit: e92f7252b53bce0359a7dedbf02d5d6cb3dc1c44 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jul 22 20:48:52 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Jul 22 20:48:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e92f7252 sys-apps/systemd: create sysctl.d symlink only when /etc/sysctl.conf exists Closes: https://bugs.gentoo.org/885287 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/systemd/systemd-254_rc2.ebuild | 8 +++++--- sys-apps/systemd/systemd-9999.ebuild | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sys-apps/systemd/systemd-254_rc2.ebuild b/sys-apps/systemd/systemd-254_rc2.ebuild index 79a152ddc472..0bd6dcb2fb85 100644 --- a/sys-apps/systemd/systemd-254_rc2.ebuild +++ b/sys-apps/systemd/systemd-254_rc2.ebuild @@ -399,9 +399,6 @@ multilib_src_install_all() { keepdir /var/lib/systemd keepdir /var/log/journal - # Symlink /etc/sysctl.conf for easy migration. - dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf - if use pam; then newpamd "${FILESDIR}"/systemd-user.pam systemd-user fi @@ -465,6 +462,11 @@ migrate_locale() { } pkg_preinst() { + if [[ -e ${EROOT}/etc/sysctl.conf ]]; then + # Symlink /etc/sysctl.conf for easy migration. + dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf + fi + if ! use split-usr; then local dir for dir in bin sbin lib usr/sbin; do diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 1b78026dc881..2995dae33660 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -399,9 +399,6 @@ multilib_src_install_all() { keepdir /var/lib/systemd keepdir /var/log/journal - # Symlink /etc/sysctl.conf for easy migration. - dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf - if use pam; then newpamd "${FILESDIR}"/systemd-user.pam systemd-user fi @@ -465,6 +462,11 @@ migrate_locale() { } pkg_preinst() { + if [[ -e ${EROOT}/etc/sysctl.conf ]]; then + # Symlink /etc/sysctl.conf for easy migration. + dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf + fi + if ! use split-usr; then local dir for dir in bin sbin lib usr/sbin; do