diff options
| author |   Ed Schouten <ed@FreeBSD.org> | 2009-06-15 21:05:00 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2009-06-15 21:05:00 +0000 |
| commit | 6e4f22c83ba4231d78dad1c8aff9c65c936d3750 (patch) | |
| tree | 4b533f6874442535576b8dfa8ea2c2532222bc1c /chpass/Makefile | |
| parent | d1ed3c585dd582b203fc6d1ac5d7acf61bf97a6d (diff) | |
| download | pw-darwin-6e4f22c83ba4231d78dad1c8aff9c65c936d3750.tar.gz pw-darwin-6e4f22c83ba4231d78dad1c8aff9c65c936d3750.tar.zst pw-darwin-6e4f22c83ba4231d78dad1c8aff9c65c936d3750.zip | |
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 'chpass/Makefile')
| -rw-r--r-- | chpass/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chpass/Makefile b/chpass/Makefile index 2bbdc08..e958956 100644 --- a/chpass/Makefile +++ b/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> |