From: Geoff Levand <geoff@infradead.org>
Date: Fri, 9 Mar 2012 02:31:50 +0000 (-0800)
Subject: Log file cleanups
X-Git-Tag: v1.0.0~785
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=ae0ba68f475ae5b057aad6538765bc8702134b9a

Log file cleanups

Signed-off-by: Geoff Levand <geoff@infradead.org>
---

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index bd515e3..fa1c28e 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -58,7 +58,7 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 	};
 	static const char short_options[] = "hl:V";
 	static const struct opts default_values = {
-		.log_file = "pb-discover.log",
+		.log_file = "/var/log/petitboot/pb-discover.log",
 	};
 
 	*opts = default_values;
diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index 972490a..2d342c3 100644
--- a/ui/ncurses/generic-main.c
+++ b/ui/ncurses/generic-main.c
@@ -38,14 +38,14 @@
 
 static void print_version(void)
 {
-	printf("pb-cui (" PACKAGE_NAME ") " PACKAGE_VERSION "\n");
+	printf("petitboot-nc (" PACKAGE_NAME ") " PACKAGE_VERSION "\n");
 }
 
 static void print_usage(void)
 {
 	print_version();
 	printf(
-"Usage: pb-cui [-h, --help] [-l, --log log-file] [-V, --version]\n");
+"Usage: petitboot-nc [-h, --help] [-l, --log log-file] [-V, --version]\n");
 }
 
 /**
@@ -78,7 +78,7 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 	};
 	static const char short_options[] = "hl:V";
 	static const struct opts default_values = {
-		.log_file = "pb-cui.log",
+		.log_file = "/var/log/petitboot/petitboot-nc.log",
 	};
 
 	*opts = default_values;
@@ -255,7 +255,7 @@ int main(int argc, char *argv[])
 	pb_log_always_flush(1);
 #endif
 
-	pb_log("--- pb-cui ---\n");
+	pb_log("--- petitboot-nc ---\n");
 
 	sa.sa_handler = sig_handler;
 	result = sigaction(SIGALRM, &sa, NULL);
diff --git a/ui/ncurses/ps3-main.c b/ui/ncurses/ps3-main.c
index d9a66fa..890e47b 100644
--- a/ui/ncurses/ps3-main.c
+++ b/ui/ncurses/ps3-main.c
@@ -90,7 +90,7 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 	};
 	static const char short_options[] = "hl:trV";
 	static const struct opts default_values = {
-		.log_file = "pb-cui.log",
+		.log_file = "/var/log/petitboot/petitboot-nc.log",
 	};
 
 	*opts = default_values;
diff --git a/ui/twin/main-generic.c b/ui/twin/main-generic.c
index d314cbc..5020fa2 100644
--- a/ui/twin/main-generic.c
+++ b/ui/twin/main-generic.c
@@ -313,7 +313,7 @@ int main(int argc, char *argv[])
 	pb_log_always_flush(1);
 #endif
 
-	pb_log("--- pb-twin ---\n");
+	pb_log("--- petitboot-twin ---\n");
 
 	sa.sa_handler = sig_handler;
 	result = sigaction(SIGALRM, &sa, NULL);
diff --git a/ui/twin/pbt-main.c b/ui/twin/pbt-main.c
index cc69b4b..51ff5f2 100644
--- a/ui/twin/pbt-main.c
+++ b/ui/twin/pbt-main.c
@@ -27,15 +27,16 @@
 
 void pbt_print_version(void)
 {
-	printf("pb-twin (" PACKAGE_NAME ") " PACKAGE_VERSION "\n");
+	printf("petitboot-twin (" PACKAGE_NAME ") " PACKAGE_VERSION "\n");
 }
 
 void pbt_print_usage(void)
 {
 	pbt_print_version();
 	printf(
-"Usage: pb-twin [-h, --help] [-l, --log log-file] [-r, --reset-defaults]\n"
-"               [-t, --timeout] [-V, --version] [[-f --fbdev] | [-x --x11]]\n");
+"Usage: petitboot-twin [-h, --help] [-l, --log log-file]\n"
+"                      [-r, --reset-defaults][-t, --timeout] [-V, --version]"
+"                      [[-f --fbdev] | [-x --x11]]\n");
 }
 
 /**
@@ -57,7 +58,7 @@ int pbt_opts_parse(struct pbt_opts *opts, int argc, char *argv[])
 	static const char short_options[] = "fhl:trVx";
 	static const struct pbt_opts default_values = {
 		.backend = pbt_twin_x11,
-		.log_file = "pb-twin.log",
+		.log_file = "/var/log/petitboot/petitboot-twin.log",
 	};
 
 	*opts = default_values;
diff --git a/utils/pb-udhcpc b/utils/pb-udhcpc
index bc0f759..f157064 100644
--- a/utils/pb-udhcpc
+++ b/utils/pb-udhcpc
@@ -7,7 +7,7 @@
 #
 
 PBOOT_USER_EVENT_SOCKET="/tmp/petitboot.ev"
-log="pb-udhcpc.log"
+log="/var/log/petitboot/pb-udhcpc.log"
 
 pb_add () {
 	k_server_ip=${rootpath%%:*}