From dc311d3ebe8d1fd57546c7979f7f22ec79caac4b Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Fri, 17 Jan 1997 10:57:26 +0000
Subject: 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. :)

---
 release/sysinstall/Makefile | 4 +++-
 release/sysinstall/main.c   | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'release')

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];
 
-- 
cgit v1.1