diff options
author | Warner Losh <imp@FreeBSD.org> | 2001-04-24 07:02:01 +0000 |
---|---|---|
committer | Warner Losh <imp@FreeBSD.org> | 2001-04-24 07:02:01 +0000 |
commit | c23b0b247d7adadc44a497a16f100623e92ce217 (patch) | |
tree | c7874e1eb9ad4cbd9066c00b276b1806dd6dce3b /etc/rc.d | |
parent | 91dd3b538c5c3d17da1535ed4e0e608eda093be2 (diff) | |
download | src-c23b0b247d7adadc44a497a16f100623e92ce217.tar.gz src-c23b0b247d7adadc44a497a16f100623e92ce217.zip |
MFS: the MFS still applies to -current until such time as someone fixes
rc.diskless2 to use mdconfig rather than mount_mfs. These changes are
still relevant to -current.
Notes
Notes:
svn path=/head/; revision=75898
Diffstat (limited to 'etc/rc.d')
-rw-r--r-- | etc/rc.d/diskless | 34 | ||||
-rw-r--r-- | etc/rc.d/resolv | 34 | ||||
-rw-r--r-- | etc/rc.d/tmp | 34 | ||||
-rw-r--r-- | etc/rc.d/var | 34 |
4 files changed, 76 insertions, 60 deletions
diff --git a/etc/rc.d/diskless b/etc/rc.d/diskless index 1443724945cb..858261d5c13a 100644 --- a/etc/rc.d/diskless +++ b/etc/rc.d/diskless @@ -38,29 +38,33 @@ /sbin/mount /dev/md$3c $2 } +echo "+++ mfs_mount of /var" mount_mfs -s ${varsize:=65536} -T qp120at dummy /var -var_dirs="run dev db msgs tmp spool spool/mqueue spool/lpd spool/output \ - spool/output/lpd" -for i in ${var_dirs} -do - mkdir /var/${i} -done -chmod 755 /var/run -chmod 755 /var/db -chmod 755 /var/spool -chmod 1777 /var/tmp -chown -R root.daemon /var/spool/output -chgrp daemon /var/spool/lpd +if [ -r /etc/rc.subr ]; then + . /etc/rc.subr + load_rc_config $name +echo "+++ mount_md of /var" +mount_md ${varsize:=32m} /var 1 + +echo "+++ populate /var using /etc/mtree/BSD.var.dist" +/usr/sbin/mtree -deU -f /etc/mtree/BSD.var.dist -p /var +case ${sendmail_enable} in + /usr/bin/touch $LOGFILES +fi + # Since we are starting with a very fresh /etc on an MFS: if [ -d /conf/default/etc ]; then newaliases fi -if [ ! -h /tmp -a ! -h /var/tmp ]; then - mount_null /var/tmp /tmp -fi +# We assume that /tmp is symlinked to /var/tmp on the shared root +# partition. mount_null seems to have problems. +#if [ ! -h /tmp -a ! -h /var/tmp ]; then +# mount_null /var/tmp /tmp +#fi # # extract a list of device entries, then copy them to a writable partition (cd /; find -x dev | cpio -o -H newc) > /tmp/dev.tmp +echo "+++ mount_mfs of /dev" mount_mfs -s 4096 -i 512 -T qp120at dummy /dev (cd /; cpio -i -H newc -d < /tmp/dev.tmp) # extract a list of device entries, then copy them to a writable fs diff --git a/etc/rc.d/resolv b/etc/rc.d/resolv index 1443724945cb..858261d5c13a 100644 --- a/etc/rc.d/resolv +++ b/etc/rc.d/resolv @@ -38,29 +38,33 @@ /sbin/mount /dev/md$3c $2 } +echo "+++ mfs_mount of /var" mount_mfs -s ${varsize:=65536} -T qp120at dummy /var -var_dirs="run dev db msgs tmp spool spool/mqueue spool/lpd spool/output \ - spool/output/lpd" -for i in ${var_dirs} -do - mkdir /var/${i} -done -chmod 755 /var/run -chmod 755 /var/db -chmod 755 /var/spool -chmod 1777 /var/tmp -chown -R root.daemon /var/spool/output -chgrp daemon /var/spool/lpd +if [ -r /etc/rc.subr ]; then + . /etc/rc.subr + load_rc_config $name +echo "+++ mount_md of /var" +mount_md ${varsize:=32m} /var 1 + +echo "+++ populate /var using /etc/mtree/BSD.var.dist" +/usr/sbin/mtree -deU -f /etc/mtree/BSD.var.dist -p /var +case ${sendmail_enable} in + /usr/bin/touch $LOGFILES +fi + # Since we are starting with a very fresh /etc on an MFS: if [ -d /conf/default/etc ]; then newaliases fi -if [ ! -h /tmp -a ! -h /var/tmp ]; then - mount_null /var/tmp /tmp -fi +# We assume that /tmp is symlinked to /var/tmp on the shared root +# partition. mount_null seems to have problems. +#if [ ! -h /tmp -a ! -h /var/tmp ]; then +# mount_null /var/tmp /tmp +#fi # # extract a list of device entries, then copy them to a writable partition (cd /; find -x dev | cpio -o -H newc) > /tmp/dev.tmp +echo "+++ mount_mfs of /dev" mount_mfs -s 4096 -i 512 -T qp120at dummy /dev (cd /; cpio -i -H newc -d < /tmp/dev.tmp) # extract a list of device entries, then copy them to a writable fs diff --git a/etc/rc.d/tmp b/etc/rc.d/tmp index 1443724945cb..858261d5c13a 100644 --- a/etc/rc.d/tmp +++ b/etc/rc.d/tmp @@ -38,29 +38,33 @@ /sbin/mount /dev/md$3c $2 } +echo "+++ mfs_mount of /var" mount_mfs -s ${varsize:=65536} -T qp120at dummy /var -var_dirs="run dev db msgs tmp spool spool/mqueue spool/lpd spool/output \ - spool/output/lpd" -for i in ${var_dirs} -do - mkdir /var/${i} -done -chmod 755 /var/run -chmod 755 /var/db -chmod 755 /var/spool -chmod 1777 /var/tmp -chown -R root.daemon /var/spool/output -chgrp daemon /var/spool/lpd +if [ -r /etc/rc.subr ]; then + . /etc/rc.subr + load_rc_config $name +echo "+++ mount_md of /var" +mount_md ${varsize:=32m} /var 1 + +echo "+++ populate /var using /etc/mtree/BSD.var.dist" +/usr/sbin/mtree -deU -f /etc/mtree/BSD.var.dist -p /var +case ${sendmail_enable} in + /usr/bin/touch $LOGFILES +fi + # Since we are starting with a very fresh /etc on an MFS: if [ -d /conf/default/etc ]; then newaliases fi -if [ ! -h /tmp -a ! -h /var/tmp ]; then - mount_null /var/tmp /tmp -fi +# We assume that /tmp is symlinked to /var/tmp on the shared root +# partition. mount_null seems to have problems. +#if [ ! -h /tmp -a ! -h /var/tmp ]; then +# mount_null /var/tmp /tmp +#fi # # extract a list of device entries, then copy them to a writable partition (cd /; find -x dev | cpio -o -H newc) > /tmp/dev.tmp +echo "+++ mount_mfs of /dev" mount_mfs -s 4096 -i 512 -T qp120at dummy /dev (cd /; cpio -i -H newc -d < /tmp/dev.tmp) # extract a list of device entries, then copy them to a writable fs diff --git a/etc/rc.d/var b/etc/rc.d/var index 1443724945cb..858261d5c13a 100644 --- a/etc/rc.d/var +++ b/etc/rc.d/var @@ -38,29 +38,33 @@ /sbin/mount /dev/md$3c $2 } +echo "+++ mfs_mount of /var" mount_mfs -s ${varsize:=65536} -T qp120at dummy /var -var_dirs="run dev db msgs tmp spool spool/mqueue spool/lpd spool/output \ - spool/output/lpd" -for i in ${var_dirs} -do - mkdir /var/${i} -done -chmod 755 /var/run -chmod 755 /var/db -chmod 755 /var/spool -chmod 1777 /var/tmp -chown -R root.daemon /var/spool/output -chgrp daemon /var/spool/lpd +if [ -r /etc/rc.subr ]; then + . /etc/rc.subr + load_rc_config $name +echo "+++ mount_md of /var" +mount_md ${varsize:=32m} /var 1 + +echo "+++ populate /var using /etc/mtree/BSD.var.dist" +/usr/sbin/mtree -deU -f /etc/mtree/BSD.var.dist -p /var +case ${sendmail_enable} in + /usr/bin/touch $LOGFILES +fi + # Since we are starting with a very fresh /etc on an MFS: if [ -d /conf/default/etc ]; then newaliases fi -if [ ! -h /tmp -a ! -h /var/tmp ]; then - mount_null /var/tmp /tmp -fi +# We assume that /tmp is symlinked to /var/tmp on the shared root +# partition. mount_null seems to have problems. +#if [ ! -h /tmp -a ! -h /var/tmp ]; then +# mount_null /var/tmp /tmp +#fi # # extract a list of device entries, then copy them to a writable partition (cd /; find -x dev | cpio -o -H newc) > /tmp/dev.tmp +echo "+++ mount_mfs of /dev" mount_mfs -s 4096 -i 512 -T qp120at dummy /dev (cd /; cpio -i -H newc -d < /tmp/dev.tmp) # extract a list of device entries, then copy them to a writable fs |