diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1994-10-17 02:32:41 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1994-10-17 02:32:41 +0000 |
| commit | a8a4ffd402720a648e8d71f9440ea90563c9b243 (patch) | |
| tree | 0ed9d8537db41ae1d0e2679ab6cc46fcf18c7129 | |
| parent | 1be9232f73c212626a6a55538a16903570f25a0e (diff) | |
Notes
| -rw-r--r-- | etc/Makefile | 14 | ||||
| -rwxr-xr-x | etc/etc.i386/inst1.install | 10 |
2 files changed, 15 insertions, 9 deletions
diff --git a/etc/Makefile b/etc/Makefile index e2de328b1770..05ad28bf9246 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $Id: Makefile,v 1.87 1994/10/15 07:55:36 phk Exp $ +# $Id: Makefile,v 1.88 1994/10/16 20:38:21 phk Exp $ # disktab may be wrong -- hcx9 is a tahoe, but gets its own. # -rw-r--r-- @@ -9,7 +9,7 @@ BIN1= aliases csh.cshrc csh.login csh.logout dm.conf \ ftpusers gettytab group hosts host.conf hosts.equiv hosts.lpd \ inetd.conf login.access motd myname netstart \ networks phones printcap profile protocols rc rc.local remote \ - security services shells skey.access \ + security services shells \ syslog.conf ttys etc.${MACHINE}/disktab rpc make.conf \ ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \ ${.CURDIR}/../usr.bin/mail/misc/mail.rc @@ -558,11 +558,11 @@ distrib-dirs: # XXX This will currently error out if you have a procfs mounted, # unmount it to get past this problem until procfs is fixed. # - mtree -deu -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/ - mtree -deu -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var - mtree -deu -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr + mtree -deU -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/ + mtree -deU -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var + mtree -deU -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr .if defined(MAKE_LOCAL) - mtree -deu -f ${.CURDIR}/mtree/BSD.local.dist -p ${DESTDIR}/usr/local + mtree -deU -f ${.CURDIR}/mtree/BSD.local.dist -p ${DESTDIR}/usr/local .endif cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys @@ -575,6 +575,6 @@ release: release-dirs distribution crunch extract kcopy-kernels \ release-dirs: chflags -R noschg ${RELEASEDIR}/ rm -rf ${RELEASEDIR}/* - mtree -d -u -f ${.CURDIR}/mtree/BSD.release.dist -p ${RELEASEDIR} + mtree -d -U -f ${.CURDIR}/mtree/BSD.release.dist -p ${RELEASEDIR} .include <bsd.prog.mk> diff --git a/etc/etc.i386/inst1.install b/etc/etc.i386/inst1.install index 6eda180bdbaf..395928eac3e4 100755 --- a/etc/etc.i386/inst1.install +++ b/etc/etc.i386/inst1.install @@ -861,7 +861,7 @@ put_fdisk_data echo echo -n "Labelling disk..." echo y | -/sbin/disklabel -w -r -B ${drivename}d $name +/sbin/disklabel -w -r -B ${drivename}c $name # >/dev/null 2>&1 echo " done." @@ -1012,6 +1012,12 @@ echo "exit 1" ) >etc/rc echo "done." +if [ "$hname" != "" ]; then /sbin/umount /dev/${drivename}h ; fi +if [ "$gname" != "" ]; then /sbin/umount /dev/${drivename}g ; fi +if [ "$fname" != "" ]; then /sbin/umount /dev/${drivename}f ; fi +if [ "$ename" != "" ]; then /sbin/umount /dev/${drivename}e ; fi +/sbin/umount /mnt + sync echo @@ -1033,4 +1039,4 @@ echo echo "Okay, that's all for now. I'm halting ..." sync;sync;sync;sync -exit 1 +halt |