From 115f88b346ab32c0c1758bf103f42806ce0ed749 Mon Sep 17 00:00:00 2001
From: srid <github@srid.name>
Date: Mon, 10 Mar 2014 16:50:29 -0700
Subject: [PATCH] nsinit: prefix errors with their source

Docker-DCO-1.1-Signed-off-by: Sridhar Ratnakumar <github@srid.name> (github: srid)
---
 libcontainer/nsinit/nsinit/main.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libcontainer/nsinit/nsinit/main.go b/libcontainer/nsinit/nsinit/main.go
index 61921c5..916be66 100644
--- a/libcontainer/nsinit/nsinit/main.go
+++ b/libcontainer/nsinit/nsinit/main.go
@@ -33,11 +33,11 @@ func main() {
 	}
 	container, err := loadContainer()
 	if err != nil {
-		log.Fatal(err)
+		log.Fatalf("Unable to load container: %s", err)
 	}
 	ns, err := newNsInit()
 	if err != nil {
-		log.Fatal(err)
+		log.Fatalf("Unable to initialize nsinit: %s", err)
 	}
 
 	switch flag.Arg(0) {
@@ -46,7 +46,7 @@ func main() {
 		nspid, err := readPid()
 		if err != nil {
 			if !os.IsNotExist(err) {
-				log.Fatal(err)
+				log.Fatalf("Unable to read pid: %s", err)
 			}
 		}
 		if nspid > 0 {
@@ -56,7 +56,7 @@ func main() {
 			exitCode, err = ns.Exec(container, term, flag.Args()[1:])
 		}
 		if err != nil {
-			log.Fatal(err)
+			log.Fatalf("Failed to exec: %s", err)
 		}
 		os.Exit(exitCode)
 	case "init": // this is executed inside of the namespace to setup the container
@@ -69,10 +69,10 @@ func main() {
 		}
 		syncPipe, err := nsinit.NewSyncPipeFromFd(0, uintptr(pipeFd))
 		if err != nil {
-			log.Fatal(err)
+			log.Fatalf("Unable to create sync pipe: %s", err)
 		}
 		if err := ns.Init(container, cwd, console, syncPipe, flag.Args()[1:]); err != nil {
-			log.Fatal(err)
+			log.Fatalf("Unable to initialize for container: %s", err)
 		}
 	default:
 		log.Fatalf("command not supported for nsinit %s", flag.Arg(0))