d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the setup of "diskless" /etc magic files from install_etc() to a

Browse Source 
separate function which is called right after install_etc().  This makes
it simpler to (ab)use nanobsd.sh as a framework to build more normal
FreeBSD images where a normal /etc is used, since setup_nanobsd_etc()
can just be redefined.

OK'ed in principle by:	phk
MFC after:		1 week
This commit is contained in:
Simon L. B. Nielsen 2006-08-15 21:59:33 +00:00
parent a08875fbb2
commit 22eb0575f2
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/tools/nanobsd/nanobsd.sh
View File

@ -196,19 +196,6 @@ install_etc ( ) (
${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF} distribution \ ${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF} distribution \
DESTDIR=${NANO_WORLDDIR} \ DESTDIR=${NANO_WORLDDIR} \
> ${MAKEOBJDIRPREFIX}/_.etc 2>&1 > ${MAKEOBJDIRPREFIX}/_.etc 2>&1
(
cd ${NANO_WORLDDIR}
# create diskless marker file
touch etc/diskless
# save config file for scripts
echo "NANO_DRIVE=${NANO_DRIVE}" > etc/nanobsd.conf
echo "/dev/${NANO_DRIVE}s1a / ufs ro 1 1" > etc/fstab
echo "/dev/${NANO_DRIVE}s3 /cfg ufs rw,noauto 2 2" >> etc/fstab
mkdir -p cfg
)
) )
install_kernel ( ) ( install_kernel ( ) (
@ -265,6 +252,24 @@ setup_nanobsd ( ) (
) > ${MAKEOBJDIRPREFIX}/_.dl 2>&1 ) > ${MAKEOBJDIRPREFIX}/_.dl 2>&1
) )
setup_nanobsd_etc ( ) (
echo "## configure nanobsd /etc"
(
cd ${NANO_WORLDDIR}
# create diskless marker file
touch etc/diskless
# save config file for scripts
echo "NANO_DRIVE=${NANO_DRIVE}" > etc/nanobsd.conf
echo "/dev/${NANO_DRIVE}s1a / ufs ro 1 1" > etc/fstab
echo "/dev/${NANO_DRIVE}s3 /cfg ufs rw,noauto 2 2" >> etc/fstab
mkdir -p cfg
)
)
prune_usr() ( prune_usr() (
# Remove all empty directories in /usr # Remove all empty directories in /usr
@ -590,6 +595,7 @@ clean_world
make_conf_install make_conf_install
install_world install_world
install_etc install_etc
setup_nanobsd_etc
install_kernel install_kernel
run_customize run_customize