Browse Source

Merge pull request #44726 from thaJeztah/23.0_backport_devmapper_simplify_udev_error

[23.0 backport] daemon/graphdriver/devicemapper: simplify Udev log, and update link
Sebastiaan van Stijn 2 years ago
parent
commit
63e861c87e
1 changed files with 1 additions and 7 deletions
  1. 1 7
      daemon/graphdriver/devmapper/deviceset.go

+ 1 - 7
daemon/graphdriver/devmapper/deviceset.go

@@ -19,7 +19,6 @@ import (
 	"time"
 	"time"
 
 
 	"github.com/docker/docker/daemon/graphdriver"
 	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/pkg/devicemapper"
 	"github.com/docker/docker/pkg/devicemapper"
 	"github.com/docker/docker/pkg/dmesg"
 	"github.com/docker/docker/pkg/dmesg"
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/idtools"
@@ -1672,12 +1671,7 @@ func (devices *DeviceSet) initDevmapper(doInit bool) (retErr error) {
 
 
 	// https://github.com/docker/docker/issues/4036
 	// https://github.com/docker/docker/issues/4036
 	if supported := devicemapper.UdevSetSyncSupport(true); !supported {
 	if supported := devicemapper.UdevSetSyncSupport(true); !supported {
-		if dockerversion.IAmStatic == "true" {
-			logger.Error("Udev sync is not supported. This will lead to data loss and unexpected behavior. Install a dynamic binary to use devicemapper or select a different storage driver. For more information, see https://docs.docker.com/engine/reference/commandline/dockerd/#storage-driver-options")
-		} else {
-			logger.Error("Udev sync is not supported. This will lead to data loss and unexpected behavior. Install a more recent version of libdevmapper or select a different storage driver. For more information, see https://docs.docker.com/engine/reference/commandline/dockerd/#storage-driver-options")
-		}
-
+		logger.Error("Udev sync is not supported, which will lead to data loss and unexpected behavior. Make sure you have a recent version of libdevmapper installed and are running a dynamic binary, or select a different storage driver. For more information, see https://docs.docker.com/go/storage-driver/")
 		if !devices.overrideUdevSyncCheck {
 		if !devices.overrideUdevSyncCheck {
 			return graphdriver.ErrNotSupported
 			return graphdriver.ErrNotSupported
 		}
 		}