From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 848A313825B for ; Mon, 16 May 2016 06:55:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B7F1141F3; Mon, 16 May 2016 06:55:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4674D224044 for ; Mon, 16 May 2016 06:55:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 56EB0340D03 for ; Mon, 16 May 2016 06:55:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C70AE973 for ; Mon, 16 May 2016 06:55:43 +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: <1463381726.4b467f0ab3dccc518355fe42f089c01a761ebaf7.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts X-VCS-Directories: defaults/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 4b467f0ab3dccc518355fe42f089c01a761ebaf7 X-VCS-Branch: master Date: Mon, 16 May 2016 06:55:43 +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: eb99f9b4-21a6-4c44-bb78-edf3ce4524d7 X-Archives-Hash: 285ac4615ad326caeeebb20ab956859c commit: 4b467f0ab3dccc518355fe42f089c01a761ebaf7 Author: Robin H. Johnson gentoo org> AuthorDate: Mon May 16 06:55:26 2016 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon May 16 06:55:26 2016 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4b467f0a defaults/initrd.scripts: bug #449186, strip iversion from mountopts. Signed-off-by: Robin H. Johnson gentoo.org> defaults/initrd.scripts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 1395690..703c0fe 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1627,5 +1627,7 @@ get_mount_device() # trailing or duplicate commas. strip_mount_options() { - sed -r 's/(,|^)(no)?auto(,|$)/,/g' + sed -r \ + -e 's/(,|^)(no)?auto(,|$)/,/g' \ + -e 's/(,|^)iversion(,|$)/,/g' }