From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S8iQs-0004vZ-B7 for garchives@archives.gentoo.org; Sat, 17 Mar 2012 01:27:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A2B3E0BEF; Sat, 17 Mar 2012 01:27:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5E923E0BEE for ; Sat, 17 Mar 2012 01:27:24 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C01A11B4011 for ; Sat, 17 Mar 2012 01:27:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B5C61E5430 for ; Sat, 17 Mar 2012 01:27:20 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1331937390.adefd0fccc3f2820da63a2044b202262583fb16a.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: /, defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog defaults/initrd.scripts defaults/linuxrc X-VCS-Directories: / defaults/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: adefd0fccc3f2820da63a2044b202262583fb16a X-VCS-Branch: master Date: Sat, 17 Mar 2012 01:27:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f57a6f58-a3cc-4996-9eed-d957fab76bfe X-Archives-Hash: 7d5b2657800c9dd929c5c104f63cf589 commit: adefd0fccc3f2820da63a2044b202262583fb16a Author: Sebastian Pipping pipping org> AuthorDate: Fri Mar 16 22:36:30 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Fri Mar 16 22:36:30 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3Dadefd0fc Improve handling of missing /etc/fstab --- ChangeLog | 4 ++++ defaults/initrd.scripts | 3 +++ defaults/linuxrc | 1 + 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55f5569..4a306ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ =20 + 16 Mar 2012; Sebastian Pipping defaults/initrd.scri= pts, + defaults/linuxrc: + Improve handling of missing /etc/fstab + 16 Mar 2012; Sebastian Pipping defaults/initrd.scri= pts: No longer use parameter "-r" (for regex intervals) that busybox awk do= es not support diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index f504c3f..296b150 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1205,6 +1205,7 @@ get_mounts_list() =20 get_mount_fstype() { + [ -e "${NEW_ROOT}"/etc/fstab ] || return 1 awk -v fs=3D"$1" ' /^[[:blank:]]*#/ { next } $2 =3D=3D fs { print $3 } @@ -1213,6 +1214,7 @@ get_mount_fstype() =20 get_mount_options() { + [ -e "${NEW_ROOT}"/etc/fstab ] || return 1 awk -v fs=3D"$1" ' /^[[:blank:]]*#/ { next } $2 =3D=3D fs { print $4 } @@ -1221,6 +1223,7 @@ get_mount_options() =20 get_mount_device() { + [ -e "${NEW_ROOT}"/etc/fstab ] || return 1 awk -v fs=3D"$1" ' /^[[:blank:]]*#/ { next } $2 =3D=3D fs { print $1 } diff --git a/defaults/linuxrc b/defaults/linuxrc index b883155..34f1d69 100755 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -776,6 +776,7 @@ fi =20 for fs in $fslist; do dev=3D$(get_mount_device $fs) + [ -z "${dev}" ] && continue # Resolve it like util-linux mount does [ -L ${dev} ] && dev=3D`readlink ${dev}` # In this case, it's probably part of the filesystem