X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=3804b34da08fcf781438db1abfaf04205c4cc373;hp=9868e5112c419d2c8faad2ec34e9fdd25919830f;hb=f5d24f2a0727a23a6a4a888651aea4232aa6e32f;hpb=77108275fe6c5cefa1b7d330a3acf48c12275230

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 9868e51..3804b34 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -897,7 +897,7 @@ out:
 	 * TRANSLATORS: the format specifier in this string is a Linux
 	 * device identifier, like 'sda1'
 	 */
-	status->message = talloc_asprintf(status,_("Processing %s complete\n"),
+	status->message = talloc_asprintf(status,_("Processing %s complete"),
 				dev->device->id);
 	boot_status(handler, status);
 
@@ -936,7 +936,7 @@ int device_handler_dhcp(struct device_handler *handler,
 	 * TRANSLATORS: this format specifier will be the name of a network
 	 * device, like 'eth0'.
 	 */
-	status->message = talloc_asprintf(status,_("Processing %s complete\n"),
+	status->message = talloc_asprintf(status,_("Processing %s complete"),
 				dev->device->id);
 	boot_status(handler, status);
 
@@ -1472,7 +1472,6 @@ mount_ro:
 void device_release_write(struct discover_device *dev, bool release)
 {
 	const char *fstype, *device_path;
-	int rc = 0;
 
 	if (!release)
 		return;
@@ -1495,10 +1494,9 @@ void device_release_write(struct discover_device *dev, bool release)
 		device_path = get_device_path(dev);
 	}
 
-	mount(device_path, dev->mount_path, fstype,
+	if (mount(device_path, dev->mount_path, fstype,
 			MS_RDONLY | MS_SILENT,
-			fs_parameters(dev, MS_RDONLY));
-	if (rc)
+			fs_parameters(dev, MS_RDONLY)))
 		pb_log("Failed to remount %s read-only: %s\n",
 		       device_path, strerror(errno));
 	else