diff options
| author | ed <ed@FreeBSD.org> | 2009-06-15 21:05:00 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2009-06-15 21:05:00 +0000 |
| commit | 8e18b541e72bb508f317616f45dc8ca4ea75510e (patch) | |
| tree | e1694fafc3ffd8b1d2ef6c086934e9cd2981935c /usr.bin/chpass | |
| parent | fa3d9801ccbe82d0e8899c7ae72239b16e3de03a (diff) | |
| download | FreeBSD-src-8e18b541e72bb508f317616f45dc8ca4ea75510e.zip FreeBSD-src-8e18b541e72bb508f317616f45dc8ca4ea75510e.tar.gz | |
Make the chpass Makefile honour NO_FSCHG.
The chpass Makefile tried to set the fschg flag on the binaries, even if
NO_FSCHG was passed to the installworld. This meant that if I installed
FreeBSD into a Jail, I couldn't installworld from within the Jail
anymore.
Now that it listens to NO_FSCHG, we can just make it bail out when it
fails, just like PRECIOUSPROG does.
Diffstat (limited to 'usr.bin/chpass')
| -rw-r--r-- | usr.bin/chpass/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile index 2bbdc08..e958956 100644 --- a/usr.bin/chpass/Makefile +++ b/usr.bin/chpass/Makefile @@ -39,11 +39,12 @@ MLINKS+= chpass.1 ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1 beforeinstall: .for i in chpass chfn chsh ypchpass ypchfn ypchsh - [ ! -e ${DESTDIR}${BINDIR}/$i ] || \ - chflags noschg ${DESTDIR}${BINDIR}/$i || true + -chflags noschg ${DESTDIR}${BINDIR}/$i .endfor +.if !defined(NO_FSCHG) afterinstall: - -chflags schg ${DESTDIR}${BINDIR}/chpass + chflags schg ${DESTDIR}${BINDIR}/chpass +.endif .include <bsd.prog.mk> |
