diff options
| author | phk <phk@FreeBSD.org> | 2006-07-13 14:06:09 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2006-07-13 14:06:09 +0000 |
| commit | 418bc501503b50b59f3fc46638dd07b25e2e637f (patch) | |
| tree | 71f6dab9fdc2fdba954d6c82a13fc432afbe1e52 /tools | |
| parent | 98b081a3da99886161f8ff93d44fe37400d079e1 (diff) | |
| download | FreeBSD-src-418bc501503b50b59f3fc46638dd07b25e2e637f.zip FreeBSD-src-418bc501503b50b59f3fc46638dd07b25e2e637f.tar.gz | |
Create the diskless magic files in /etc during the install_etc() step
instead of setup_nanobsd(), because this gives customize tasks a chance
to fiddle the details.
Inspired & tested by: Jordan Coleman <jordan@JordanColeman.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools/nanobsd/nanobsd.sh | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh index 64a1c3f..a406c50 100644 --- a/tools/tools/nanobsd/nanobsd.sh +++ b/tools/tools/nanobsd/nanobsd.sh @@ -196,6 +196,19 @@ install_etc ( ) ( ${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF} distribution \ DESTDIR=${NANO_WORLDDIR} \ > ${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 ( ) ( @@ -228,16 +241,6 @@ setup_nanobsd ( ) ( ( 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 - for d in var etc do # link /$d under /conf |
