From e4f311290f4b768440f7ceddd97a50b99579cad0 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 12 Jul 2023 01:03:47 +0100 Subject: [PATCH] Upgrade most deps --- README.md | 190 ++++++---------------- go.mod | 21 ++- go.sum | 64 ++------ internal/config/config.go | 2 +- internal/config/internalassets_vfsdata.go | 9 +- internal/testutils/zfs_disk_handler.go | 2 +- po/de.po | 34 ++-- po/fr.po | 34 ++-- po/zsys.pot | 34 ++-- 9 files changed, 126 insertions(+), 264 deletions(-) diff --git a/README.md b/README.md index 5cf31662..575076d8 100644 --- a/README.md +++ b/README.md @@ -51,34 +51,38 @@ NOTE: When shell type isn't defined shell will be automatically identified based Bash: - $ source <(zsysctl completion bash) +```bash +source <(zsysctl completion bash) - # To load completions for each session, execute once: - # Linux: - $ zsysctl completion bash > /etc/bash_completion.d/zsysctl - # macOS: - $ zsysctl completion bash > /usr/local/etc/bash_completion.d/zsysctl +# To load completions for each session, execute once: +# Linux: +zsysctl completion bash > /etc/bash_completion.d/zsysctl +# macOS: +zsysctl completion bash > /usr/local/etc/bash_completion.d/zsysctl +``` Zsh: +```zsh +# If shell completion is not already enabled in your environment, +# you will need to enable it. You can execute the following once: - # If shell completion is not already enabled in your environment, - # you will need to enable it. You can execute the following once: - - $ echo "autoload -U compinit; compinit" >> ~/.zshrc +echo "autoload -U compinit; compinit" >> ~/.zshrc - # To load completions for each session, execute once: - $ zsysctl completion zsh > "${fpath[1]}/_zsysctl" +# To load completions for each session, execute once: +zsysctl completion zsh > "${fpath[1]}/_zsysctl" - # You will need to start a new shell for this setup to take effect. +# You will need to start a new shell for this setup to take effect. +``` PowerShell: - PS> zsysctl completion powershell | Out-String | Invoke-Expression - - # To load completions for every new session, run: - PS> zsysctl completion powershell > zsysctl.ps1 - # and source this file from your PowerShell profile. +```powershell +zsysctl completion powershell | Out-String | Invoke-Expression +# To load completions for every new session, run: +zsysctl completion powershell > zsysctl.ps1 +# and source this file from your PowerShell profile. +``` ``` zsysctl completion [bash|zsh|powershell] [flags] @@ -102,7 +106,7 @@ List all the machines and basic information. ##### Synopsis -Alias of zsysctl machine list +Alias of zsysctl machine list. List all the machines and basic information. ``` zsysctl list [flags] @@ -124,10 +128,6 @@ zsysctl list [flags] Machine management -##### Synopsis - -Machine management - ``` zsysctl machine COMMAND [flags] ``` @@ -148,10 +148,6 @@ zsysctl machine COMMAND [flags] List all the machines and basic information. -##### Synopsis - -List all the machines and basic information. - ``` zsysctl machine list [flags] ``` @@ -172,10 +168,6 @@ zsysctl machine list [flags] Shows the status of the machine. -##### Synopsis - -Shows the status of the machine. - ``` zsysctl machine show [MachineID] [flags] ``` @@ -199,7 +191,7 @@ Saves the current state of the machine. By default it saves only the user state. ##### Synopsis -Alias of zsysctl state save +Alias of zsysctl state save. Saves the current state of the machine. By default it saves only the user state. state_id is generated if not provided. ``` zsysctl save [state id] [flags] @@ -225,10 +217,6 @@ zsysctl save [state id] [flags] Service management -##### Synopsis - -Service management - ``` zsysctl service COMMAND [flags] ``` @@ -249,10 +237,6 @@ zsysctl service COMMAND [flags] Dumps the current state of zsys. -##### Synopsis - -Dumps the current state of zsys. - ``` zsysctl service dump [flags] ``` @@ -273,10 +257,6 @@ zsysctl service dump [flags] Run daemon state saves garbage collection. -##### Synopsis - -Run daemon state saves garbage collection. - ``` zsysctl service gc [flags] ``` @@ -298,10 +278,6 @@ zsysctl service gc [flags] Sets the logging level of the daemon. -##### Synopsis - -Sets the logging level of the daemon. - ``` zsysctl service loglevel 0|1|2 [flags] ``` @@ -322,10 +298,6 @@ zsysctl service loglevel 0|1|2 [flags] Refreshes machines states. -##### Synopsis - -Refreshes machines states. - ``` zsysctl service refresh [flags] ``` @@ -346,10 +318,6 @@ zsysctl service refresh [flags] Reloads daemon configuration. -##### Synopsis - -Reloads daemon configuration. - ``` zsysctl service reload [flags] ``` @@ -370,10 +338,6 @@ zsysctl service reload [flags] Shows the status of the daemon. -##### Synopsis - -Shows the status of the daemon. - ``` zsysctl service status [flags] ``` @@ -394,10 +358,6 @@ zsysctl service status [flags] Stops zsys daemon. -##### Synopsis - -Stops zsys daemon. - ``` zsysctl service stop [flags] ``` @@ -418,10 +378,6 @@ zsysctl service stop [flags] Start profiling until you exit this command yourself or when duration is done. Default is CPU profiling with a 30s timeout. -##### Synopsis - -Start profiling until you exit this command yourself or when duration is done. Default is CPU profiling with a 30s timeout. - ``` zsysctl service trace [flags] ``` @@ -447,7 +403,7 @@ Shows the status of the machine. ##### Synopsis -Alias of zsysctl machine show +Alias of zsysctl machine show. Shows the status of the machine. ``` zsysctl show [MachineID] [flags] @@ -470,10 +426,6 @@ zsysctl show [MachineID] [flags] Machine state management -##### Synopsis - -Machine state management - ``` zsysctl state COMMAND [flags] ``` @@ -494,10 +446,6 @@ zsysctl state COMMAND [flags] Remove the current state of the machine. By default it removes only the user state if not linked to any system state. -##### Synopsis - -Remove the current state of the machine. By default it removes only the user state if not linked to any system state. - ``` zsysctl state remove [state id] [flags] ``` @@ -522,10 +470,6 @@ zsysctl state remove [state id] [flags] Saves the current state of the machine. By default it saves only the user state. state_id is generated if not provided. -##### Synopsis - -Saves the current state of the machine. By default it saves only the user state. state_id is generated if not provided. - ``` zsysctl state save [state id] [flags] ``` @@ -550,10 +494,6 @@ zsysctl state save [state id] [flags] Returns version of client and server -##### Synopsis - -Returns version of client and server - ``` zsysctl version [flags] ``` @@ -603,34 +543,38 @@ NOTE: When shell type isn't defined shell will be automatically identified based Bash: - $ source <(zsysd completion bash) +```bash +source <(zsysd completion bash) - # To load completions for each session, execute once: - # Linux: - $ zsysd completion bash > /etc/bash_completion.d/zsysd - # macOS: - $ zsysd completion bash > /usr/local/etc/bash_completion.d/zsysd +# To load completions for each session, execute once: +# Linux: +zsysd completion bash > /etc/bash_completion.d/zsysd +# macOS: +zsysd completion bash > /usr/local/etc/bash_completion.d/zsysd +``` Zsh: +```zsh +# If shell completion is not already enabled in your environment, +# you will need to enable it. You can execute the following once: - # If shell completion is not already enabled in your environment, - # you will need to enable it. You can execute the following once: - - $ echo "autoload -U compinit; compinit" >> ~/.zshrc +echo "autoload -U compinit; compinit" >> ~/.zshrc - # To load completions for each session, execute once: - $ zsysd completion zsh > "${fpath[1]}/_zsysd" +# To load completions for each session, execute once: +zsysd completion zsh > "${fpath[1]}/_zsysd" - # You will need to start a new shell for this setup to take effect. +# You will need to start a new shell for this setup to take effect. +``` PowerShell: - PS> zsysd completion powershell | Out-String | Invoke-Expression - - # To load completions for every new session, run: - PS> zsysd completion powershell > zsysd.ps1 - # and source this file from your PowerShell profile. +```powershell +zsysd completion powershell | Out-String | Invoke-Expression +# To load completions for every new session, run: +zsysd completion powershell > zsysd.ps1 +# and source this file from your PowerShell profile. +``` ``` zsysd completion [bash|zsh|powershell] [flags] @@ -656,10 +600,6 @@ Those commands are hidden from help and should primarily be used by the system i Ensure that the right datasets are ready to be mounted and committed during early boot -##### Synopsis - -Ensure that the right datasets are ready to be mounted and committed during early boot - ``` zsysctl boot COMMAND [flags] ``` @@ -681,10 +621,6 @@ zsysctl boot COMMAND [flags] Commit system and user datasets states as a successful boot -##### Synopsis - -Commit system and user datasets states as a successful boot - ``` zsysctl boot commit [flags] ``` @@ -706,10 +642,6 @@ zsysctl boot commit [flags] Prepare boot by ensuring correct system and user datasets are switched on and off -##### Synopsis - -Prepare boot by ensuring correct system and user datasets are switched on and off - ``` zsysctl boot prepare [flags] ``` @@ -731,10 +663,6 @@ zsysctl boot prepare [flags] Update last used timestamp -##### Synopsis - -Update last used timestamp - ``` zsysctl boot update-lastused [flags] ``` @@ -756,10 +684,6 @@ zsysctl boot update-lastused [flags] Update system boot menu -##### Synopsis - -Update system boot menu - ``` zsysctl boot update-menu [flags] ``` @@ -782,10 +706,6 @@ zsysctl boot update-menu [flags] User datasets creation and rename -##### Synopsis - -User datasets creation and rename - ``` zsysctl userdata COMMAND [flags] ``` @@ -806,10 +726,6 @@ zsysctl userdata COMMAND [flags] Create a new home user dataset via an user dataset (if doesn't exist) creation -##### Synopsis - -Create a new home user dataset via an user dataset (if doesn't exist) creation - ``` zsysctl userdata create USER HOME_DIRECTORY [flags] ``` @@ -830,10 +746,6 @@ zsysctl userdata create USER HOME_DIRECTORY [flags] dissociate current user data from current system but preserve history -##### Synopsis - -dissociate current user data from current system but preserve history - ``` zsysctl userdata dissociate USER [flags] ``` @@ -855,10 +767,6 @@ zsysctl userdata dissociate USER [flags] Rename a user's home directory via renaming corresponding user dataset -##### Synopsis - -Rename a user's home directory via renaming corresponding user dataset - ``` zsysctl userdata set-home OLD_HOME NEW_HOME [flags] ``` @@ -879,10 +787,6 @@ zsysctl userdata set-home OLD_HOME NEW_HOME [flags] Prepare boot by ensuring correct system and user datasets are switched on and off, synchronously -##### Synopsis - -Prepare boot by ensuring correct system and user datasets are switched on and off, synchronously - ``` zsysd boot-prepare [flags] ``` diff --git a/go.mod b/go.mod index 944cbd7e..12f7d260 100644 --- a/go.mod +++ b/go.mod @@ -4,37 +4,36 @@ go 1.20 require ( github.com/bicomsystems/go-libzfs v0.3.3 - github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f + github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf github.com/godbus/dbus/v5 v5.1.0 github.com/google/go-cmp v0.5.9 github.com/k0kubun/pp v3.0.1+incompatible - github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 - github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd + github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c + github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92 github.com/sirupsen/logrus v1.9.3 github.com/snapcore/go-gettext v0.0.0-20201130093759-38740d1bd3d2 - github.com/spf13/cobra v0.0.5 - github.com/spf13/pflag v1.0.3 - github.com/stretchr/testify v1.8.1 + github.com/spf13/cobra v1.7.0 + github.com/spf13/pflag v1.0.5 + github.com/stretchr/testify v1.8.4 golang.org/x/sys v0.10.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 google.golang.org/grpc v1.56.2 google.golang.org/protobuf v1.31.0 - gopkg.in/yaml.v2 v2.2.3 + gopkg.in/yaml.v3 v3.0.1 ) require ( - github.com/cpuguy83/go-md2man v1.0.10 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect github.com/mattn/go-colorable v0.1.2 // indirect github.com/mattn/go-isatty v0.0.8 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/russross/blackfriday v1.5.2 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/text v0.11.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) replace github.com/bicomsystems/go-libzfs => github.com/ubuntu/go-libzfs v0.2.2-0.20230711233110-6b487f8211c2 diff --git a/go.sum b/go.sum index 70c35bdd..604ed9d4 100644 --- a/go.sum +++ b/go.sum @@ -1,16 +1,10 @@ -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c= -github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= -github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU= +github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= @@ -19,63 +13,44 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/k0kubun/pp v3.0.1+incompatible h1:3tqvf7QgUnZ5tXO6pNAZlrvHgl6DvifjDrd9g2S9Z40= github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg= -github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk= -github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= -github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd h1:ug7PpSOB5RBPK1Kg6qskGBoP3Vnj/aNYFTznWvlkGo0= -github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c h1:aqg5Vm5dwtvL+YgDpBcK1ITf3o96N/K7/wsRXQnUTEs= +github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c/go.mod h1:owqhoLW1qZoYLZzLnBw+QkPP9WZnjlSWihhxAJC1+/M= +github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92 h1:OfRzdxCzDhp+rsKWXuOO2I/quKMJ/+TQwVbIP/gltZg= +github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92/go.mod h1:7/OT02F6S6I7v6WXb+IjhMuZEYfH/RJ5RwEWnEo5BMg= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/snapcore/go-gettext v0.0.0-20201130093759-38740d1bd3d2 h1:nETXPg0CiJrMAwC2gqkcam9BiBWYGvTsSYRfrjOz2Kg= github.com/snapcore/go-gettext v0.0.0-20201130093759-38740d1bd3d2/go.mod h1:D3SsWAXK7wCCBZu+Vk5hc1EuKj/L3XN1puEMXTU4LrQ= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= -github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/ubuntu/go-libzfs v0.2.2-0.20230711233110-6b487f8211c2 h1:vVMEebrgWXyd5thb0WmzfeRQ0OmAx55uT4HPQ1ONKP8= github.com/ubuntu/go-libzfs v0.2.2-0.20230711233110-6b487f8211c2/go.mod h1:/ABUjxseIy72AxJV8ROgSfeZ5YA8/ZSp1mMzfDKi0Mw= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= @@ -90,9 +65,6 @@ google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3 h1:fvjTMHxHEw/mxHbtzPi3JCcKXQRAnQTBRo6YCJSVHKI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/config/config.go b/internal/config/config.go index 1080b797..0f1b5c9b 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -10,7 +10,7 @@ import ( "github.com/ubuntu/zsys/internal/i18n" "github.com/ubuntu/zsys/internal/log" - yaml "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v3" ) //go:generate go run generator.go diff --git a/internal/config/internalassets_vfsdata.go b/internal/config/internalassets_vfsdata.go index cec381a6..5f7c17d5 100644 --- a/internal/config/internalassets_vfsdata.go +++ b/internal/config/internalassets_vfsdata.go @@ -7,7 +7,6 @@ import ( "compress/gzip" "fmt" "io" - "io/ioutil" "net/http" "os" pathpkg "path" @@ -19,14 +18,14 @@ var internalAssets = func() http.FileSystem { fs := vfsgen۰FS{ "/": &vfsgen۰DirInfo{ name: "/", - modTime: time.Date(2020, 7, 27, 13, 26, 42, 327263544, time.UTC), + modTime: time.Date(2023, 7, 12, 11, 57, 26, 276740445, time.UTC), }, "/zsys.conf": &vfsgen۰CompressedFileInfo{ name: "zsys.conf", - modTime: time.Date(2020, 7, 27, 13, 26, 42, 323263518, time.UTC), + modTime: time.Date(2023, 7, 11, 23, 21, 46, 604704670, time.UTC), uncompressedSize: 908, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x93\x4d\xab\xdb\x3c\x10\x85\xf7\xfe\x15\x07\xee\xe6\x7d\x17\x2d\x37\xfd\x04\xef\x0a\x77\xd7\xde\xd2\x45\xa1\xeb\x89\x7d\x1c\x8b\x58\x23\x77\x34\x0e\xf8\xdf\x17\x29\x4e\x6f\x48\x43\xa1\x5e\x59\x33\x3a\xcf\x7c\x6a\x0c\xd9\x93\xad\x6d\x03\x3c\xe0\x33\x39\x43\x1c\x13\x25\x3b\x14\x9b\x13\x54\xb7\x15\x33\x0d\x8b\x06\x47\x1a\xe0\x21\x12\x61\x00\x35\x2d\x87\xb1\x5a\x46\x46\x88\x11\xb3\x31\x53\xbd\x02\xbf\x8f\x44\xb2\x9e\x86\x2e\x69\x1f\x3c\x24\x2d\x17\xb1\x5f\xba\x23\x1d\xd9\xc5\x1c\xa2\x3d\xa8\x3d\x7a\x71\x66\xfc\x37\x58\x8a\x88\x29\x3b\x8c\x1d\xd5\xe1\x09\x69\xea\x99\xfd\xff\x06\x38\x74\x55\x24\x83\xd3\x5a\xec\x1a\xe0\x48\xce\x93\x64\x6f\xf1\xe6\x11\x0f\x78\x0e\x1a\xe2\x12\xa1\x4b\xdc\xd3\x4a\x66\x1b\x26\x7b\xe5\x7b\xaa\x8a\xd7\x35\x3f\x00\xaf\xa0\x12\xd9\xe2\xfa\xfb\xb4\x0f\x6e\x62\x6b\x75\x6d\xc5\x6d\x39\x5f\x64\xd8\xce\xf9\x4a\xf9\xf5\x77\xc8\xcd\x87\x74\xa2\x55\x71\x50\xa7\x9d\x64\xba\x95\x4f\xd4\x83\x8f\x67\xc6\x97\xfa\x5f\xe4\x94\x6e\xbc\xf4\x28\x28\x7a\x59\xf3\x8b\x30\x4b\x9c\x27\xe6\x99\x76\xbe\xd1\x5e\xc5\xed\xc5\x25\x97\xc0\x5b\x95\x45\x7d\x05\xab\xfd\xb3\x65\x62\x2e\xf3\x7e\xa9\xfd\x9b\xf1\x14\xd2\x92\x9f\x64\x6d\x6e\x8a\xdb\x35\xf7\xd2\xbd\x58\xff\xcc\xe5\xed\x5d\xf0\x0f\xf2\x78\x4b\x7e\xff\x8f\xe4\xdd\x5d\xf2\x73\x52\x1f\x6f\xd1\xef\xee\xa2\x3f\xfe\x05\x7d\xa0\xd2\x64\x3a\x3f\x83\xba\x42\x32\x61\x30\x12\x79\x96\x8e\x30\xfe\x5c\x82\xb1\xc7\x9e\x43\x32\xc2\xe5\x18\xf4\x00\x41\x56\x99\xf3\x98\x4a\x6b\x63\xd0\xa2\x98\x53\x9a\xaa\xa8\x2c\x64\xe5\x3d\x09\x63\x59\xfc\x10\x99\x96\x3a\xd1\xcc\xf2\x1e\xca\x50\x37\x63\x8b\x0f\x8f\xcd\xaf\x00\x00\x00\xff\xff\xbf\xda\xe7\x4a\x8c\x03\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\x94\x93\x4d\xab\xdb\x3c\x10\x85\xf7\xfe\x15\x07\xee\xe6\x7d\x17\x2d\x37\xfd\x04\xef\x0a\x77\xd7\xde\xd2\x45\xa1\xeb\x89\x7d\x1c\x8b\x58\x23\x77\x34\x0e\xf8\xdf\x17\x29\x4e\x6f\x48\x43\xa1\x5e\x59\x33\x3a\xcf\x7c\x6a\x0c\xd9\x93\xad\x6d\x03\x3c\xe0\x33\x39\x43\x1c\x13\x25\x3b\x14\x9b\x13\x54\xb7\x15\x33\x0d\x8b\x06\x47\x1a\xe0\x21\x12\x61\x00\x35\x2d\x87\xb1\x5a\x46\x46\x88\x11\xb3\x31\x53\xbd\x02\xbf\x8f\x44\xb2\x9e\x86\x2e\x69\x1f\x3c\x24\x2d\x17\xb1\x5f\xba\x23\x1d\xd9\xc5\x1c\xa2\x3d\xa8\x3d\x7a\x71\x66\xfc\x37\x58\x8a\x88\x29\x3b\x8c\x1d\xd5\xe1\x09\x69\xea\x99\xfd\xff\x06\x38\x74\x55\x24\x83\xd3\x5a\xec\x1a\xe0\x48\xce\x93\x64\x6f\xf1\xe6\x11\x0f\x78\x0e\x1a\xe2\x12\xa1\x4b\xdc\xd3\x4a\x66\x1b\x26\x7b\xe5\x7b\xaa\x8a\xd7\x35\x3f\x00\xaf\xa0\x12\xd9\xe2\xfa\xfb\xb4\x0f\x6e\x62\x6b\x75\x6d\xc5\x6d\x39\x5f\x64\xd8\xce\xf9\x4a\xf9\xf5\x77\xc8\xcd\x87\x74\xa2\x55\x71\x50\xa7\x9d\x64\xba\x95\x4f\xd4\x83\x8f\x67\xc6\x97\xfa\x5f\xe4\x94\x6e\xbc\xf4\x28\x28\x7a\x59\xf3\x8b\x30\x4b\x9c\x27\xe6\x99\x76\xbe\xd1\x5e\xc5\xed\xc5\x25\x97\xc0\x5b\x95\x45\x7d\x05\xab\xfd\xb3\x65\x62\x2e\xf3\x7e\xa9\xfd\x9b\xf1\x14\xd2\x92\x9f\x64\x6d\x6e\x8a\xdb\x35\xf7\xd2\xbd\x58\xff\xcc\xe5\xed\x5d\xf0\x0f\xf2\x78\x4b\x7e\xff\x8f\xe4\xdd\x5d\xf2\x73\x52\x1f\x6f\xd1\xef\xee\xa2\x3f\xfe\x05\x7d\xa0\xd2\x64\x3a\x3f\x83\xba\x42\x32\x61\x30\x12\x79\x96\x8e\x30\xfe\x5c\x82\xb1\xc7\x9e\x43\x32\xc2\xe5\x18\xf4\x00\x41\x56\x99\xf3\x98\x4a\x6b\x63\xd0\xa2\x98\x53\x9a\xaa\xa8\x2c\x64\xe5\x3d\x09\x63\x59\xfc\x10\x99\x96\x3a\xd1\xcc\xf2\x1e\xca\x50\x37\x63\x8b\x0f\x8f\xcd\xaf\x00\x00\x00\xff\xff\xbf\xda\xe7\x4a\x8c\x03\x00\x00"), }, } fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ @@ -109,7 +108,7 @@ func (f *vfsgen۰CompressedFile) Read(p []byte) (n int, err error) { } if f.grPos < f.seekPos { // Fast-forward. - _, err = io.CopyN(ioutil.Discard, f.gr, f.seekPos-f.grPos) + _, err = io.CopyN(io.Discard, f.gr, f.seekPos-f.grPos) if err != nil { return 0, err } diff --git a/internal/testutils/zfs_disk_handler.go b/internal/testutils/zfs_disk_handler.go index f78b277a..3d65c2a8 100644 --- a/internal/testutils/zfs_disk_handler.go +++ b/internal/testutils/zfs_disk_handler.go @@ -13,7 +13,7 @@ import ( "github.com/ubuntu/zsys/internal/zfs/libzfs" "github.com/ubuntu/zsys/internal/zfs/libzfs/mock" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) const mB = 1024 * 1024 diff --git a/po/de.po b/po/de.po index 4f832837..d43a9f9d 100644 --- a/po/de.po +++ b/po/de.po @@ -60,7 +60,7 @@ msgstr "" msgid " - %s\n" msgstr "" -#: internal/zfs/helpers.go:327 +#: internal/zfs/helpers.go:328 msgid "%q has some clones (%v) when it shouldn't" msgstr "" @@ -82,8 +82,8 @@ msgstr "" msgid "%q isn't a zsys snapshot with a valid %q property: %v" msgstr "" -#: internal/zfs/helpers.go:111 internal/zfs/helpers.go:374 -#: internal/zfs/helpers.go:393 +#: internal/zfs/helpers.go:111 internal/zfs/helpers.go:375 +#: internal/zfs/helpers.go:394 msgid "%q property isn't an int: " msgstr "" @@ -178,7 +178,7 @@ msgstr "" #: cmd/zsysd/cmdhandler/common.go:18 #, c-format -msgid "Alias of %s" +msgid "Alias of %s. %s" msgstr "" #: internal/daemon/daemon.go:167 @@ -468,7 +468,7 @@ msgstr "" msgid "Force removing, even if dependencies are found" msgstr "" -#: cmd/zsysd/completion.go:16 +#: cmd/zsysd/completion.go:54 msgid "" "Generates completion scripts (will attempt to automatically detect shell)" msgstr "" @@ -503,7 +503,7 @@ msgstr "" msgid "Invalid capacity %q on pool %q: %v" msgstr "" -#: internal/zfs/helpers.go:314 +#: internal/zfs/helpers.go:315 msgid "IsUserDataset called on snapshot %q." msgstr "" @@ -1040,10 +1040,6 @@ msgstr "" msgid "ZSys:\t%t\n" msgstr "" -#: cmd/zsysd/completion.go:35 -msgid "autoload -U compinit; compinit" -msgstr "" - #: internal/machines/gc.go:98 internal/machines/gc.go:273 msgid "bucket %+v" msgstr "" @@ -1112,7 +1108,7 @@ msgstr "" msgid "cannot destroy dataset %q: %v" msgstr "" -#: internal/zfs/helpers.go:629 +#: internal/zfs/helpers.go:630 msgid "cannot find %q as child of parent %q" msgstr "" @@ -1121,7 +1117,7 @@ msgstr "" msgid "cannot find %q: %v" msgstr "" -#: internal/zfs/helpers.go:553 +#: internal/zfs/helpers.go:554 msgid "cannot find base snapshot %q: %v" msgstr "" @@ -1134,7 +1130,7 @@ msgstr "" msgid "cannot find parent for %s: %v" msgstr "" -#: internal/zfs/helpers.go:581 +#: internal/zfs/helpers.go:582 msgid "cannot remove snapshot %q on old dataset %q: %v" msgstr "" @@ -1337,7 +1333,7 @@ msgstr "" msgid "couldn't save system state: " msgstr "" -#: internal/zfs/helpers.go:324 +#: internal/zfs/helpers.go:325 msgid "couldn't scan %q for clones" msgstr "" @@ -1538,25 +1534,25 @@ msgstr "" msgid "one and only one state to delete should be provided" msgstr "" -#: internal/zfs/helpers.go:277 +#: internal/zfs/helpers.go:278 msgid "" "parent of %q doesn't have a snapshot named %q. Every of its children " "shouldn't have a snapshot. However %q exists" msgstr "" -#: internal/authorizer/authorizer.go:249 +#: internal/authorizer/authorizer.go:250 msgid "parsing error: %v" msgstr "" -#: internal/authorizer/authorizer.go:241 +#: internal/authorizer/authorizer.go:242 msgid "parsing error: ) at the end" msgstr "" -#: internal/authorizer/authorizer.go:245 +#: internal/authorizer/authorizer.go:246 msgid "parsing error: less fields than required" msgstr "" -#: internal/authorizer/authorizer.go:237 +#: internal/authorizer/authorizer.go:238 msgid "parsing error: missing )" msgstr "" diff --git a/po/fr.po b/po/fr.po index 9d77e4e6..578f9c51 100644 --- a/po/fr.po +++ b/po/fr.po @@ -60,7 +60,7 @@ msgstr "" msgid " - %s\n" msgstr "" -#: internal/zfs/helpers.go:327 +#: internal/zfs/helpers.go:328 msgid "%q has some clones (%v) when it shouldn't" msgstr "" @@ -82,8 +82,8 @@ msgstr "" msgid "%q isn't a zsys snapshot with a valid %q property: %v" msgstr "" -#: internal/zfs/helpers.go:111 internal/zfs/helpers.go:374 -#: internal/zfs/helpers.go:393 +#: internal/zfs/helpers.go:111 internal/zfs/helpers.go:375 +#: internal/zfs/helpers.go:394 msgid "%q property isn't an int: " msgstr "" @@ -178,7 +178,7 @@ msgstr "" #: cmd/zsysd/cmdhandler/common.go:18 #, c-format -msgid "Alias of %s" +msgid "Alias of %s. %s" msgstr "" #: internal/daemon/daemon.go:167 @@ -468,7 +468,7 @@ msgstr "" msgid "Force removing, even if dependencies are found" msgstr "" -#: cmd/zsysd/completion.go:16 +#: cmd/zsysd/completion.go:54 msgid "" "Generates completion scripts (will attempt to automatically detect shell)" msgstr "" @@ -503,7 +503,7 @@ msgstr "" msgid "Invalid capacity %q on pool %q: %v" msgstr "" -#: internal/zfs/helpers.go:314 +#: internal/zfs/helpers.go:315 msgid "IsUserDataset called on snapshot %q." msgstr "" @@ -1040,10 +1040,6 @@ msgstr "" msgid "ZSys:\t%t\n" msgstr "" -#: cmd/zsysd/completion.go:35 -msgid "autoload -U compinit; compinit" -msgstr "" - #: internal/machines/gc.go:98 internal/machines/gc.go:273 msgid "bucket %+v" msgstr "" @@ -1112,7 +1108,7 @@ msgstr "" msgid "cannot destroy dataset %q: %v" msgstr "" -#: internal/zfs/helpers.go:629 +#: internal/zfs/helpers.go:630 msgid "cannot find %q as child of parent %q" msgstr "" @@ -1121,7 +1117,7 @@ msgstr "" msgid "cannot find %q: %v" msgstr "" -#: internal/zfs/helpers.go:553 +#: internal/zfs/helpers.go:554 msgid "cannot find base snapshot %q: %v" msgstr "" @@ -1134,7 +1130,7 @@ msgstr "" msgid "cannot find parent for %s: %v" msgstr "" -#: internal/zfs/helpers.go:581 +#: internal/zfs/helpers.go:582 msgid "cannot remove snapshot %q on old dataset %q: %v" msgstr "" @@ -1337,7 +1333,7 @@ msgstr "" msgid "couldn't save system state: " msgstr "" -#: internal/zfs/helpers.go:324 +#: internal/zfs/helpers.go:325 msgid "couldn't scan %q for clones" msgstr "" @@ -1538,25 +1534,25 @@ msgstr "" msgid "one and only one state to delete should be provided" msgstr "" -#: internal/zfs/helpers.go:277 +#: internal/zfs/helpers.go:278 msgid "" "parent of %q doesn't have a snapshot named %q. Every of its children " "shouldn't have a snapshot. However %q exists" msgstr "" -#: internal/authorizer/authorizer.go:249 +#: internal/authorizer/authorizer.go:250 msgid "parsing error: %v" msgstr "" -#: internal/authorizer/authorizer.go:241 +#: internal/authorizer/authorizer.go:242 msgid "parsing error: ) at the end" msgstr "" -#: internal/authorizer/authorizer.go:245 +#: internal/authorizer/authorizer.go:246 msgid "parsing error: less fields than required" msgstr "" -#: internal/authorizer/authorizer.go:237 +#: internal/authorizer/authorizer.go:238 msgid "parsing error: missing )" msgstr "" diff --git a/po/zsys.pot b/po/zsys.pot index a6bb4917..f1deac2e 100644 --- a/po/zsys.pot +++ b/po/zsys.pot @@ -60,7 +60,7 @@ msgstr "" msgid " - %s\n" msgstr "" -#: internal/zfs/helpers.go:327 +#: internal/zfs/helpers.go:328 msgid "%q has some clones (%v) when it shouldn't" msgstr "" @@ -82,8 +82,8 @@ msgstr "" msgid "%q isn't a zsys snapshot with a valid %q property: %v" msgstr "" -#: internal/zfs/helpers.go:111 internal/zfs/helpers.go:374 -#: internal/zfs/helpers.go:393 +#: internal/zfs/helpers.go:111 internal/zfs/helpers.go:375 +#: internal/zfs/helpers.go:394 msgid "%q property isn't an int: " msgstr "" @@ -178,7 +178,7 @@ msgstr "" #: cmd/zsysd/cmdhandler/common.go:18 #, c-format -msgid "Alias of %s" +msgid "Alias of %s. %s" msgstr "" #: internal/daemon/daemon.go:167 @@ -468,7 +468,7 @@ msgstr "" msgid "Force removing, even if dependencies are found" msgstr "" -#: cmd/zsysd/completion.go:16 +#: cmd/zsysd/completion.go:54 msgid "" "Generates completion scripts (will attempt to automatically detect shell)" msgstr "" @@ -503,7 +503,7 @@ msgstr "" msgid "Invalid capacity %q on pool %q: %v" msgstr "" -#: internal/zfs/helpers.go:314 +#: internal/zfs/helpers.go:315 msgid "IsUserDataset called on snapshot %q." msgstr "" @@ -1040,10 +1040,6 @@ msgstr "" msgid "ZSys:\t%t\n" msgstr "" -#: cmd/zsysd/completion.go:35 -msgid "autoload -U compinit; compinit" -msgstr "" - #: internal/machines/gc.go:98 internal/machines/gc.go:273 msgid "bucket %+v" msgstr "" @@ -1112,7 +1108,7 @@ msgstr "" msgid "cannot destroy dataset %q: %v" msgstr "" -#: internal/zfs/helpers.go:629 +#: internal/zfs/helpers.go:630 msgid "cannot find %q as child of parent %q" msgstr "" @@ -1121,7 +1117,7 @@ msgstr "" msgid "cannot find %q: %v" msgstr "" -#: internal/zfs/helpers.go:553 +#: internal/zfs/helpers.go:554 msgid "cannot find base snapshot %q: %v" msgstr "" @@ -1134,7 +1130,7 @@ msgstr "" msgid "cannot find parent for %s: %v" msgstr "" -#: internal/zfs/helpers.go:581 +#: internal/zfs/helpers.go:582 msgid "cannot remove snapshot %q on old dataset %q: %v" msgstr "" @@ -1337,7 +1333,7 @@ msgstr "" msgid "couldn't save system state: " msgstr "" -#: internal/zfs/helpers.go:324 +#: internal/zfs/helpers.go:325 msgid "couldn't scan %q for clones" msgstr "" @@ -1538,25 +1534,25 @@ msgstr "" msgid "one and only one state to delete should be provided" msgstr "" -#: internal/zfs/helpers.go:277 +#: internal/zfs/helpers.go:278 msgid "" "parent of %q doesn't have a snapshot named %q. Every of its children " "shouldn't have a snapshot. However %q exists" msgstr "" -#: internal/authorizer/authorizer.go:249 +#: internal/authorizer/authorizer.go:250 msgid "parsing error: %v" msgstr "" -#: internal/authorizer/authorizer.go:241 +#: internal/authorizer/authorizer.go:242 msgid "parsing error: ) at the end" msgstr "" -#: internal/authorizer/authorizer.go:245 +#: internal/authorizer/authorizer.go:246 msgid "parsing error: less fields than required" msgstr "" -#: internal/authorizer/authorizer.go:237 +#: internal/authorizer/authorizer.go:238 msgid "parsing error: missing )" msgstr ""