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. :)
This commit is contained in:
parent
702cd1363b
commit
01e9b77ee3
@ -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
|
||||
|
@ -113,8 +113,7 @@ main(int argc, char **argv)
|
||||
if (argc > start_arg)
|
||||
systemShutdown(0);
|
||||
}
|
||||
|
||||
{
|
||||
else {
|
||||
FILE *fp;
|
||||
char buf[BUFSIZ];
|
||||
|
||||
|
@ -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
|
||||
|
@ -113,8 +113,7 @@ main(int argc, char **argv)
|
||||
if (argc > start_arg)
|
||||
systemShutdown(0);
|
||||
}
|
||||
|
||||
{
|
||||
else {
|
||||
FILE *fp;
|
||||
char buf[BUFSIZ];
|
||||
|
||||
|
@ -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
|
||||
|
@ -113,8 +113,7 @@ main(int argc, char **argv)
|
||||
if (argc > start_arg)
|
||||
systemShutdown(0);
|
||||
}
|
||||
|
||||
{
|
||||
else {
|
||||
FILE *fp;
|
||||
char buf[BUFSIZ];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user