[src/netbsd-8]: src/distrib/common Pull up following revision(s) (requested b...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/17b4ea9b5c4e
branches:  netbsd-8
changeset: 447446:17b4ea9b5c4e
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jan 11 15:37:28 2019 +0000

description:
Pull up following revision(s) (requested by sevan in ticket #1158):
        distrib/common/cgdroot.rc: revision 1.2
        distrib/common/cgdroot.rc: revision 1.3
        distrib/common/cgdroot.rc: revision 1.4

Don't hardcode wd0a in cgdroot.kmod, try NAME=cgd.conf and ROOT.a.

 -

Break the loop after a successful mount.

 -

ROOT.a doesn't resolve to a useful partition, hardcode wd0a and ld0a for
now.

diffstat:

 distrib/common/cgdroot.rc |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 7307af7450e5 -r 17b4ea9b5c4e distrib/common/cgdroot.rc
--- a/distrib/common/cgdroot.rc Mon Jan 07 13:50:37 2019 +0000
+++ b/distrib/common/cgdroot.rc Fri Jan 11 15:37:28 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: cgdroot.rc,v 1.1 2013/07/15 00:25:38 khorben Exp $
+#      $NetBSD: cgdroot.rc,v 1.1.24.1 2019/01/11 15:37:28 martin Exp $
 #
 # Copyright (c) 2013 Pierre Pronchery <khorben%defora.org@localhost>
 # All rights reserved.
@@ -36,8 +36,14 @@
 
 umask 022
 
-mount -o ro /dev/wd0a /etc/cgd
-if [ $? -ne 0 ]; then
+mounted=
+for dev in NAME=cgd.conf /dev/wd0a /dev/ld0a ; do
+       if mount -o ro $dev /etc/cgd 2>/dev/null ; then
+               mounted=$dev
+               break
+       fi
+done
+if [ -z "$mounted" ]; then
        echo "Could not mount the boot partition" 1>&2
        exit 2
 fi