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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 65D8E138359 for ; Tue, 10 Nov 2020 11:18:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A24B1E082D; Tue, 10 Nov 2020 11:18:53 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61491E082D for ; Tue, 10 Nov 2020 11:18:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0BC33335D08 for ; Tue, 10 Nov 2020 11:18:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 878C343D for ; Tue, 10 Nov 2020 11:18:50 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1605007125.ea6d8e135b8ed985d40bad74d33a9368686465a6.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/sysvinit/sysvinit-2.96.ebuild sys-apps/sysvinit/sysvinit-2.97.ebuild X-VCS-Directories: sys-apps/sysvinit/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: ea6d8e135b8ed985d40bad74d33a9368686465a6 X-VCS-Branch: master Date: Tue, 10 Nov 2020 11:18:50 +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: ac1ce8fb-b02b-4491-b41f-e3b08e2b9168 X-Archives-Hash: 175a401340c6dda23713212619347bbd commit: ea6d8e135b8ed985d40bad74d33a9368686465a6 Author: Lars Wendler gentoo org> AuthorDate: Tue Nov 10 11:18:06 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Nov 10 11:18:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea6d8e13 sys-apps/sysvinit: Fixed ${ROOT} check for EAPI-7 Closes: https://bugs.gentoo.org/753824 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> sys-apps/sysvinit/sysvinit-2.96.ebuild | 2 +- sys-apps/sysvinit/sysvinit-2.97.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/sysvinit/sysvinit-2.96.ebuild b/sys-apps/sysvinit/sysvinit-2.96.ebuild index adf3f15ec1e..b82c9e06198 100644 --- a/sys-apps/sysvinit/sysvinit-2.96.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.96.ebuild @@ -121,7 +121,7 @@ pkg_postinst() { # Reload init to fix unmounting problems of / on next reboot. # This is really needed, as without the new version of init cause init # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ ${ROOT} == / ]] ; then + if [[ -z ${ROOT} ]] ; then if [[ -e /dev/initctl && ! -e /run/initctl ]]; then ln -s /dev/initctl /run/initctl fi diff --git a/sys-apps/sysvinit/sysvinit-2.97.ebuild b/sys-apps/sysvinit/sysvinit-2.97.ebuild index 4dd4d992de9..218791b88a2 100644 --- a/sys-apps/sysvinit/sysvinit-2.97.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.97.ebuild @@ -125,7 +125,7 @@ pkg_postinst() { # Reload init to fix unmounting problems of / on next reboot. # This is really needed, as without the new version of init cause init # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ ${ROOT} == / ]] ; then + if [[ -z ${ROOT} ]] ; then if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then ln -s /dev/initctl /run/initctl \ || ewarn "Failed to set /run/initctl symlink!"