diff --git a/cmd/incus/export.go b/cmd/incus/export.go index 613c1645c26..5dc049de4c5 100644 --- a/cmd/incus/export.go +++ b/cmd/incus/export.go @@ -11,10 +11,10 @@ import ( "github.com/spf13/cobra" "github.com/lxc/incus/client" - "github.com/lxc/incus/internal/archive" cli "github.com/lxc/incus/internal/cmd" "github.com/lxc/incus/internal/i18n" "github.com/lxc/incus/shared/api" + "github.com/lxc/incus/shared/archive" ) type cmdExport struct { diff --git a/cmd/incus/image.go b/cmd/incus/image.go index 4177c8cb505..72121e8644d 100644 --- a/cmd/incus/image.go +++ b/cmd/incus/image.go @@ -14,11 +14,11 @@ import ( "gopkg.in/yaml.v2" "github.com/lxc/incus/client" - "github.com/lxc/incus/internal/archive" cli "github.com/lxc/incus/internal/cmd" "github.com/lxc/incus/internal/i18n" "github.com/lxc/incus/shared" "github.com/lxc/incus/shared/api" + "github.com/lxc/incus/shared/archive" "github.com/lxc/incus/shared/subprocess" "github.com/lxc/incus/shared/termios" ) diff --git a/incusd/backup/backup_utils.go b/incusd/backup/backup_utils.go index 944d719991e..70f710b6a0e 100644 --- a/incusd/backup/backup_utils.go +++ b/incusd/backup/backup_utils.go @@ -7,7 +7,7 @@ import ( "io" "github.com/lxc/incus/incusd/sys" - "github.com/lxc/incus/internal/archive" + "github.com/lxc/incus/shared/archive" ) // TarReader rewinds backup file handle r and returns new tar reader and process cleanup function. diff --git a/incusd/daemon.go b/incusd/daemon.go index d740acc08f3..430f3ec2e34 100644 --- a/incusd/daemon.go +++ b/incusd/daemon.go @@ -61,10 +61,10 @@ import ( "github.com/lxc/incus/incusd/ucred" "github.com/lxc/incus/incusd/util" "github.com/lxc/incus/incusd/warnings" - "github.com/lxc/incus/internal/archive" "github.com/lxc/incus/internal/idmap" "github.com/lxc/incus/internal/version" "github.com/lxc/incus/shared" + "github.com/lxc/incus/shared/archive" "github.com/lxc/incus/shared/cancel" "github.com/lxc/incus/shared/logger" "github.com/lxc/incus/shared/proxy" diff --git a/incusd/images.go b/incusd/images.go index 7f638dcc2a5..6ad3e894b56 100644 --- a/incusd/images.go +++ b/incusd/images.go @@ -44,12 +44,12 @@ import ( storagePools "github.com/lxc/incus/incusd/storage" "github.com/lxc/incus/incusd/task" "github.com/lxc/incus/incusd/util" - "github.com/lxc/incus/internal/archive" "github.com/lxc/incus/internal/filter" "github.com/lxc/incus/internal/jmap" "github.com/lxc/incus/internal/version" "github.com/lxc/incus/shared" "github.com/lxc/incus/shared/api" + "github.com/lxc/incus/shared/archive" "github.com/lxc/incus/shared/ioprogress" "github.com/lxc/incus/shared/logger" "github.com/lxc/incus/shared/osarch" diff --git a/incusd/instances_post.go b/incusd/instances_post.go index 203669052cb..26f5dc80c79 100644 --- a/incusd/instances_post.go +++ b/incusd/instances_post.go @@ -29,11 +29,11 @@ import ( "github.com/lxc/incus/incusd/scriptlet" "github.com/lxc/incus/incusd/state" storagePools "github.com/lxc/incus/incusd/storage" - "github.com/lxc/incus/internal/archive" "github.com/lxc/incus/internal/version" "github.com/lxc/incus/shared" "github.com/lxc/incus/shared/api" apiScriptlet "github.com/lxc/incus/shared/api/scriptlet" + "github.com/lxc/incus/shared/archive" "github.com/lxc/incus/shared/logger" "github.com/lxc/incus/shared/osarch" ) diff --git a/incusd/storage/drivers/driver_btrfs_volumes.go b/incusd/storage/drivers/driver_btrfs_volumes.go index 4c9e1621ef7..81ff24bff8f 100644 --- a/incusd/storage/drivers/driver_btrfs_volumes.go +++ b/incusd/storage/drivers/driver_btrfs_volumes.go @@ -22,10 +22,10 @@ import ( "github.com/lxc/incus/incusd/operations" "github.com/lxc/incus/incusd/revert" "github.com/lxc/incus/incusd/storage/filesystem" - "github.com/lxc/incus/internal/archive" "github.com/lxc/incus/internal/instancewriter" "github.com/lxc/incus/shared" "github.com/lxc/incus/shared/api" + "github.com/lxc/incus/shared/archive" "github.com/lxc/incus/shared/ioprogress" "github.com/lxc/incus/shared/logger" "github.com/lxc/incus/shared/subprocess" diff --git a/incusd/storage/drivers/driver_zfs_volumes.go b/incusd/storage/drivers/driver_zfs_volumes.go index 7ed3c3803cc..e8e98fc589b 100644 --- a/incusd/storage/drivers/driver_zfs_volumes.go +++ b/incusd/storage/drivers/driver_zfs_volumes.go @@ -23,10 +23,10 @@ import ( "github.com/lxc/incus/incusd/operations" "github.com/lxc/incus/incusd/revert" "github.com/lxc/incus/incusd/storage/filesystem" - "github.com/lxc/incus/internal/archive" "github.com/lxc/incus/internal/instancewriter" "github.com/lxc/incus/shared" "github.com/lxc/incus/shared/api" + "github.com/lxc/incus/shared/archive" "github.com/lxc/incus/shared/ioprogress" "github.com/lxc/incus/shared/logger" "github.com/lxc/incus/shared/subprocess" diff --git a/incusd/storage/drivers/generic_vfs.go b/incusd/storage/drivers/generic_vfs.go index 40fa332ee68..3dba66180d5 100644 --- a/incusd/storage/drivers/generic_vfs.go +++ b/incusd/storage/drivers/generic_vfs.go @@ -16,10 +16,10 @@ import ( "github.com/lxc/incus/incusd/state" "github.com/lxc/incus/incusd/storage/filesystem" "github.com/lxc/incus/incusd/sys" - "github.com/lxc/incus/internal/archive" "github.com/lxc/incus/internal/instancewriter" "github.com/lxc/incus/shared" "github.com/lxc/incus/shared/api" + "github.com/lxc/incus/shared/archive" "github.com/lxc/incus/shared/ioprogress" "github.com/lxc/incus/shared/logger" ) diff --git a/incusd/storage/utils.go b/incusd/storage/utils.go index b814b4e21b8..e4e80cd3bb4 100644 --- a/incusd/storage/utils.go +++ b/incusd/storage/utils.go @@ -25,9 +25,9 @@ import ( "github.com/lxc/incus/incusd/state" "github.com/lxc/incus/incusd/storage/drivers" "github.com/lxc/incus/incusd/sys" - "github.com/lxc/incus/internal/archive" "github.com/lxc/incus/shared" "github.com/lxc/incus/shared/api" + "github.com/lxc/incus/shared/archive" "github.com/lxc/incus/shared/ioprogress" "github.com/lxc/incus/shared/logger" "github.com/lxc/incus/shared/validate" diff --git a/incusd/storage_volumes.go b/incusd/storage_volumes.go index 87e7b4edb7f..e2830c1f2bd 100644 --- a/incusd/storage_volumes.go +++ b/incusd/storage_volumes.go @@ -33,11 +33,11 @@ import ( "github.com/lxc/incus/incusd/state" storagePools "github.com/lxc/incus/incusd/storage" "github.com/lxc/incus/incusd/util" - "github.com/lxc/incus/internal/archive" "github.com/lxc/incus/internal/filter" "github.com/lxc/incus/internal/version" "github.com/lxc/incus/shared" "github.com/lxc/incus/shared/api" + "github.com/lxc/incus/shared/archive" "github.com/lxc/incus/shared/logger" localtls "github.com/lxc/incus/shared/tls" )