From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-858595-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 24AC358973
for <garchives@archives.gentoo.org>; Wed, 20 Jan 2016 19:03:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7902421C080;
Wed, 20 Jan 2016 19:03:54 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2547D21C080
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Jan 2016 19:03:54 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1925E340C57
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Jan 2016 19:03:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 17DB0CF1
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Jan 2016 19:03:50 +0000 (UTC)
From: "Richard Yao" <ryao@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" <ryao@gentoo.org>
Message-ID: <1453316617.1b8eb107085e8e30a47a3eebbcbce1dda4afb5e1.ryao@gentoo>
Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/
X-VCS-Repository: proj/genkernel
X-VCS-Files: defaults/linuxrc
X-VCS-Directories: defaults/
X-VCS-Committer: ryao
X-VCS-Committer-Name: Richard Yao
X-VCS-Revision: 1b8eb107085e8e30a47a3eebbcbce1dda4afb5e1
X-VCS-Branch: master
Date: Wed, 20 Jan 2016 19:03:50 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 9c009a6f-a7db-49d5-900a-f724a12972d2
X-Archives-Hash: be8df4e557765702760054a3b649643a
commit: 1b8eb107085e8e30a47a3eebbcbce1dda4afb5e1
Author: Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 18:54:33 2016 +0000
Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 19:03:37 2016 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1b8eb107
busybox mount takes -o move instead of --move
Our attempt to move /dev into /newroot/dev fails because busybox's mount
does not understand --move. Instead it requires `-o move`. This failure
causes us to unmount /dev causing ZFS /dev/zd* device nodes to be lost
during the boot process.
There is nothing in userland that presently knows how to recreate zd*
devices from `/sys/devices/virtual/block`. ZFS is not necessarily the
only driver affected, so while this is definitely a bug in the zfs udev
rules we should try to preserve /dev to avoid triggering such bugs in
other subsystems.
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>
defaults/linuxrc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 35f39bc..e47c10e 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -997,7 +997,7 @@ for fs in /dev /sys /proc
do
if grep -qs "$fs" /proc/mounts
then
- if ! mount --move $fs "${CHROOT}"$fs
+ if ! mount -o move $fs "${CHROOT}"$fs
then
umount $fs || \
bad_msg "Failed to move and unmount the ramdisk $fs!"