Author: imp
Date: Sat Jan 30 07:00:29 2016
New Revision: 295064
URL: https://svnweb.freebsd.org/changeset/base/295064

Log:
  Two new variables: NANO_ROOT and NANO_ALTROOT. These used to be
  spelled ${NANO_SLICE_ROOT}a and ${NANO_SLICE_ALTROOT}a respectively,
  and that's the default value. This will allow nanobsd on systems
  without a bsd label. That's rarely needed these days, even in an MBR
  world. The default will shift to this in the future, but remain an
  option.

Modified:
  head/tools/tools/nanobsd/defaults.sh   (contents, props changed)
  head/tools/tools/nanobsd/embedded/common

Modified: head/tools/tools/nanobsd/defaults.sh
==============================================================================
--- head/tools/tools/nanobsd/defaults.sh        Sat Jan 30 07:00:28 2016        
(r295063)
+++ head/tools/tools/nanobsd/defaults.sh        Sat Jan 30 07:00:29 2016        
(r295064)
@@ -156,6 +156,8 @@ NANO_SLICE_ROOT=s1
 NANO_SLICE_ALTROOT=s2
 NANO_SLICE_CFG=s3
 NANO_SLICE_DATA=s4
+NANO_ROOT=s1a
+NANO_ALTROOT=s2a
 
 # Default ownwership for nopriv build
 NANO_DEF_UNAME=root
@@ -569,7 +571,7 @@ setup_nanobsd_etc ( ) (
        # save config file for scripts
        echo "NANO_DRIVE=${NANO_DRIVE}" > etc/nanobsd.conf
 
-       echo "/dev/${NANO_DRIVE}${NANO_SLICE_ROOT}a / ufs ro 1 1" > etc/fstab
+       echo "/dev/${NANO_DRIVE}${NANO_ROOT} / ufs ro 1 1" > etc/fstab
        echo "/dev/${NANO_DRIVE}${NANO_SLICE_CFG} /cfg ufs rw,noauto 2 2" >> 
etc/fstab
        mkdir -p cfg
        )
@@ -731,8 +733,8 @@ create_diskimage ( ) (
        bsdlabel ${MD}${NANO_SLICE_ROOT}
 
        # Create first image
-       populate_slice /dev/${MD}${NANO_SLICE_ROOT}a ${NANO_WORLDDIR} ${MNT} 
"${NANO_SLICE_ROOT}a"
-       mount /dev/${MD}${NANO_SLICE_ROOT}a ${MNT}
+       populate_slice /dev/${MD}${NANO_ROOT} ${NANO_WORLDDIR} ${MNT} 
"${NANO_ROOT}"
+       mount /dev/${MD}${NANO_ROOT} ${MNT}
        echo "Generating mtree..."
        ( cd "${MNT}" && mtree -c ) > ${NANO_OBJ}/_.mtree
        ( cd "${MNT}" && du -k ) > ${NANO_OBJ}/_.du
@@ -742,7 +744,7 @@ create_diskimage ( ) (
                # Duplicate to second image (if present)
                echo "Duplicating to second image..."
                dd conv=sparse if=/dev/${MD}${NANO_SLICE_ROOT} 
of=/dev/${MD}${NANO_SLICE_ALTROOT} bs=64k
-               mount /dev/${MD}${NANO_SLICE_ALTROOT}a ${MNT}
+               mount /dev/${MD}${NANO_ALTROOT} ${MNT}
                for f in ${MNT}/etc/fstab ${MNT}/conf/base/etc/fstab
                do
                        sed -i "" 
"s=${NANO_DRIVE}${NANO_SLICE_ROOT}=${NANO_DRIVE}${NANO_SLICE_ALTROOT}=g" $f
@@ -751,7 +753,7 @@ create_diskimage ( ) (
                # Override the label from the first partition so we
                # don't confuse glabel with duplicates.
                if [ -n "${NANO_LABEL}" ]; then
-                       tunefs -L ${NANO_LABEL}"${NANO_SLICE_ALTROOT}a" 
/dev/${MD}${NANO_SLICE_ALTROOT}a
+                       tunefs -L ${NANO_LABEL}"${NANO_ALTROOT}" 
/dev/${MD}${NANO_ALTROOT}
                fi
        fi
        

Modified: head/tools/tools/nanobsd/embedded/common
==============================================================================
--- head/tools/tools/nanobsd/embedded/common    Sat Jan 30 07:00:28 2016        
(r295063)
+++ head/tools/tools/nanobsd/embedded/common    Sat Jan 30 07:00:29 2016        
(r295064)
@@ -664,6 +664,11 @@ powerpc64-apple)
        ;;
 esac
 
+# For this config, no BSD labels so NANO_ROOT and NANO_ALTROOT need to be
+# adjusted
+NANO_ROOT=${NANO_SLICE_ROOT}
+NANO_ALTROOT=${NANO_SLICE_ALTROOT}
+
 NANO_SLICE_DATA=               # Not included
 
 # Each major disk scheme has its own routine. Generally
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to