diff options
| author | jkh <jkh@FreeBSD.org> | 1997-01-17 10:57:26 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1997-01-17 10:57:26 +0000 |
| commit | dc311d3ebe8d1fd57546c7979f7f22ec79caac4b (patch) | |
| tree | aaa52a73ad198588ac3ae16c74af0b001d7c3e89 /release | |
| parent | 2ce875e983c7c5de2fe3d2d8bf682bbec8bbd5ae (diff) | |
| download | FreeBSD-src-dc311d3ebe8d1fd57546c7979f7f22ec79caac4b.zip FreeBSD-src-dc311d3ebe8d1fd57546c7979f7f22ec79caac4b.tar.gz | |
Pass LOAD_CONFIG_FILE variable through, if set (makes Paul Traina's life
easier). Only run install.cfg if running as init. It's something of
a security hole otherwise. :)
Diffstat (limited to 'release')
| -rw-r--r-- | release/sysinstall/Makefile | 4 | ||||
| -rw-r--r-- | release/sysinstall/main.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile index d4b3e13..1b2762e 100644 --- a/release/sysinstall/Makefile +++ b/release/sysinstall/Makefile @@ -18,7 +18,9 @@ SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \ CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} -I/sys CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG -#CFLAGS+= -DLOAD_CONFIG_FILE=\"install.cfg\" +.if defined(LOAD_CONFIG_FILE) +CFLAGS+= -DLOAD_CONFIG_FILE=\"${LOAD_CONFIG_FILE}\" +.endif DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO} LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio diff --git a/release/sysinstall/main.c b/release/sysinstall/main.c index fcf9b52..a207fb1 100644 --- a/release/sysinstall/main.c +++ b/release/sysinstall/main.c @@ -113,8 +113,7 @@ main(int argc, char **argv) if (argc > start_arg) systemShutdown(0); } - - { + else { FILE *fp; char buf[BUFSIZ]; |
