coding style: fix error strings
The way errors are passed to log was changed according to [1].
[1] https://github.com/golang/go/wiki/CodeReviewComments#error-strings
Change-Id: I75194557d4f3b2f9f5e286a40fe4f0a4648eb71f
Reviewed-on: https://review.monogon.dev/c/monogon/+/458
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
diff --git a/metropolis/node/build/mkimage/main.go b/metropolis/node/build/mkimage/main.go
index e5c25df..b885618 100644
--- a/metropolis/node/build/mkimage/main.go
+++ b/metropolis/node/build/mkimage/main.go
@@ -57,7 +57,7 @@
// Start with the EFI Payload the OS will boot from.
p, err := os.Open(efiPayload)
if err != nil {
- log.Fatalf("while opening the EFI payload at %q: %s", efiPayload, err.Error())
+ log.Fatalf("while opening the EFI payload at %q: %v", efiPayload, err)
}
defer p.Close()
cfg.EFIPayload = p
@@ -68,7 +68,7 @@
if systemImage != "" {
img, err := os.Open(systemImage)
if err != nil {
- log.Fatalf("while opening the system image at %q: %s", systemImage, err.Error())
+ log.Fatalf("while opening the system image at %q: %v", systemImage, err)
}
defer img.Close()
cfg.SystemImage = img
@@ -78,7 +78,7 @@
if nodeParams != "" {
np, err := os.Open(nodeParams)
if err != nil {
- log.Fatalf("while opening node parameters at %q: %s", nodeParams, err.Error())
+ log.Fatalf("while opening node parameters at %q: %v", nodeParams, err)
}
defer np.Close()
cfg.NodeParameters = np
@@ -86,6 +86,6 @@
// Write the parametrized OS image.
if _, err := osimage.Create(&cfg); err != nil {
- log.Fatalf("while creating a Metropolis OS image: %s", err.Error())
+ log.Fatalf("while creating a Metropolis OS image: %v", err)
}
}
diff --git a/metropolis/node/installer/main.go b/metropolis/node/installer/main.go
index 6eb6706..dc72e07 100644
--- a/metropolis/node/installer/main.go
+++ b/metropolis/node/installer/main.go
@@ -179,22 +179,22 @@
func main() {
// Mount sysfs, devtmpfs and efivarfs.
if err := mountPseudoFS(); err != nil {
- log.Fatalf("while mounting pseudo-filesystems: %s", err.Error())
+ log.Fatalf("while mounting pseudo-filesystems: %v", err)
}
// Read the installer ESP UUID from efivarfs.
espUuid, err := efivarfs.ReadLoaderDevicePartUUID()
if err != nil {
- log.Fatalf("while reading the installer ESP UUID: %s", err.Error())
+ log.Fatalf("while reading the installer ESP UUID: %v", err)
}
// Look up the installer partition based on espUuid.
espDev, err := sysfs.DeviceByPartUUID(espUuid)
espPath := filepath.Join("/dev", espDev)
if err != nil {
- log.Fatalf("while resolving the installer device handle: %s", err.Error())
+ log.Fatalf("while resolving the installer device handle: %v", err)
}
// Mount the installer partition. The installer bundle will be read from it.
if err := mountInstallerESP(espPath); err != nil {
- log.Fatalf("while mounting the installer ESP: %s", err.Error())
+ log.Fatalf("while mounting the installer ESP: %v", err)
}
nodeParameters, err := os.Open("/installer/EFI/metropolis-installer/nodeparams.pb")
@@ -250,7 +250,7 @@
// Look for suitable block devices, given the minimum size.
blkDevs, err := findInstallableBlockDevices(espDev, minSize)
if err != nil {
- log.Fatal(err.Error())
+ log.Fatal(err)
}
if len(blkDevs) == 0 {
log.Fatal("couldn't find a suitable block device.")
@@ -266,34 +266,34 @@
log.Printf("Installing to %s\n", tgtBlkdevPath)
be, err := osimage.Create(&installParams)
if err != nil {
- log.Fatalf("while installing: %s", err.Error())
+ log.Fatalf("while installing: %v", err)
}
// The target device's partition table has just been updated. Re-read it to
// make the node system partition reachable through /dev.
if err := rereadPartitionTable(tgtBlkdevPath); err != nil {
- log.Fatalf("while re-reading the partition table of %q: %s", tgtBlkdevPath, err.Error())
+ log.Fatalf("while re-reading the partition table of %q: %v", tgtBlkdevPath, err)
}
// Look up the node's system partition path to be later used in the
// initialization step. It's always the second partition, right after
// the ESP.
sysBlkdevName, err := sysfs.PartitionBlockDevice(tgtBlkdevName, 2)
if err != nil {
- log.Fatalf("while looking up the system partition: %s", err.Error())
+ log.Fatalf("while looking up the system partition: %v", err)
}
sysBlkdevPath := filepath.Join("/dev", sysBlkdevName)
// Copy the system partition contents.
if err := initializeSystemPartition(systemImage, sysBlkdevPath); err != nil {
- log.Fatalf("while initializing the system partition at %q: %s", sysBlkdevPath, err.Error())
+ log.Fatalf("while initializing the system partition at %q: %v", sysBlkdevPath, err)
}
// Create an EFI boot entry for Metropolis.
en, err := efivarfs.CreateBootEntry(be)
if err != nil {
- log.Fatalf("while creating a boot entry: %s", err.Error())
+ log.Fatalf("while creating a boot entry: %v", err)
}
// Erase the preexisting boot order, leaving Metropolis as the only option.
if err := efivarfs.SetBootOrder(&efivarfs.BootOrder{uint16(en)}); err != nil {
- log.Fatalf("while adjusting the boot order: %s", err.Error())
+ log.Fatalf("while adjusting the boot order: %v", err)
}
// Reboot.