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 1E102138335 for ; Sat, 10 Aug 2019 19:38:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6DEBE08C0; Sat, 10 Aug 2019 19:37:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 B4B05E08B1 for ; Sat, 10 Aug 2019 19:37:59 +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 5674134986E for ; Sat, 10 Aug 2019 19:37:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF46D759 for ; Sat, 10 Aug 2019 19:37:56 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1565465739.14aa6eae52b8b9ae476ad2de13cb87f45e28f38b.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_funcs.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 14aa6eae52b8b9ae476ad2de13cb87f45e28f38b X-VCS-Branch: master Date: Sat, 10 Aug 2019 19:37:56 +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: 71cfb231-da8b-4068-90ad-c1caa255934e X-Archives-Hash: 8f5929c43f0e6edb20209e5dd47cf876 commit: 14aa6eae52b8b9ae476ad2de13cb87f45e28f38b Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Aug 10 19:35:39 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Aug 10 19:35:39 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=14aa6eae gen_funcs.sh: make_bootdir_writable(): Fix ro check Make sure we check $BOOTDIR only for ro and not any mount containing $BOOTDIR value. Bug: https://bugs.gentoo.org/691872 Signed-off-by: Thomas Deutschmann gentoo.org> gen_funcs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen_funcs.sh b/gen_funcs.sh index 3c9c56f..da9bc08 100755 --- a/gen_funcs.sh +++ b/gen_funcs.sh @@ -1746,7 +1746,7 @@ make_bootdir_writable() { # Based on mount-boot.eclass code local fstabstate=$(awk "!/^#|^[[:blank:]]+#|^${BOOTDIR//\//\\/}/ {print \$2}" /etc/fstab 2>/dev/null | egrep "^${BOOTDIR}$" ) local procstate=$(awk "\$2 ~ /^${BOOTDIR//\//\\/}\$/ {print \$2}" /proc/mounts 2>/dev/null) - local proc_ro=$(awk '{ print $2 " ," $4 "," }' /proc/mounts 2>/dev/null | sed -n "/${BOOTDIR//\//\\/} .*,ro,/p") + local proc_ro=$(awk '{ print $2 " ," $4 "," }' /proc/mounts 2>/dev/null | sed -n "/^${BOOTDIR//\//\\/} .*,ro,/p") if [ -n "${fstabstate}" ] && [ -n "${procstate}" ] then