[pbs-devel] [PATCH proxmox-backup rebase 14/15] move proxmox_restore_daemon code into extra crate

[Fabian Grünbichler]

missing some parts in Cargo.toml (hidden by this never being compiled 
standalone):

diff --git a/proxmox-restore-daemon/Cargo.toml b/proxmox-restore-daemon/Cargo.toml
index b984958b8..03b0ba4ee 100644
--- a/proxmox-restore-daemon/Cargo.toml
+++ b/proxmox-restore-daemon/Cargo.toml
@@ -19,14 +19,14 @@ nix = "0.19.1"
 regex = "1.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tokio = { version = "1.6", features = [] }
+tokio = { version = "1.6", features = ["parking_lot", "sync"] }
 tokio-stream = "0.1.0"
 tokio-util = { version = "0.6", features = [ "codec", "io" ] }
 
 pathpatterns = "0.1.2"
 pxar = { version = "0.10.1", features = [ "tokio-io" ] }
 
-proxmox = { version = "0.13.2", features = [ "router"] }
+proxmox = { version = "0.13.2", features = [ "router", "sortable-macro" ] }
 
 pbs-api-types = { path = "../pbs-api-types" }
 pbs-runtime = { path = "../pbs-runtime" }

On September 20, 2021 11:13 am, Dietmar Maurer wrote:
> ---
>  Cargo.toml                                    |  1 +
>  Makefile                                      |  4 ++-
>  proxmox-restore-daemon/Cargo.toml             | 36 +++++++++++++++++++
>  .../src/main.rs                               |  0
>  .../src}/proxmox_restore_daemon/api.rs        |  0
>  .../src}/proxmox_restore_daemon/auth.rs       |  0
>  .../src}/proxmox_restore_daemon/disk.rs       |  0
>  .../src}/proxmox_restore_daemon/mod.rs        |  0
>  .../src}/proxmox_restore_daemon/watchdog.rs   |  0
>  9 files changed, 40 insertions(+), 1 deletion(-)
>  create mode 100644 proxmox-restore-daemon/Cargo.toml
>  rename src/bin/proxmox-restore-daemon.rs => proxmox-restore-daemon/src/main.rs (100%)
>  rename {src/bin => proxmox-restore-daemon/src}/proxmox_restore_daemon/api.rs (100%)
>  rename {src/bin => proxmox-restore-daemon/src}/proxmox_restore_daemon/auth.rs (100%)
>  rename {src/bin => proxmox-restore-daemon/src}/proxmox_restore_daemon/disk.rs (100%)
>  rename {src/bin => proxmox-restore-daemon/src}/proxmox_restore_daemon/mod.rs (100%)
>  rename {src/bin => proxmox-restore-daemon/src}/proxmox_restore_daemon/watchdog.rs (100%)
> 
> diff --git a/Cargo.toml b/Cargo.toml
> index f2739b91..aadd2c2e 100644
> --- a/Cargo.toml
> +++ b/Cargo.toml
> @@ -35,6 +35,7 @@ members = [
>      "proxmox-backup-client",
>      "proxmox-backup-debug",
>      "proxmox-file-restore",
> +    "proxmox-restore-daemon",
>      "pxar-bin",
>  ]
>  
> diff --git a/Makefile b/Makefile
> index 050218ba..79e2dd7c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -47,6 +47,7 @@ SUBCRATES := \
>  	proxmox-backup-client \
>  	proxmox-backup-debug \
>  	proxmox-file-restore \
> +	proxmox-restore-daemon \
>  	pxar-bin
>  
>  ifeq ($(BUILD_MODE), release)
> @@ -189,11 +190,12 @@ $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-
>  	    --package pbs-tape \
>  	    --bin pmt \
>  	    --bin pmtx \
> +	    --package proxmox-restore-daemon \
> +	    --bin proxmox-restore-daemon \
>  	    --package proxmox-backup \
>  	    --bin dump-catalog-shell-cli \
>  	    --bin proxmox-daily-update \
>  	    --bin proxmox-file-restore \
> -	    --bin proxmox-restore-daemon \
>  	    --bin proxmox-tape \
>  	    --bin sg-tape-cmd
>  	touch "$@"
> diff --git a/proxmox-restore-daemon/Cargo.toml b/proxmox-restore-daemon/Cargo.toml
> new file mode 100644
> index 00000000..b984958b
> --- /dev/null
> +++ b/proxmox-restore-daemon/Cargo.toml
> @@ -0,0 +1,36 @@
> +[package]
> +name = "proxmox-restore-daemon"
> +version = "0.1.0"
> +authors = ["Proxmox Support Team <support at proxmox.com>"]
> +edition = "2018"
> +description = "Proxmox Restore Daemon"
> +
> +[dependencies]
> +anyhow = "1.0"
> +base64 = "0.12"
> +env_logger = "0.7"
> +futures = "0.3"
> +http = "0.2"
> +hyper = { version = "0.14", features = [ "full" ] }
> +lazy_static = "1.4"
> +libc = "0.2"
> +log = "0.4"
> +nix = "0.19.1"
> +regex = "1.2"
> +serde = { version = "1.0", features = ["derive"] }
> +serde_json = "1.0"
> +tokio = { version = "1.6", features = [] }
> +tokio-stream = "0.1.0"
> +tokio-util = { version = "0.6", features = [ "codec", "io" ] }
> +
> +pathpatterns = "0.1.2"
> +pxar = { version = "0.10.1", features = [ "tokio-io" ] }
> +
> +proxmox = { version = "0.13.2", features = [ "router"] }
> +
> +pbs-api-types = { path = "../pbs-api-types" }
> +pbs-runtime = { path = "../pbs-runtime" }
> +pbs-tools = { path = "../pbs-tools" }
> +pbs-datastore = { path = "../pbs-datastore" }
> +pbs-server = { path = "../pbs-server" }
> +pbs-client = { path = "../pbs-client" }
> diff --git a/src/bin/proxmox-restore-daemon.rs b/proxmox-restore-daemon/src/main.rs
> similarity index 100%
> rename from src/bin/proxmox-restore-daemon.rs
> rename to proxmox-restore-daemon/src/main.rs
> diff --git a/src/bin/proxmox_restore_daemon/api.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs
> similarity index 100%
> rename from src/bin/proxmox_restore_daemon/api.rs
> rename to proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs
> diff --git a/src/bin/proxmox_restore_daemon/auth.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/auth.rs
> similarity index 100%
> rename from src/bin/proxmox_restore_daemon/auth.rs
> rename to proxmox-restore-daemon/src/proxmox_restore_daemon/auth.rs
> diff --git a/src/bin/proxmox_restore_daemon/disk.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs
> similarity index 100%
> rename from src/bin/proxmox_restore_daemon/disk.rs
> rename to proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs
> diff --git a/src/bin/proxmox_restore_daemon/mod.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/mod.rs
> similarity index 100%
> rename from src/bin/proxmox_restore_daemon/mod.rs
> rename to proxmox-restore-daemon/src/proxmox_restore_daemon/mod.rs
> diff --git a/src/bin/proxmox_restore_daemon/watchdog.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/watchdog.rs
> similarity index 100%
> rename from src/bin/proxmox_restore_daemon/watchdog.rs
> rename to proxmox-restore-daemon/src/proxmox_restore_daemon/watchdog.rs
> -- 
> 2.30.2
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
> 
> 
>