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 264EC1396D0 for ; Sun, 3 Sep 2017 06:28:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1B57E0E62; Sun, 3 Sep 2017 06:28:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 B3E51E0E59 for ; Sun, 3 Sep 2017 06:28:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 CB39E34169C for ; Sun, 3 Sep 2017 06:28:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6CBEB8C3A for ; Sun, 3 Sep 2017 06:28:25 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1504420096.8f98a77a94aac23dce90a71f5623fe8dbcc1783b.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 8f98a77a94aac23dce90a71f5623fe8dbcc1783b X-VCS-Branch: master Date: Sun, 3 Sep 2017 06:28:25 +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-Archives-Salt: 3ac410ef-56b2-4448-b160-7b7ecb0d259b X-Archives-Hash: 9cd53b841ef4a25b72a552252f003d44 commit: 8f98a77a94aac23dce90a71f5623fe8dbcc1783b Author: Robin H. Johnson gentoo org> AuthorDate: Sun Sep 3 06:25:26 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Sep 3 06:28:16 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8f98a77a gen_initramfs: ensure LVM config options are suitable from initramfs. Signed-off-by: Robin H. Johnson gentoo.org> gen_initramfs.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 0e66c66..62a88c8 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -416,11 +416,22 @@ append_lvm(){ # ret=$? # if [ ${ret} != 0 ] # then - cp /etc/lvm/lvm.conf "${TEMP}/initramfs-lvm-temp/etc/lvm/" || + cp /etc/lvm/lvm.conf "${TEMP}/initramfs-lvm-temp/etc/lvm/" || \ gen_die 'Could not copy over lvm.conf!' # else # gen_die 'Could not copy over lvm.conf!' # fi + + # Some LVM config options need changing, because the functionality is + # not compiled in: + sed -r -i \ + -e '/^[[:space:]]*obtain_device_list_from_udev/s,=.*,= 0,g' \ + -e '/^[[:space:]]*use_lvmetad/s,=.*,= 0,g' \ + -e '/^[[:space:]]*monitoring/s,=.*,= 0,g' \ + -e '/^[[:space:]]*external_device_info_source/s,=.*,= "none",g' \ + -e '/^[[:space:]]*units/s,=.*"r",= "h",g' \ + "${TEMP}/initramfs-lvm-temp/etc/lvm/lvm.conf" || \ + gen_die 'Could not sed lvm.conf!' fi cd "${TEMP}/initramfs-lvm-temp/" log_future_cpio_content