summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-01-22 11:30:58 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-01-22 11:30:58 +0000
commit88d070945ccf746f7df37369a0a5f4167ca95c8b (patch)
tree567d9273e805cf8fa54a0e7939065890917ac141
parentf37311c7e3570fdba372723391594ca6cd673228 (diff)
downloaddrakx-88d070945ccf746f7df37369a0a5f4167ca95c8b.tar
drakx-88d070945ccf746f7df37369a0a5f4167ca95c8b.tar.gz
drakx-88d070945ccf746f7df37369a0a5f4167ca95c8b.tar.bz2
drakx-88d070945ccf746f7df37369a0a5f4167ca95c8b.tar.xz
drakx-88d070945ccf746f7df37369a0a5f4167ca95c8b.zip
consistent dot-terminated error messages, consistent no-dot log messages
-rw-r--r--mdk-stage1/dhcp.c4
-rw-r--r--mdk-stage1/modules.c4
-rw-r--r--mdk-stage1/network.c6
-rw-r--r--mdk-stage1/stage1.c4
4 files changed, 9 insertions, 9 deletions
diff --git a/mdk-stage1/dhcp.c b/mdk-stage1/dhcp.c
index ee5f333b2..7a4d4bd68 100644
--- a/mdk-stage1/dhcp.c
+++ b/mdk-stage1/dhcp.c
@@ -459,7 +459,7 @@ static int handle_transaction(int s, struct bootp_request * breq, struct bootp_r
timeout = 5;
}
- error_message("No DHCP reply received");
+ error_message("No DHCP reply received.");
return -1;
}
@@ -500,7 +500,7 @@ enum return_type perform_dhcp(struct interface_info * intf)
char requested_options[50];
if (strncmp(intf->device, "eth", 3)) {
- error_message("DHCP available only for Ethernet networking");
+ error_message("DHCP available only for Ethernet networking.");
return RETURN_ERROR;
}
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c
index f73972e62..3db4ed713 100644
--- a/mdk-stage1/modules.c
+++ b/mdk-stage1/modules.c
@@ -59,7 +59,7 @@ static int insmod_archived_file(const char * mod_name, char * options)
rc = insmod_call(final_name, options);
if (rc)
- log_message("\tfailed.");
+ log_message("\tfailed");
unlink(final_name); /* sucking no space left on device */
return rc;
}
@@ -239,7 +239,7 @@ int my_insmod(const char * mod_name, enum driver_type type, char * options)
i = insmod_with_deps(mod_name, options);
if (i == 0) {
- log_message("\tsucceeded %s.", mod_name);
+ log_message("\tsucceeded %s", mod_name);
#ifndef DISABLE_MEDIAS
if (type == SCSI_ADAPTERS) {
if (number_scsi > 0)
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c
index 223a1b7af..543a23b01 100644
--- a/mdk-stage1/network.c
+++ b/mdk-stage1/network.c
@@ -47,7 +47,7 @@
static void error_message_net(void) /* reduce code size */
{
- error_message("Could not configure network");
+ error_message("Could not configure network.");
}
@@ -347,7 +347,7 @@ static enum return_type setup_network_interface(struct interface_info * intf)
return setup_network_interface(intf);
if (!inet_aton(answers[0], &addr)) {
- error_message("Invalid IP address");
+ error_message("Invalid IP address.");
return setup_network_interface(intf);
}
memcpy(&intf->ip, &addr, sizeof(addr));
@@ -591,7 +591,7 @@ enum return_type nfs_prepare(void)
if (IS_SPECIAL_STAGE2) {
if (load_ramdisk() != RETURN_OK) {
- error_message("Could not load program into memory");
+ error_message("Could not load program into memory.");
return nfs_prepare();
}
}
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index 8154b9286..68e143a22 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -80,7 +80,7 @@ static void spawn_shell(void)
pid_t pid;
char * shell_name = "/sbin/sash";
- log_message("spawning a shell..");
+ log_message("spawning a shell");
if (!IS_TESTING) {
fd = open("/dev/tty2", O_RDWR);
@@ -160,7 +160,7 @@ static void expert_third_party_modules(void)
umount(floppy_mount_location);
if (rc) {
- log_message("\tfailed.");
+ log_message("\tfailed");
error_message("Insmod failed.");
}