Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

incusd/storage/zfs: Only attempt to load the module if the tools exist #1177

Merged
merged 1 commit into from
Sep 3, 2024
Merged

incusd/storage/zfs: Only attempt to load the module if the tools exist #1177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions internal/server/storage/drivers/driver_zfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,6 @@ func (d *zfs) load() error {
return nil
}

// Load the kernel module.
err := linux.LoadModule("zfs")
if err != nil {
return fmt.Errorf("Error loading %q module: %w", "zfs", err)
}

// Validate the needed tools are present.
for _, tool := range []string{"zpool", "zfs"} {
_, err := exec.LookPath(tool)
Expand All @@ -85,6 +79,12 @@ func (d *zfs) load() error {
}
}

// Load the kernel module.
err := linux.LoadModule("zfs")
if err != nil {
return fmt.Errorf("Error loading %q module: %w", "zfs", err)
}

// Get the version information.
if zfsVersion == "" {
version, err := d.version()
Expand Down
Loading