浏览代码

Merge pull request #17462 from LK4D4/fix_device_tool

Fix docker-device-tool
Jess Frazelle 9 年之前
父节点
当前提交
965706245b
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      contrib/docker-device-tool/device_tool.go

+ 3 - 3
contrib/docker-device-tool/device_tool.go

@@ -73,7 +73,7 @@ func main() {
 	args := flag.Args()
 	args := flag.Args()
 
 
 	home := path.Join(*root, "devicemapper")
 	home := path.Join(*root, "devicemapper")
-	devices, err := devmapper.NewDeviceSet(home, false, nil)
+	devices, err := devmapper.NewDeviceSet(home, false, nil, nil, nil)
 	if err != nil {
 	if err != nil {
 		fmt.Println("Can't initialize device mapper: ", err)
 		fmt.Println("Can't initialize device mapper: ", err)
 		os.Exit(1)
 		os.Exit(1)
@@ -105,9 +105,9 @@ func main() {
 			fmt.Println("Can't get device info: ", err)
 			fmt.Println("Can't get device info: ", err)
 			os.Exit(1)
 			os.Exit(1)
 		}
 		}
-		fmt.Printf("Id: %d\n", status.DeviceId)
+		fmt.Printf("Id: %d\n", status.DeviceID)
 		fmt.Printf("Size: %d\n", status.Size)
 		fmt.Printf("Size: %d\n", status.Size)
-		fmt.Printf("Transaction Id: %d\n", status.TransactionId)
+		fmt.Printf("Transaction Id: %d\n", status.TransactionID)
 		fmt.Printf("Size in Sectors: %d\n", status.SizeInSectors)
 		fmt.Printf("Size in Sectors: %d\n", status.SizeInSectors)
 		fmt.Printf("Mapped Sectors: %d\n", status.MappedSectors)
 		fmt.Printf("Mapped Sectors: %d\n", status.MappedSectors)
 		fmt.Printf("Highest Mapped Sector: %d\n", status.HighestMappedSector)
 		fmt.Printf("Highest Mapped Sector: %d\n", status.HighestMappedSector)