vagrant-unbundled 1.8.4.2 → 1.8.5.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +1 -1
- data/CHANGELOG.md +52 -0
- data/Gemfile.lock +9 -7
- data/RELEASE.md +37 -14
- data/lib/vagrant/action/builtin/box_add.rb +3 -1
- data/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb +5 -0
- data/lib/vagrant/box_collection.rb +2 -1
- data/lib/vagrant/bundler.rb +36 -1
- data/lib/vagrant/errors.rb +16 -8
- data/lib/vagrant/plugin/state_file.rb +8 -1
- data/lib/vagrant/util/platform.rb +1 -1
- data/plugins/guests/arch/cap/change_host_name.rb +13 -10
- data/plugins/guests/arch/cap/configure_networks.rb +11 -8
- data/plugins/guests/arch/cap/nfs.rb +35 -0
- data/plugins/guests/arch/cap/rsync.rb +16 -0
- data/plugins/guests/arch/cap/smb.rb +17 -0
- data/plugins/guests/arch/plugin.rb +28 -3
- data/plugins/guests/atomic/cap/change_host_name.rb +13 -10
- data/plugins/guests/atomic/plugin.rb +3 -3
- data/plugins/guests/{netbsd → bsd}/cap/halt.rb +2 -2
- data/plugins/guests/bsd/cap/nfs.rb +49 -0
- data/plugins/guests/bsd/cap/public_key.rb +65 -0
- data/plugins/guests/bsd/cap/virtualbox.rb +16 -0
- data/plugins/guests/bsd/guest.rb +9 -0
- data/plugins/guests/bsd/plugin.rb +40 -0
- data/plugins/guests/coreos/cap/change_host_name.rb +1 -1
- data/plugins/guests/coreos/plugin.rb +4 -4
- data/plugins/guests/darwin/cap/change_host_name.rb +4 -1
- data/plugins/guests/darwin/cap/configure_networks.rb +12 -5
- data/plugins/guests/darwin/cap/halt.rb +3 -1
- data/plugins/guests/darwin/cap/rsync.rb +7 -4
- data/plugins/guests/darwin/plugin.rb +13 -28
- data/plugins/guests/debian/cap/change_host_name.rb +14 -15
- data/plugins/guests/debian/cap/configure_networks.rb +2 -6
- data/plugins/guests/debian/cap/{nfs_client.rb → nfs.rb} +2 -1
- data/plugins/guests/debian/cap/rsync.rb +5 -6
- data/plugins/guests/debian/plugin.rb +8 -8
- data/plugins/guests/esxi/cap/mount_nfs_folder.rb +2 -2
- data/plugins/guests/esxi/plugin.rb +6 -6
- data/plugins/guests/fedora/cap/flavor.rb +1 -1
- data/plugins/guests/fedora/plugin.rb +2 -17
- data/plugins/guests/freebsd/cap/change_host_name.rb +2 -3
- data/plugins/guests/freebsd/cap/rsync.rb +7 -4
- data/plugins/guests/freebsd/plugin.rb +9 -29
- data/plugins/guests/funtoo/plugin.rb +3 -8
- data/plugins/guests/gentoo/cap/change_host_name.rb +21 -6
- data/plugins/guests/gentoo/cap/configure_networks.rb +35 -26
- data/plugins/guests/gentoo/plugin.rb +4 -4
- data/plugins/guests/linux/cap/choose_addressable_ip_addr.rb +2 -3
- data/plugins/guests/linux/cap/mount_virtualbox_shared_folder.rb +31 -45
- data/plugins/guests/linux/cap/network_interfaces.rb +20 -0
- data/plugins/guests/linux/cap/nfs.rb +57 -0
- data/plugins/guests/linux/cap/public_key.rb +65 -0
- data/plugins/guests/linux/cap/rsync.rb +7 -4
- data/plugins/guests/linux/plugin.rb +30 -25
- data/plugins/guests/mint/plugin.rb +1 -1
- data/plugins/guests/netbsd/plugin.rb +10 -30
- data/plugins/guests/nixos/plugin.rb +5 -5
- data/plugins/guests/omnios/cap/change_host_name.rb +1 -1
- data/plugins/guests/omnios/plugin.rb +4 -4
- data/plugins/guests/openbsd/cap/change_host_name.rb +21 -3
- data/plugins/guests/openbsd/plugin.rb +10 -30
- data/plugins/guests/photon/cap/change_host_name.rb +1 -1
- data/plugins/guests/photon/plugin.rb +4 -4
- data/plugins/guests/pld/cap/change_host_name.rb +1 -1
- data/plugins/guests/pld/plugin.rb +4 -4
- data/plugins/guests/redhat/cap/change_host_name.rb +4 -3
- data/plugins/guests/redhat/cap/configure_networks.rb +1 -24
- data/plugins/guests/redhat/plugin.rb +7 -7
- data/plugins/guests/slackware/cap/change_host_name.rb +1 -1
- data/plugins/guests/slackware/cap/configure_networks.rb +1 -5
- data/plugins/guests/slackware/plugin.rb +3 -3
- data/plugins/guests/smartos/plugin.rb +12 -12
- data/plugins/guests/solaris/plugin.rb +14 -14
- data/plugins/guests/solaris11/plugin.rb +12 -12
- data/plugins/guests/suse/cap/change_host_name.rb +1 -1
- data/plugins/guests/suse/cap/configure_networks.rb +1 -5
- data/plugins/guests/suse/plugin.rb +8 -8
- data/plugins/guests/tinycore/cap/mount_nfs.rb +2 -2
- data/plugins/guests/tinycore/plugin.rb +7 -7
- data/plugins/guests/trisquel/plugin.rb +1 -1
- data/plugins/guests/ubuntu/guest.rb +1 -1
- data/plugins/guests/ubuntu/plugin.rb +1 -6
- data/plugins/guests/windows/plugin.rb +2 -2
- data/plugins/kernel_v2/config/vm.rb +8 -1
- data/plugins/providers/hyperv/scripts/get_vm_status.ps1 +25 -5
- data/plugins/providers/virtualbox/driver/meta.rb +1 -0
- data/plugins/providers/virtualbox/driver/version_5_1.rb +734 -0
- data/plugins/providers/virtualbox/plugin.rb +1 -0
- data/plugins/synced_folders/nfs/synced_folder.rb +10 -2
- data/plugins/synced_folders/rsync/helper.rb +11 -4
- data/scripts/{bintray_upload.sh → sign.sh} +0 -0
- data/templates/guests/arch/network_static.erb +3 -3
- data/templates/guests/arch/network_static6.erb +8 -0
- data/templates/guests/freebsd/network_static6.erb +6 -0
- data/templates/guests/funtoo/network_static6.erb +9 -0
- data/templates/guests/gentoo/network_dhcp.erb +1 -1
- data/templates/guests/gentoo/network_static.erb +4 -4
- data/templates/guests/gentoo/network_static6.erb +7 -0
- data/templates/guests/redhat/network_dhcp.erb +1 -1
- data/templates/guests/redhat/network_static.erb +4 -1
- data/templates/guests/{fedora → redhat}/network_static6.erb +5 -2
- data/templates/locales/en.yml +40 -6
- data/test/unit/plugins/guests/arch/cap/change_host_name_test.rb +6 -6
- data/test/unit/plugins/guests/arch/cap/configure_networks_test.rb +20 -15
- data/test/unit/plugins/guests/arch/cap/rsync_test.rb +30 -0
- data/test/unit/plugins/guests/arch/cap/smb_test.rb +38 -0
- data/test/unit/plugins/guests/atomic/cap/change_host_name_test.rb +9 -8
- data/test/unit/plugins/guests/{freebsd → bsd}/cap/halt_test.rb +11 -10
- data/test/unit/plugins/guests/{freebsd → bsd}/cap/insert_public_key_test.rb +7 -6
- data/test/unit/plugins/guests/bsd/cap/nfs_test.rb +68 -0
- data/test/unit/plugins/guests/coreos/cap/change_host_name_test.rb +5 -5
- data/test/unit/plugins/guests/darwin/cap/change_host_name_test.rb +5 -5
- data/test/unit/plugins/guests/darwin/cap/halt_test.rb +36 -0
- data/test/unit/plugins/guests/debian/cap/change_host_name_test.rb +3 -5
- data/test/unit/plugins/guests/debian/cap/configure_networks_test.rb +13 -9
- data/test/unit/plugins/guests/debian/cap/rsync_test.rb +3 -11
- data/test/unit/plugins/guests/freebsd/cap/change_host_name_test.rb +2 -2
- data/test/unit/plugins/guests/linux/cap/mount_nfs_test.rb +16 -3
- data/test/unit/plugins/guests/omnios/cap/change_host_name_test.rb +2 -2
- data/test/unit/plugins/guests/photon/cap/change_host_name_test.rb +2 -2
- data/test/unit/plugins/guests/pld/cap/change_host_name_test.rb +2 -2
- data/test/unit/plugins/guests/redhat/cap/change_host_name_test.rb +4 -3
- data/test/unit/plugins/guests/redhat/cap/configure_networks_test.rb +17 -33
- data/test/unit/plugins/guests/slackware/cap/change_host_name_test.rb +2 -2
- data/test/unit/plugins/guests/slackware/cap/configure_networks_test.rb +8 -4
- data/test/unit/plugins/guests/suse/cap/change_host_name_test.rb +2 -2
- data/test/unit/plugins/guests/suse/cap/configure_networks_test.rb +13 -16
- data/test/unit/plugins/kernel_v2/config/vm_test.rb +10 -2
- data/test/unit/templates/guests/arch/network_static_test.rb +4 -2
- data/test/unit/templates/guests/gentoo/network_dhcp_test.rb +2 -2
- data/test/unit/templates/guests/gentoo/network_static_test.rb +10 -10
- data/test/unit/templates/guests/redhat/network_dhcp_test.rb +2 -2
- data/test/unit/templates/guests/redhat/network_static_test.rb +9 -9
- data/vagrant.gemspec +3 -3
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/CHANGELOG.md +1 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/CONTRIBUTING.md +38 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/LICENSE.txt +22 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/README.md +297 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/bin/listen +12 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/adapter/base.rb +141 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/adapter/bsd.rb +106 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/adapter/config.rb +26 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/adapter/darwin.rb +92 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/adapter/linux.rb +106 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/adapter/polling.rb +37 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/adapter/windows.rb +98 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/adapter.rb +45 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/backend.rb +38 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/change.rb +76 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/cli.rb +65 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/directory.rb +87 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/event/config.rb +55 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/event/loop.rb +117 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/event/processor.rb +122 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/event/queue.rb +55 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/file.rb +80 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/fsm.rb +132 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/internals/thread_pool.rb +29 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/listener/config.rb +41 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/listener.rb +133 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/logger.rb +32 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/options.rb +23 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/queue_optimizer.rb +132 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/record/entry.rb +64 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/record/symlink_detector.rb +39 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/record.rb +118 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/silencer/controller.rb +48 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/silencer.rb +97 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen/version.rb +3 -0
- data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/lib/listen.rb +57 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/.gitignore +8 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/.rspec +2 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/.rubocop-disables.yml +384 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/.rubocop.yml +3 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/.travis.yml +43 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/AUTHORS +98 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/Gemfile +11 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/LICENSE +21 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/README.md +667 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/Rakefile +132 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/bin/restclient +92 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/history.md +310 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/rest-client.rb +2 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/rest_client.rb +2 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/restclient/abstract_response.rb +226 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/restclient/exceptions.rb +244 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/restclient/params_array.rb +72 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/restclient/payload.rb +209 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/restclient/platform.rb +49 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/restclient/raw_response.rb +38 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/restclient/request.rb +904 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/restclient/resource.rb +168 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/restclient/response.rb +80 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/restclient/utils.rb +235 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/restclient/version.rb +8 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/restclient/windows/root_certs.rb +105 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/restclient/windows.rb +8 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/lib/restclient.rb +184 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/rest-client.gemspec +31 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/rest-client.windows.gemspec +19 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/helpers.rb +22 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/integration/_lib.rb +1 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/integration/capath_digicert/244b5494.0 +19 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/integration/capath_digicert/81b9768f.0 +19 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/integration/capath_digicert/README +8 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/integration/capath_digicert/digicert.crt +19 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/integration/capath_verisign/415660c1.0 +14 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/integration/capath_verisign/7651b327.0 +14 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/integration/capath_verisign/README +8 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/integration/capath_verisign/verisign.crt +14 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/integration/certs/digicert.crt +19 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/integration/certs/verisign.crt +14 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/integration/httpbin_spec.rb +86 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/integration/integration_spec.rb +125 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/integration/request_spec.rb +127 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/spec_helper.rb +29 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/unit/_lib.rb +1 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/unit/abstract_response_spec.rb +145 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/unit/exceptions_spec.rb +108 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/unit/master_shake.jpg +0 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/unit/params_array_spec.rb +36 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/unit/payload_spec.rb +263 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/unit/raw_response_spec.rb +18 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/unit/request2_spec.rb +54 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/unit/request_spec.rb +1265 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/unit/resource_spec.rb +130 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/unit/response_spec.rb +241 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/unit/restclient_spec.rb +79 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/unit/utils_spec.rb +147 -0
- data/vendor/bundle/ruby/2.3.0/gems/rest-client-2.0.0/spec/unit/windows/root_certs_spec.rb +22 -0
- data/vendor/bundle/ruby/2.3.0/gems/ruby_dep-1.4.0/.gitignore +10 -0
- data/vendor/bundle/ruby/2.3.0/gems/ruby_dep-1.4.0/.rspec +3 -0
- data/vendor/bundle/ruby/2.3.0/gems/ruby_dep-1.4.0/.rubocop.yml +3 -0
- data/vendor/bundle/ruby/2.3.0/gems/ruby_dep-1.4.0/.travis.yml +11 -0
- data/vendor/bundle/ruby/2.3.0/gems/ruby_dep-1.4.0/LICENSE.txt +21 -0
- data/vendor/bundle/ruby/2.3.0/gems/ruby_dep-1.4.0/README.md +151 -0
- data/vendor/bundle/ruby/2.3.0/gems/ruby_dep-1.4.0/lib/ruby_dep/logger.rb +16 -0
- data/vendor/bundle/ruby/2.3.0/gems/ruby_dep-1.4.0/lib/ruby_dep/quiet.rb +3 -0
- data/vendor/bundle/ruby/2.3.0/gems/ruby_dep-1.4.0/lib/ruby_dep/ruby_version.rb +58 -0
- data/vendor/bundle/ruby/2.3.0/gems/ruby_dep-1.4.0/lib/ruby_dep/travis/ruby_version.rb +59 -0
- data/vendor/bundle/ruby/2.3.0/gems/ruby_dep-1.4.0/lib/ruby_dep/travis.rb +58 -0
- data/vendor/bundle/ruby/2.3.0/gems/ruby_dep-1.4.0/lib/ruby_dep/version.rb +3 -0
- data/vendor/bundle/ruby/2.3.0/gems/ruby_dep-1.4.0/lib/ruby_dep/warning.rb +97 -0
- data/vendor/bundle/ruby/2.3.0/gems/ruby_dep-1.4.0/lib/ruby_dep.rb +2 -0
- data/vendor/bundle/ruby/2.3.0/specifications/listen-3.1.5.gemspec +44 -0
- data/vendor/bundle/ruby/2.3.0/specifications/rest-client-2.0.0.gemspec +60 -0
- data/vendor/bundle/ruby/2.3.0/specifications/ruby_dep-1.4.0.gemspec +34 -0
- data/version.txt +1 -1
- metadata +147 -44
- data/plugins/guests/darwin/cap/insert_public_key.rb +0 -33
- data/plugins/guests/darwin/cap/mount_nfs_folder.rb +0 -37
- data/plugins/guests/darwin/cap/remove_public_key.rb +0 -21
- data/plugins/guests/fedora/cap/change_host_name.rb +0 -29
- data/plugins/guests/fedora/cap/configure_networks.rb +0 -135
- data/plugins/guests/fedora/cap/network_scripts_dir.rb +0 -15
- data/plugins/guests/freebsd/cap/halt.rb +0 -16
- data/plugins/guests/freebsd/cap/insert_public_key.rb +0 -34
- data/plugins/guests/freebsd/cap/mount_nfs_folder.rb +0 -24
- data/plugins/guests/freebsd/cap/remove_public_key.rb +0 -21
- data/plugins/guests/funtoo/cap/change_host_name.rb +0 -17
- data/plugins/guests/linux/cap/insert_public_key.rb +0 -31
- data/plugins/guests/linux/cap/mount_nfs.rb +0 -50
- data/plugins/guests/linux/cap/nfs_client.rb +0 -11
- data/plugins/guests/linux/cap/remove_public_key.rb +0 -24
- data/plugins/guests/netbsd/cap/insert_public_key.rb +0 -21
- data/plugins/guests/netbsd/cap/mount_nfs_folder.rb +0 -17
- data/plugins/guests/netbsd/cap/remove_public_key.rb +0 -21
- data/plugins/guests/openbsd/cap/halt.rb +0 -16
- data/plugins/guests/openbsd/cap/insert_public_key.rb +0 -21
- data/plugins/guests/openbsd/cap/mount_nfs_folder.rb +0 -14
- data/plugins/guests/openbsd/cap/remove_public_key.rb +0 -21
- data/plugins/guests/ubuntu/cap/change_host_name.rb +0 -52
- data/templates/guests/fedora/network_dhcp.erb +0 -6
- data/templates/guests/fedora/network_static.erb +0 -16
- data/test/unit/plugins/guests/freebsd/cap/mount_nfs_folder_test.rb +0 -53
- data/test/unit/plugins/guests/ubuntu/cap/change_host_name_test.rb +0 -42
- data/test/unit/templates/guests/fedora/network_dhcp_test.rb +0 -21
- data/test/unit/templates/guests/fedora/network_static6_test.rb +0 -25
- data/test/unit/templates/guests/fedora/network_static_test.rb +0 -71
@@ -1,33 +0,0 @@
|
|
1
|
-
require "tempfile"
|
2
|
-
|
3
|
-
module VagrantPlugins
|
4
|
-
module GuestDarwin
|
5
|
-
module Cap
|
6
|
-
class InsertPublicKey
|
7
|
-
def self.insert_public_key(machine, contents)
|
8
|
-
comm = machine.communicate
|
9
|
-
contents = contents.chomp
|
10
|
-
|
11
|
-
remote_path = "/tmp/vagrant-authorized-keys-#{Time.now.to_i}"
|
12
|
-
Tempfile.open("vagrant-darwin-insert-public-key") do |f|
|
13
|
-
f.binmode
|
14
|
-
f.write(contents)
|
15
|
-
f.fsync
|
16
|
-
f.close
|
17
|
-
comm.upload(f.path, remote_path)
|
18
|
-
end
|
19
|
-
|
20
|
-
comm.execute <<-EOH.gsub(/^ {12}/, '')
|
21
|
-
mkdir -p ~/.ssh
|
22
|
-
chmod 0700 ~/.ssh
|
23
|
-
cat '#{remote_path}' >> ~/.ssh/authorized_keys
|
24
|
-
chmod 0600 ~/.ssh/authorized_keys
|
25
|
-
|
26
|
-
# Remove the temporary file
|
27
|
-
rm -f '#{remote_path}'
|
28
|
-
EOH
|
29
|
-
end
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
@@ -1,37 +0,0 @@
|
|
1
|
-
require "vagrant/util/retryable"
|
2
|
-
|
3
|
-
module VagrantPlugins
|
4
|
-
module GuestDarwin
|
5
|
-
module Cap
|
6
|
-
class MountNFSFolder
|
7
|
-
extend Vagrant::Util::Retryable
|
8
|
-
def self.mount_nfs_folder(machine, ip, folders)
|
9
|
-
folders.each do |name, opts|
|
10
|
-
# Expand the guest path so we can handle things like "~/vagrant"
|
11
|
-
expanded_guest_path = machine.guest.capability(
|
12
|
-
:shell_expand_guest_path, opts[:guestpath])
|
13
|
-
|
14
|
-
# Create the folder
|
15
|
-
machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
|
16
|
-
|
17
|
-
# Figure out any options
|
18
|
-
mount_opts = ["vers=#{opts[:nfs_version]}"]
|
19
|
-
mount_opts << "udp" if opts[:nfs_udp]
|
20
|
-
if opts[:mount_options]
|
21
|
-
mount_opts = opts[:mount_options].dup
|
22
|
-
end
|
23
|
-
|
24
|
-
mount_command = "mount -t nfs " +
|
25
|
-
"-o '#{mount_opts.join(",")}' " +
|
26
|
-
"'#{ip}:#{opts[:hostpath]}' '#{expanded_guest_path}'"
|
27
|
-
retryable(on: Vagrant::Errors::DarwinNFSMountFailed, tries: 10, sleep: 5) do
|
28
|
-
machine.communicate.sudo(
|
29
|
-
mount_command,
|
30
|
-
error_class: Vagrant::Errors::DarwinNFSMountFailed)
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
34
|
-
end
|
35
|
-
end
|
36
|
-
end
|
37
|
-
end
|
@@ -1,21 +0,0 @@
|
|
1
|
-
require "vagrant/util/shell_quote"
|
2
|
-
|
3
|
-
module VagrantPlugins
|
4
|
-
module GuestDarwin
|
5
|
-
module Cap
|
6
|
-
class RemovePublicKey
|
7
|
-
def self.remove_public_key(machine, contents)
|
8
|
-
contents = contents.chomp
|
9
|
-
contents = Vagrant::Util::ShellQuote.escape(contents, "'")
|
10
|
-
|
11
|
-
machine.communicate.tap do |comm|
|
12
|
-
if comm.test("test -f ~/.ssh/authorized_keys")
|
13
|
-
comm.execute(
|
14
|
-
"sed -i '' '/^.*#{contents}.*$/d' ~/.ssh/authorized_keys")
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
@@ -1,29 +0,0 @@
|
|
1
|
-
module VagrantPlugins
|
2
|
-
module GuestFedora
|
3
|
-
module Cap
|
4
|
-
class ChangeHostName
|
5
|
-
def self.change_host_name(machine, name)
|
6
|
-
comm = machine.communicate
|
7
|
-
|
8
|
-
if !comm.test("hostname | grep -w '#{name}'")
|
9
|
-
basename = name.split(".", 2)[0]
|
10
|
-
comm.sudo <<-EOH
|
11
|
-
echo '#{name}' > /etc/hostname
|
12
|
-
hostname -F /etc/hostname
|
13
|
-
hostnamectl set-hostname --static '#{name}'
|
14
|
-
hostnamectl set-hostname --transient '#{name}'
|
15
|
-
|
16
|
-
# Remove comments and blank lines from /etc/hosts
|
17
|
-
sed -i'' -e 's/#.*$//' -e '/^$/d' /etc/hosts
|
18
|
-
|
19
|
-
# Prepend ourselves to /etc/hosts
|
20
|
-
grep -w '#{name}' /etc/hosts || {
|
21
|
-
sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
|
22
|
-
}
|
23
|
-
EOH
|
24
|
-
end
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
28
|
-
end
|
29
|
-
end
|
@@ -1,135 +0,0 @@
|
|
1
|
-
require "set"
|
2
|
-
require "tempfile"
|
3
|
-
|
4
|
-
require_relative "../../../../lib/vagrant/util/retryable"
|
5
|
-
require_relative "../../../../lib/vagrant/util/template_renderer"
|
6
|
-
|
7
|
-
module VagrantPlugins
|
8
|
-
module GuestFedora
|
9
|
-
module Cap
|
10
|
-
class ConfigureNetworks
|
11
|
-
extend Vagrant::Util::Retryable
|
12
|
-
include Vagrant::Util
|
13
|
-
|
14
|
-
def self.configure_networks(machine, networks)
|
15
|
-
network_scripts_dir = machine.guest.capability("network_scripts_dir")
|
16
|
-
|
17
|
-
virtual = false
|
18
|
-
interface_names = Array.new
|
19
|
-
interface_names_by_slot = Array.new
|
20
|
-
machine.communicate.sudo("/usr/sbin/biosdevname &>/dev/null; echo $?") do |_, result|
|
21
|
-
# The above command returns:
|
22
|
-
# - '4' if /usr/sbin/biosdevname detects it is running in a virtual machine
|
23
|
-
# - '127' if /usr/sbin/biosdevname doesn't exist
|
24
|
-
virtual = true if ['4', '127'].include? result.chomp
|
25
|
-
end
|
26
|
-
|
27
|
-
if virtual
|
28
|
-
machine.communicate.sudo("ls -v /sys/class/net | egrep -v lo\\|docker") do |_, result|
|
29
|
-
interface_names = result.split("\n")
|
30
|
-
end
|
31
|
-
|
32
|
-
interface_names_by_slot = networks.map do |network|
|
33
|
-
"#{interface_names[network[:interface]]}"
|
34
|
-
end
|
35
|
-
else
|
36
|
-
machine.communicate.sudo("/usr/sbin/biosdevname -d | grep Kernel | cut -f2 -d: | sed -e 's/ //;'") do |_, result|
|
37
|
-
interface_names = result.split("\n")
|
38
|
-
end
|
39
|
-
|
40
|
-
interface_name_pairs = Array.new
|
41
|
-
interface_names.each do |interface_name|
|
42
|
-
machine.communicate.sudo("/usr/sbin/biosdevname --policy=all_ethN -i #{interface_name}") do |_, result|
|
43
|
-
interface_name_pairs.push([interface_name, result.gsub("\n", "")])
|
44
|
-
end
|
45
|
-
end
|
46
|
-
|
47
|
-
setting_interface_names = networks.map do |network|
|
48
|
-
"eth#{network[:interface]}"
|
49
|
-
end
|
50
|
-
|
51
|
-
interface_names_by_slot = interface_names.dup
|
52
|
-
interface_name_pairs.each do |interface_name, previous_interface_name|
|
53
|
-
if setting_interface_names.index(previous_interface_name) == nil
|
54
|
-
interface_names_by_slot.delete(interface_name)
|
55
|
-
end
|
56
|
-
end
|
57
|
-
end
|
58
|
-
|
59
|
-
# Read interface MAC addresses for later matching
|
60
|
-
mac_addresses = Array.new(interface_names.length)
|
61
|
-
interface_names.each_with_index do |ifname, index|
|
62
|
-
machine.communicate.sudo("cat /sys/class/net/#{ifname}/address") do |_, result|
|
63
|
-
mac_addresses[index] = result.strip
|
64
|
-
end
|
65
|
-
end
|
66
|
-
|
67
|
-
# Accumulate the configurations to add to the interfaces file as well
|
68
|
-
# as what interfaces we're actually configuring since we use that later.
|
69
|
-
interfaces = Set.new
|
70
|
-
networks.each do |network|
|
71
|
-
interface = nil
|
72
|
-
if network[:mac_address]
|
73
|
-
found_idx = mac_addresses.find_index(network[:mac_address])
|
74
|
-
# Ignore network if requested MAC address could not be found
|
75
|
-
next if found_idx.nil?
|
76
|
-
interface = interface_names[found_idx]
|
77
|
-
else
|
78
|
-
ifname_by_slot = interface_names_by_slot[network[:interface]-1]
|
79
|
-
# Don't overwrite if interface was already matched via MAC address
|
80
|
-
next if interfaces.include?(ifname_by_slot)
|
81
|
-
interface = ifname_by_slot
|
82
|
-
end
|
83
|
-
|
84
|
-
interfaces.add(interface)
|
85
|
-
network[:device] = interface
|
86
|
-
|
87
|
-
# Remove any previous vagrant configuration in this network
|
88
|
-
# interface's configuration files.
|
89
|
-
machine.communicate.sudo("touch #{network_scripts_dir}/ifcfg-#{interface}")
|
90
|
-
machine.communicate.sudo("sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' #{network_scripts_dir}/ifcfg-#{interface} > /tmp/vagrant-ifcfg-#{interface}")
|
91
|
-
machine.communicate.sudo("cat /tmp/vagrant-ifcfg-#{interface} > #{network_scripts_dir}/ifcfg-#{interface}")
|
92
|
-
machine.communicate.sudo("rm -f /tmp/vagrant-ifcfg-#{interface}")
|
93
|
-
|
94
|
-
# Render and upload the network entry file to a deterministic
|
95
|
-
# temporary location.
|
96
|
-
entry = TemplateRenderer.render("guests/fedora/network_#{network[:type]}",
|
97
|
-
options: network)
|
98
|
-
|
99
|
-
Tempfile.open("vagrant-fedora-configure-networks") do |f|
|
100
|
-
f.binmode
|
101
|
-
f.write(entry)
|
102
|
-
f.fsync
|
103
|
-
f.close
|
104
|
-
machine.communicate.upload(f.path, "/tmp/vagrant-network-entry_#{interface}")
|
105
|
-
end
|
106
|
-
end
|
107
|
-
|
108
|
-
# Bring down all the interfaces we're reconfiguring. By bringing down
|
109
|
-
# each specifically, we avoid reconfiguring p7p (the NAT interface) so
|
110
|
-
# SSH never dies.
|
111
|
-
interfaces.each do |interface|
|
112
|
-
retryable(on: Vagrant::Errors::VagrantError, tries: 3, sleep: 2) do
|
113
|
-
machine.communicate.sudo(<<-SCRIPT, error_check: true)
|
114
|
-
cat /tmp/vagrant-network-entry_#{interface} >> #{network_scripts_dir}/ifcfg-#{interface}
|
115
|
-
|
116
|
-
if command -v nmcli &>/dev/null; then
|
117
|
-
if command -v systemctl &>/dev/null && systemctl -q is-enabled NetworkManager &>/dev/null; then
|
118
|
-
nmcli c reload #{interface}
|
119
|
-
elif command -v service &>/dev/null && service NetworkManager status &>/dev/null; then
|
120
|
-
nmcli c reload #{interface}
|
121
|
-
fi
|
122
|
-
fi
|
123
|
-
|
124
|
-
/sbin/ifdown #{interface}
|
125
|
-
/sbin/ifup #{interface}
|
126
|
-
|
127
|
-
rm -f /tmp/vagrant-network-entry_#{interface}
|
128
|
-
SCRIPT
|
129
|
-
end
|
130
|
-
end
|
131
|
-
end
|
132
|
-
end
|
133
|
-
end
|
134
|
-
end
|
135
|
-
end
|
@@ -1,15 +0,0 @@
|
|
1
|
-
module VagrantPlugins
|
2
|
-
module GuestFedora
|
3
|
-
module Cap
|
4
|
-
class NetworkScriptsDir
|
5
|
-
# The path to the directory with the network configuration scripts.
|
6
|
-
# This is pulled out into its own directory since there are other
|
7
|
-
# operating systems (SUSE) which behave similarly but with a different
|
8
|
-
# path to the network scripts.
|
9
|
-
def self.network_scripts_dir(machine)
|
10
|
-
"/etc/sysconfig/network-scripts"
|
11
|
-
end
|
12
|
-
end
|
13
|
-
end
|
14
|
-
end
|
15
|
-
end
|
@@ -1,16 +0,0 @@
|
|
1
|
-
module VagrantPlugins
|
2
|
-
module GuestFreeBSD
|
3
|
-
module Cap
|
4
|
-
class Halt
|
5
|
-
def self.halt(machine)
|
6
|
-
begin
|
7
|
-
machine.communicate.sudo("shutdown -p now", { shell: "sh" })
|
8
|
-
rescue IOError
|
9
|
-
# Do nothing because SSH connection closed and it probably
|
10
|
-
# means the VM just shut down really fast.
|
11
|
-
end
|
12
|
-
end
|
13
|
-
end
|
14
|
-
end
|
15
|
-
end
|
16
|
-
end
|
@@ -1,34 +0,0 @@
|
|
1
|
-
require "tempfile"
|
2
|
-
|
3
|
-
module VagrantPlugins
|
4
|
-
module GuestFreeBSD
|
5
|
-
module Cap
|
6
|
-
class InsertPublicKey
|
7
|
-
def self.insert_public_key(machine, contents)
|
8
|
-
comm = machine.communicate
|
9
|
-
contents = contents.chomp
|
10
|
-
|
11
|
-
remote_path = "/tmp/vagrant-authorized-keys-#{Time.now.to_i}"
|
12
|
-
Tempfile.open("vagrant-freebsd-insert-public-key") do |f|
|
13
|
-
f.binmode
|
14
|
-
f.write(contents)
|
15
|
-
f.fsync
|
16
|
-
f.close
|
17
|
-
comm.upload(f.path, remote_path)
|
18
|
-
end
|
19
|
-
|
20
|
-
command = <<-EOH.gsub(/^ {12}/, '')
|
21
|
-
mkdir -p ~/.ssh
|
22
|
-
chmod 0700 ~/.ssh
|
23
|
-
cat '#{remote_path}' >> ~/.ssh/authorized_keys
|
24
|
-
chmod 0600 ~/.ssh/authorized_keys
|
25
|
-
|
26
|
-
# Remove the temporary file
|
27
|
-
rm -f '#{remote_path}'
|
28
|
-
EOH
|
29
|
-
comm.execute(command, { shell: "sh" })
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
34
|
-
end
|
@@ -1,24 +0,0 @@
|
|
1
|
-
module VagrantPlugins
|
2
|
-
module GuestFreeBSD
|
3
|
-
module Cap
|
4
|
-
class MountNFSFolder
|
5
|
-
def self.mount_nfs_folder(machine, ip, folders)
|
6
|
-
comm = machine.communicate
|
7
|
-
|
8
|
-
commands = []
|
9
|
-
|
10
|
-
folders.each do |_, opts|
|
11
|
-
if opts[:nfs_version]
|
12
|
-
mount_opts = "-o nfsv#{opts[:nfs_version]}"
|
13
|
-
end
|
14
|
-
|
15
|
-
commands << "mkdir -p '#{opts[:guestpath]}'"
|
16
|
-
commands << "mount -t nfs #{mount_opts} '#{ip}:#{opts[:hostpath]}' '#{opts[:guestpath]}'"
|
17
|
-
end
|
18
|
-
|
19
|
-
comm.sudo(commands.join("\n"), { shell: "sh" })
|
20
|
-
end
|
21
|
-
end
|
22
|
-
end
|
23
|
-
end
|
24
|
-
end
|
@@ -1,21 +0,0 @@
|
|
1
|
-
require "vagrant/util/shell_quote"
|
2
|
-
|
3
|
-
module VagrantPlugins
|
4
|
-
module GuestFreeBSD
|
5
|
-
module Cap
|
6
|
-
class RemovePublicKey
|
7
|
-
def self.remove_public_key(machine, contents)
|
8
|
-
contents = contents.chomp
|
9
|
-
contents = Vagrant::Util::ShellQuote.escape(contents, "'")
|
10
|
-
|
11
|
-
machine.communicate.tap do |comm|
|
12
|
-
if comm.test("test -f ~/.ssh/authorized_keys")
|
13
|
-
comm.execute(
|
14
|
-
"sed -i .bak '/^.*#{contents}.*$/d' ~/.ssh/authorized_keys")
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
@@ -1,17 +0,0 @@
|
|
1
|
-
module VagrantPlugins
|
2
|
-
module GuestFuntoo
|
3
|
-
module Cap
|
4
|
-
class ChangeHostName
|
5
|
-
def self.change_host_name(machine, name)
|
6
|
-
machine.communicate.tap do |comm|
|
7
|
-
if !comm.test("sudo hostname --fqdn | grep '#{name}'")
|
8
|
-
comm.sudo("echo 'hostname=#{name.split('.')[0]}' > /etc/conf.d/hostname")
|
9
|
-
comm.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
|
10
|
-
comm.sudo("hostname #{name.split('.')[0]}")
|
11
|
-
end
|
12
|
-
end
|
13
|
-
end
|
14
|
-
end
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
@@ -1,31 +0,0 @@
|
|
1
|
-
module VagrantPlugins
|
2
|
-
module GuestLinux
|
3
|
-
module Cap
|
4
|
-
class InsertPublicKey
|
5
|
-
def self.insert_public_key(machine, contents)
|
6
|
-
comm = machine.communicate
|
7
|
-
contents = contents.chomp
|
8
|
-
|
9
|
-
remote_path = "/tmp/vagrant-authorized-keys-#{Time.now.to_i}"
|
10
|
-
Tempfile.open("vagrant-linux-insert-public-key") do |f|
|
11
|
-
f.binmode
|
12
|
-
f.write(contents)
|
13
|
-
f.fsync
|
14
|
-
f.close
|
15
|
-
comm.upload(f.path, remote_path)
|
16
|
-
end
|
17
|
-
|
18
|
-
comm.execute <<-EOH.gsub(/^ {12}/, '')
|
19
|
-
mkdir -p ~/.ssh
|
20
|
-
chmod 0700 ~/.ssh
|
21
|
-
cat '#{remote_path}' >> ~/.ssh/authorized_keys
|
22
|
-
chmod 0600 ~/.ssh/authorized_keys
|
23
|
-
|
24
|
-
# Remove the temporary file
|
25
|
-
rm -f '#{remote_path}'
|
26
|
-
EOH
|
27
|
-
end
|
28
|
-
end
|
29
|
-
end
|
30
|
-
end
|
31
|
-
end
|
@@ -1,50 +0,0 @@
|
|
1
|
-
require "vagrant/util/retryable"
|
2
|
-
|
3
|
-
module VagrantPlugins
|
4
|
-
module GuestLinux
|
5
|
-
module Cap
|
6
|
-
class MountNFS
|
7
|
-
extend Vagrant::Util::Retryable
|
8
|
-
|
9
|
-
def self.mount_nfs_folder(machine, ip, folders)
|
10
|
-
comm = machine.communicate
|
11
|
-
|
12
|
-
commands = []
|
13
|
-
|
14
|
-
folders.each do |name, opts|
|
15
|
-
# Expand the guest path so we can handle things like "~/vagrant"
|
16
|
-
expanded_guest_path = machine.guest.capability(
|
17
|
-
:shell_expand_guest_path, opts[:guestpath])
|
18
|
-
|
19
|
-
# Do the actual creating and mounting
|
20
|
-
commands << "mkdir -p '#{expanded_guest_path}'"
|
21
|
-
|
22
|
-
# Mount
|
23
|
-
hostpath = opts[:hostpath].dup
|
24
|
-
hostpath.gsub!("'", "'\\\\''")
|
25
|
-
|
26
|
-
# Figure out any options
|
27
|
-
mount_opts = ["vers=#{opts[:nfs_version]}"]
|
28
|
-
mount_opts << "udp" if opts[:nfs_udp]
|
29
|
-
if opts[:mount_options]
|
30
|
-
mount_opts = opts[:mount_options].dup
|
31
|
-
end
|
32
|
-
|
33
|
-
commands << "mount -o #{mount_opts.join(",")} '#{ip}:#{hostpath}' '#{expanded_guest_path}'"
|
34
|
-
|
35
|
-
# Emit a mount event
|
36
|
-
commands << <<-EOH.gsub(/^ {14}/, '')
|
37
|
-
if command -v /sbin/init && /sbin/init --version | grep upstart; then
|
38
|
-
/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT='#{expanded_guest_path}'
|
39
|
-
fi
|
40
|
-
EOH
|
41
|
-
end
|
42
|
-
|
43
|
-
retryable(on: Vagrant::Errors::LinuxNFSMountFailed, tries: 8, sleep: 3) do
|
44
|
-
comm.sudo(commands.join("\n"), error_class: Vagrant::Errors::LinuxNFSMountFailed)
|
45
|
-
end
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
49
|
-
end
|
50
|
-
end
|