summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--isys/Makefile.am2
-rw-r--r--isys/log.c (renamed from loader/log.c)0
-rw-r--r--isys/log.h (renamed from loader/log.h)0
-rw-r--r--loader/Makefile.am2
-rw-r--r--loader/cdinstall.c2
-rw-r--r--loader/dirbrowser.c3
-rw-r--r--loader/driverdisk.c2
-rw-r--r--loader/driverselect.c3
-rw-r--r--loader/fwloader.c3
-rw-r--r--loader/getparts.c2
-rw-r--r--loader/hardware.c2
-rw-r--r--loader/hdinstall.c2
-rw-r--r--loader/kbd.c2
-rw-r--r--loader/kickstart.c2
-rw-r--r--loader/lang.c2
-rw-r--r--loader/loader.c2
-rw-r--r--loader/loadermisc.c3
-rw-r--r--loader/mediacheck.c3
-rw-r--r--loader/method.c2
-rw-r--r--loader/modules.c3
-rw-r--r--loader/net.c2
-rw-r--r--loader/nfsinstall.c2
-rw-r--r--loader/rpmextract.c3
-rw-r--r--loader/selinux.c2
-rw-r--r--loader/telnet.c2
-rw-r--r--loader/telnetd.c3
-rw-r--r--loader/urlinstall.c2
-rw-r--r--loader/urls.c3
-rw-r--r--loader/windows.c3
29 files changed, 37 insertions, 27 deletions
diff --git a/isys/Makefile.am b/isys/Makefile.am
index deebabc4a..f6a3247e7 100644
--- a/isys/Makefile.am
+++ b/isys/Makefile.am
@@ -19,7 +19,7 @@
ISYS_SRCS = devices.c imount.c cpio.c uncpio.c lang.c \
isofs.c linkdetect.c vio.c ethtool.c eddsupport.c iface.c \
- str.c auditd.c
+ str.c auditd.c log.c
dist_noinst_HEADERS = *.h
diff --git a/loader/log.c b/isys/log.c
index 7824d9273..7824d9273 100644
--- a/loader/log.c
+++ b/isys/log.c
diff --git a/loader/log.h b/isys/log.h
index 183c0b2ba..183c0b2ba 100644
--- a/loader/log.h
+++ b/isys/log.h
diff --git a/loader/Makefile.am b/loader/Makefile.am
index 4d063bb29..a2b79d728 100644
--- a/loader/Makefile.am
+++ b/loader/Makefile.am
@@ -46,7 +46,7 @@ loader_LDADD = $(NEWT_LIBS) $(GLIB_LIBS) $(LIBNL_LIBS) \
$(LIBNM_GLIB_LIBS) $(CHECKISOMD5_LIBS) \
$(LIBCURL_LIBS) $(LIBARCHIVE_LIBS) $(RPM_LIBS) \
$(ISCSI_LIBS) $(top_srcdir)/isys/libisys.la -lm
-loader_SOURCES = loader.c copy.c log.c moduleinfo.c loadermisc.c \
+loader_SOURCES = loader.c copy.c moduleinfo.c loadermisc.c \
modules.c windows.c lang.c kbd.c driverdisk.c \
selinux.c mediacheck.c kickstart.c driverselect.c \
getparts.c dirbrowser.c fwloader.c ibft.c hardware.c \
diff --git a/loader/cdinstall.c b/loader/cdinstall.c
index 3ccc332a8..9d5cee157 100644
--- a/loader/cdinstall.c
+++ b/loader/cdinstall.c
@@ -49,7 +49,6 @@
#include "kickstart.h"
#include "loader.h"
#include "loadermisc.h"
-#include "log.h"
#include "lang.h"
#include "modules.h"
#include "method.h"
@@ -59,6 +58,7 @@
#include "../isys/imount.h"
#include "../isys/isys.h"
+#include "../isys/log.h"
/* boot flags */
extern uint64_t flags;
diff --git a/loader/dirbrowser.c b/loader/dirbrowser.c
index 5632984de..9199850f4 100644
--- a/loader/dirbrowser.c
+++ b/loader/dirbrowser.c
@@ -31,7 +31,8 @@
#include <sys/stat.h>
#ifndef STANDALONE
-#include "log.h"
+#include "../isys/log.h"
+
#include "loader.h"
#include "loadermisc.h"
#include "lang.h"
diff --git a/loader/driverdisk.c b/loader/driverdisk.c
index 4c98b2711..686cc1cf0 100644
--- a/loader/driverdisk.c
+++ b/loader/driverdisk.c
@@ -38,7 +38,6 @@
#include "copy.h"
#include "loader.h"
-#include "log.h"
#include "loadermisc.h"
#include "lang.h"
#include "fwloader.h"
@@ -59,6 +58,7 @@
#include "../isys/isys.h"
#include "../isys/imount.h"
#include "../isys/eddsupport.h"
+#include "../isys/log.h"
/* boot flags */
extern uint64_t flags;
diff --git a/loader/driverselect.c b/loader/driverselect.c
index f9379f0a4..19aa357e0 100644
--- a/loader/driverselect.c
+++ b/loader/driverselect.c
@@ -28,11 +28,12 @@
#include <unistd.h>
#include <errno.h>
+#include "../isys/log.h"
+
#include "modules.h"
#include "moduleinfo.h"
#include "loader.h"
#include "loadermisc.h"
-#include "log.h"
#include "lang.h"
#include "driverdisk.h"
diff --git a/loader/fwloader.c b/loader/fwloader.c
index a91ff6b13..5ad1d8ea5 100644
--- a/loader/fwloader.c
+++ b/loader/fwloader.c
@@ -41,10 +41,11 @@
#include <asm/types.h>
#include <linux/netlink.h>
+#include "../isys/log.h"
+
#include "loader.h"
#include "fwloader.h"
#include "udelay.h"
-#include "log.h"
#ifndef FWDEBUG
#define logMessage(x, ...)
diff --git a/loader/getparts.c b/loader/getparts.c
index 8d2b7c4c6..c60dc8367 100644
--- a/loader/getparts.c
+++ b/loader/getparts.c
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "log.h"
+#include "../isys/log.h"
/* see if this is a partition name or not */
static int isPartitionName(char *pname) {
diff --git a/loader/hardware.c b/loader/hardware.c
index 93fb0f8c0..6444271f5 100644
--- a/loader/hardware.c
+++ b/loader/hardware.c
@@ -35,12 +35,12 @@
#include "loader.h"
#include "hardware.h"
-#include "log.h"
/* FIXME: for turning off dma */
#include <sys/ioctl.h>
#include <linux/hdreg.h>
#include "../isys/isys.h"
+#include "../isys/log.h"
/* boot flags */
extern uint64_t flags;
diff --git a/loader/hdinstall.c b/loader/hdinstall.c
index ea39095c9..b21604a4f 100644
--- a/loader/hdinstall.c
+++ b/loader/hdinstall.c
@@ -39,7 +39,6 @@
#include "kickstart.h"
#include "loader.h"
#include "loadermisc.h"
-#include "log.h"
#include "lang.h"
#include "modules.h"
#include "method.h"
@@ -50,6 +49,7 @@
#include "../isys/imount.h"
#include "../isys/isys.h"
#include "../isys/eddsupport.h"
+#include "../isys/log.h"
/* boot flags */
extern uint64_t flags;
diff --git a/loader/kbd.c b/loader/kbd.c
index 191f91da8..b94f9200f 100644
--- a/loader/kbd.c
+++ b/loader/kbd.c
@@ -31,12 +31,12 @@
#include "loader.h"
#include "loadermisc.h"
-#include "log.h"
#include "lang.h"
#include "windows.h"
#include "../isys/stubs.h"
#include "../isys/lang.h"
+#include "../isys/log.h"
/* boot flags */
extern uint64_t flags;
diff --git a/loader/kickstart.c b/loader/kickstart.c
index f2c758d4b..4ff800f20 100644
--- a/loader/kickstart.c
+++ b/loader/kickstart.c
@@ -37,7 +37,6 @@
#include "loader.h"
#include "loadermisc.h"
#include "lang.h"
-#include "log.h"
#include "kickstart.h"
#include "modules.h"
@@ -53,6 +52,7 @@
#include "../isys/imount.h"
#include "../isys/isys.h"
+#include "../isys/log.h"
/* boot flags */
extern uint64_t flags;
diff --git a/loader/lang.c b/loader/lang.c
index fe2e8b780..c74a11bb7 100644
--- a/loader/lang.c
+++ b/loader/lang.c
@@ -37,7 +37,6 @@
#include "loader.h"
#include "lang.h"
-#include "log.h"
#include "loadermisc.h"
#include "windows.h"
@@ -45,6 +44,7 @@
#include "../isys/cpio.h"
#include "../isys/lang.h"
#include "../isys/isys.h"
+#include "../isys/log.h"
/* boot flags */
extern uint64_t flags;
diff --git a/loader/loader.c b/loader/loader.c
index 265fa859d..1f6016057 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -64,7 +64,6 @@
#include "getparts.h"
#include "loader.h"
#include "loadermisc.h" /* JKFIXME: functions here should be split out */
-#include "log.h"
#include "lang.h"
#include "fwloader.h"
#include "kbd.h"
@@ -100,6 +99,7 @@
#include "../isys/lang.h"
#include "../isys/eddsupport.h"
#include "../isys/str.h"
+#include "../isys/log.h"
/* maximum number of extra arguments that can be passed to the second stage */
#define MAX_EXTRA_ARGS 128
diff --git a/loader/loadermisc.c b/loader/loadermisc.c
index 03d26bba9..64e80a2d6 100644
--- a/loader/loadermisc.c
+++ b/loader/loadermisc.c
@@ -32,7 +32,8 @@
#include <stdarg.h>
#include <stdlib.h>
-#include "log.h"
+#include "../isys/log.h"
+
#include "windows.h"
int copyFileFd(int infd, char * dest, progressCB pbcb,
diff --git a/loader/mediacheck.c b/loader/mediacheck.c
index 6e966477f..ee5a7941b 100644
--- a/loader/mediacheck.c
+++ b/loader/mediacheck.c
@@ -30,8 +30,9 @@
#include <newt.h>
#include <libcheckisomd5.h>
+#include "../isys/log.h"
+
#include "lang.h"
-#include "log.h"
#include "windows.h"
int doMediaCheck(char *file, char *descr) {
diff --git a/loader/method.c b/loader/method.c
index 0073d3437..c2a5bd662 100644
--- a/loader/method.c
+++ b/loader/method.c
@@ -41,7 +41,6 @@
#include "copy.h"
#include "loader.h"
#include "loadermisc.h"
-#include "log.h"
#include "lang.h"
#include "mediacheck.h"
#include "method.h"
@@ -49,6 +48,7 @@
#include "../isys/imount.h"
#include "../isys/isys.h"
#include "../isys/cpio.h"
+#include "../isys/log.h"
#include "devt.h"
diff --git a/loader/modules.c b/loader/modules.c
index 07f781a24..0944b97b1 100644
--- a/loader/modules.c
+++ b/loader/modules.c
@@ -40,8 +40,9 @@
#include <unistd.h>
#include <glib.h>
+#include "../isys/log.h"
+
#include "loader.h"
-#include "log.h"
#include "modules.h"
#include "windows.h"
diff --git a/loader/net.c b/loader/net.c
index 9e4daa1af..8796a68e9 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -44,11 +44,11 @@
#include "../isys/ethtool.h"
#include "../isys/iface.h"
#include "../isys/str.h"
+#include "../isys/log.h"
#include "lang.h"
#include "loader.h"
#include "loadermisc.h"
-#include "log.h"
#include "method.h"
#include "net.h"
#include "windows.h"
diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c
index de1ce296d..ae1387420 100644
--- a/loader/nfsinstall.c
+++ b/loader/nfsinstall.c
@@ -44,7 +44,6 @@
#include "lang.h"
#include "loadermisc.h"
#include "kickstart.h"
-#include "log.h"
#include "method.h"
#include "nfsinstall.h"
#include "net.h"
@@ -53,6 +52,7 @@
#include "../isys/imount.h"
#include "../isys/iface.h"
+#include "../isys/log.h"
/* boot flags */
extern uint64_t flags;
diff --git a/loader/rpmextract.c b/loader/rpmextract.c
index 90af54c1e..d1549b8f1 100644
--- a/loader/rpmextract.c
+++ b/loader/rpmextract.c
@@ -37,9 +37,10 @@
#include <archive_entry.h>
#include "loader.h"
-#include "log.h"
#include "rpmextract.h"
+#include "../isys/log.h"
+
/*
* internal structure to pass to libarchive callbacks
*/
diff --git a/loader/selinux.c b/loader/selinux.c
index 337d04147..66bfe4d0a 100644
--- a/loader/selinux.c
+++ b/loader/selinux.c
@@ -32,7 +32,7 @@
#include "loader.h"
#include "loadermisc.h"
-#include "log.h"
+#include "../isys/log.h"
int loadpolicy() {
int pid, status;
diff --git a/loader/telnet.c b/loader/telnet.c
index a2c0b201f..3c123aeda 100644
--- a/loader/telnet.c
+++ b/loader/telnet.c
@@ -27,7 +27,7 @@
#include <unistd.h>
#include "telnet.h"
-#include "log.h"
+#include "../isys/log.h"
#define IAC "\xff"
#define DONT "\xfe"
diff --git a/loader/telnetd.c b/loader/telnetd.c
index cdf7e162e..e3a021d84 100644
--- a/loader/telnetd.c
+++ b/loader/telnetd.c
@@ -36,9 +36,10 @@
#include <sys/types.h>
#include <unistd.h>
+#include "../isys/log.h"
+
#include "lang.h"
#include "loader.h"
-#include "log.h"
#include "modules.h"
#include "net.h"
#include "telnet.h"
diff --git a/loader/urlinstall.c b/loader/urlinstall.c
index 9148c33d5..85776de46 100644
--- a/loader/urlinstall.c
+++ b/loader/urlinstall.c
@@ -32,13 +32,13 @@
#include <glib.h>
#include "../isys/iface.h"
+#include "../isys/log.h"
#include "copy.h"
#include "kickstart.h"
#include "loader.h"
#include "loadermisc.h"
#include "lang.h"
-#include "log.h"
#include "method.h"
#include "net.h"
#include "method.h"
diff --git a/loader/urls.c b/loader/urls.c
index f7d3e341e..ed600ed06 100644
--- a/loader/urls.c
+++ b/loader/urls.c
@@ -39,11 +39,12 @@
#include <errno.h>
#include <curl/curl.h>
+#include "../isys/log.h"
+
#include "lang.h"
#include "loader.h"
#include "loadermisc.h"
#include "urls.h"
-#include "log.h"
#include "windows.h"
#include "net.h"
diff --git a/loader/windows.c b/loader/windows.c
index 3d5713655..b0f1c4682 100644
--- a/loader/windows.c
+++ b/loader/windows.c
@@ -31,7 +31,8 @@
#include <stdarg.h>
#include <math.h>
-#include "log.h"
+#include "../isys/log.h"
+
#include "windows.h"
void winStatus(int width, int height, char * title, char * text, ...) {
generated by cgit (git 2.34.1) at 2024-09-30 10:25:06 +0000