diff options
| author | imp <imp@FreeBSD.org> | 2015-12-05 17:40:11 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2015-12-05 17:40:11 +0000 |
| commit | 5c35c857c9c91fb1bffedf4bf172545a0ee10eb4 (patch) | |
| tree | 8816c75af408d105ecadebf7980bdc1cebd61482 | |
| parent | 3e90d8ef55f98cd3a8a0506f1ff10d579b1cc5e8 (diff) | |
| download | FreeBSD-src-5c35c857c9c91fb1bffedf4bf172545a0ee10eb4.zip FreeBSD-src-5c35c857c9c91fb1bffedf4bf172545a0ee10eb4.tar.gz | |
When building no-priv, chmod etc/defaults/rc.conf before appending to
it and then chmod back. There's no chmod -push / chmod -pop so hard
code 444 as the right permissions here.
Also, fix more stray detritus that crept in (out?) while re-arranging
the deck chairs.
| -rwxr-xr-x | tools/tools/nanobsd/defaults.sh | 4 | ||||
| -rw-r--r-- | tools/tools/nanobsd/embedded/common | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index fdb2360..067d306 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -490,7 +490,9 @@ setup_nanobsd_etc ( ) ( touch etc/diskless # Make root filesystem R/O by default + [ ! -z "${NANO_NOPRIV_BUILD}" ] && chmod 666 etc/defaults/rc.conf echo "root_rw_mount=NO" >> etc/defaults/rc.conf + [ ! -z "${NANO_NOPRIV_BUILD}" ] && chmod 444 etc/defaults/rc.conf # save config file for scripts echo "NANO_DRIVE=${NANO_DRIVE}" > etc/nanobsd.conf @@ -961,7 +963,7 @@ set_defaults_and_export ( ) { [ ! -d "${NANO_TOOLS}" ] && [ -d "${NANO_SRC}/${NANO_TOOLS}" ] && \ NANO_TOOLS="${NANO_SRC}/${NANO_TOOLS}" || true - [ ! -z "${NANO_NOPRIV_BUILD}" ] && [ -z "${NANO_METALOG}"] && \ + [ ! -z "${NANO_NOPRIV_BUILD}" ] && [ -z "${NANO_METALOG}" ] && \ NANO_METALOG=${NANO_OBJ}/_.metalog || true NANO_STARTTIME=`date +%s` diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index 2d88456..a4635f0 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -357,7 +357,7 @@ create_diskimage ( ) ( # s1 is cfg, s2 is /, not sure how to make that # boot (marked as active) with mkimg yet mkimg -s mbr -p ${s1}:=${NANO_OBJ}/_.s1 \ - -p ${s2}:=${NANO_OBJ}/_.s2 + -p ${s2}:=${NANO_OBJ}/_.s2 \ -o ${NANO_OBJ}/_.disk.image.${NANO_NAME} fi ) > ${NANO_OBJ}/_.di 2>&1 |
