diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 07743ed..0dab942 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -73,7 +73,7 @@ jobs: - name: Login to DockerHub if: steps.have_credentials.outputs.access == 'true' - uses: docker/login-action@v1 + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/docs/installation.markdown b/docs/installation.markdown index 4cce003..2575204 100644 --- a/docs/installation.markdown +++ b/docs/installation.markdown @@ -147,7 +147,7 @@ vagrant(){ } ``` -Running Podman in rootless mode maps the root user inside the container to your host user so we need to bypass [entrypoint.sh](https://github.com/vagrant-libvirt/vagrant-libvirt/blob/main/entrypoint.sh) and mount persistent storage directly to `/vagrant`. +Running Podman in rootless mode maps the root user inside the container to your host user so we need to bypass [entrypoint.sh](https://github.com/vagrant-libvirt/vagrant-libvirt/blob/main/entrypoint.sh) and mount persistent storage directly to `/vagrant`. #### Extending the container image with additional vagrant plugins diff --git a/example_box/README.md b/example_box/README.md index 53464fc..5042917 100644 --- a/example_box/README.md +++ b/example_box/README.md @@ -23,7 +23,7 @@ Libvirt box should define at least three data fields in `metadata.json` file. ## Converting Boxes -Instead of creating a box from scratch, you can use -[vagrant-mutate](https://github.com/sciurus/vagrant-mutate) -to take boxes created for other Vagrant providers and use them +Instead of creating a box from scratch, you can use +[vagrant-mutate](https://github.com/sciurus/vagrant-mutate) +to take boxes created for other Vagrant providers and use them with vagrant-libvirt. diff --git a/example_box/Vagrantfile b/example_box/Vagrantfile index 33d6d1a..1c856ec 100644 --- a/example_box/Vagrantfile +++ b/example_box/Vagrantfile @@ -6,7 +6,7 @@ Vagrant.configure("2") do |config| # Example configuration of new VM.. - # + # #config.vm.define :test_vm do |test_vm| # Box name # @@ -22,7 +22,7 @@ Vagrant.configure("2") do |config| #end # Interfaces for VM - # + # # Networking features in the form of `config.vm.network` # #test_vm.vm.network :private_network, :ip => '10.20.30.40' @@ -59,4 +59,3 @@ Vagrant.configure("2") do |config| #libvirt.default_prefix = '' end end - diff --git a/example_box/metadata.json b/example_box/metadata.json index f483ad2..4abb696 100644 --- a/example_box/metadata.json +++ b/example_box/metadata.json @@ -1,5 +1,5 @@ { "provider" : "libvirt", "format" : "qcow2", - "virtual_size" : 16 + "virtual_size" : 16 } diff --git a/lib/vagrant-libvirt/action.rb b/lib/vagrant-libvirt/action.rb index c1232d0..56bc2aa 100644 --- a/lib/vagrant-libvirt/action.rb +++ b/lib/vagrant-libvirt/action.rb @@ -411,7 +411,7 @@ module VagrantPlugins end end end - + # This is the action that is primarily responsible for restoring a snapshot def self.action_snapshot_restore Vagrant::Action::Builder.new.tap do |b| @@ -420,7 +420,7 @@ module VagrantPlugins unless env[:result] raise Vagrant::Errors::VMNotCreatedError end - + b2.use SnapshotRestore end end @@ -434,7 +434,7 @@ module VagrantPlugins unless env[:result] raise Vagrant::Errors::VMNotCreatedError end - + b2.use SnapshotSave end end diff --git a/lib/vagrant-libvirt/action/create_networks.rb b/lib/vagrant-libvirt/action/create_networks.rb index dee4025..ee2b451 100644 --- a/lib/vagrant-libvirt/action/create_networks.rb +++ b/lib/vagrant-libvirt/action/create_networks.rb @@ -321,7 +321,7 @@ module VagrantPlugins @network_ipv6_address = @interface_network[:ipv6_address] @network_ipv6_prefix = @interface_network[:ipv6_prefix] - + @network_bridge_stp = @options[:bridge_stp].nil? || @options[:bridge_stp] ? 'on' : 'off' @network_bridge_delay = @options[:bridge_delay] ? @options[:bridge_delay] : 0 diff --git a/lib/vagrant-libvirt/config.rb b/lib/vagrant-libvirt/config.rb index b244b20..6fa4c50 100644 --- a/lib/vagrant-libvirt/config.rb +++ b/lib/vagrant-libvirt/config.rb @@ -1088,7 +1088,7 @@ module VagrantPlugins result.cdroms = c result.disk_driver_opts = disk_driver_opts.merge(other.disk_driver_opts) - + c = clock_timers.dup c += other.clock_timers result.clock_timers = c diff --git a/lib/vagrant-libvirt/errors.rb b/lib/vagrant-libvirt/errors.rb index caf2203..a67b007 100644 --- a/lib/vagrant-libvirt/errors.rb +++ b/lib/vagrant-libvirt/errors.rb @@ -201,7 +201,7 @@ module VagrantPlugins class SnapshotListError < VagrantLibvirtError error_key(:snapshot_list_error) end - + class SnapshotCreationError < VagrantLibvirtError error_key(:snapshot_creation_error) end diff --git a/locales/en.yml b/locales/en.yml index 106f9eb..750ac51 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -194,7 +194,7 @@ en: snapshot_creation_error: |- Cannot create snapshot(s): %{error_message}. snapshot_reversion_error: |- - Cannot revert snapshot(s): %{error_message}. + Cannot revert snapshot(s): %{error_message}. serial_cannot_create_path_error: |- Error creating path for serial port output log: %{path} diff --git a/spec/unit/action_spec.rb b/spec/unit/action_spec.rb index 0147f38..9f76449 100644 --- a/spec/unit/action_spec.rb +++ b/spec/unit/action_spec.rb @@ -170,7 +170,7 @@ describe VagrantPlugins::ProviderLibvirt::Action do end end end - + describe '#action_snapshot_delete' do context 'when not created' do before do @@ -229,7 +229,7 @@ describe VagrantPlugins::ProviderLibvirt::Action do end end end - + describe '#action_snapshot_save' do context 'when not created' do before do