linux_admin 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fbe8f1b9631bcd133e5d04b63aaca507af5bdb0
-  data.tar.gz: 300558a8c030504cd37672da94040a579da3752c
+  metadata.gz: 240b0baea726bc113ca89c4a78ed25d2f06c9c1f
+  data.tar.gz: 5bcd12e1c68a8064333cdd9011f3865cf89903d7
 SHA512:
-  metadata.gz: 159f8ac175c2581203e01524eca99a4543be7bde8eb7f036e7a9189095ee960f5007ea3b8f3a207a0b4dfc2c2048332642193aec872623ffce96dd8aeba4eca7
-  data.tar.gz: bc77a27bc5abc9d3035de4b00df5da1677f0b7cdec58dcd9f339b3a113f88a295f464efbe93830297eea847481f676093163bedae572f47bb9007f097b652413
+  metadata.gz: f942262c0ae1ca0af9aacb5e086e608315727ded48f98603b0eaf58babca22475cacb4bf9f32011842739dcb0c906540df2a7210965c3086f31e322a6afbd7a9
+  data.tar.gz: 66a172e7922773b836f7fa2642fd0885147522f98ecd7fca9e1b864563f94198d78a514b6c395effe6b4e1b4d0437eaf143f188cc73465cf437cd4e85796ea1e

data/lib/linux_admin/network_interface/network_interface_rh.rb

@@ -45,7 +45,6 @@ module LinuxAdmin
     # @raise ArgumentError if the address is not formatted properly
     def address6=(address)
       validate_ip(address)
-      @interface_config['BOOTPROTO'] = 'static'
       @interface_config['IPV6INIT']  = 'yes'
       @interface_config['DHCPV6C']   = 'no'
       @interface_config['IPV6ADDR']  = address
@@ -162,7 +161,14 @@ module LinuxAdmin
     def save
       old_contents = File.read(@interface_file)
 
-      return false unless stop
+      stop_success = stop
+      # Stop twice because when configure both ipv4 and ipv6 as dhcp, ipv6 dhcp client will
+      # exit and leave a /var/run/dhclient6-eth0.pid file. Then stop (ifdown eth0) will try
+      # to kill this exited process so it returns 1. In the second call, this `.pid' file
+      # has been deleted and ifdown returns 0.
+      # See: https://bugzilla.redhat.com/show_bug.cgi?id=1472396
+      stop_success = stop unless stop_success
+      return false unless stop_success
 
       File.write(@interface_file, @interface_config.delete_blanks.collect { |k, v| "#{k}=#{v}" }.join("\n"))
 

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 module LinuxAdmin
-  VERSION = "0.20.1".freeze
+  VERSION = "0.20.2".freeze
 end

data/spec/network_interface/network_interface_rh_spec.rb

@@ -106,7 +106,6 @@ EOF
       dhcp_interface.address6 = address
       conf = dhcp_interface.interface_config
       expect(conf['IPV6ADDR']).to eq(address)
-      expect(conf['BOOTPROTO']).to eq('static')
       expect(conf['IPV6INIT']).to eq('yes')
       expect(conf['DHCPV6C']).to eq('no')
     end
@@ -241,8 +240,7 @@ EOF
       expect(dhcp_interface).to receive(:save)
       dhcp_interface.apply_static6('d:e:a:d:b:e:e:f', 127, 'd:e:a:d::/64', ['d:e:a:d::'])
       conf = dhcp_interface.interface_config
-      expect(conf).to include('BOOTPROTO' => 'static', 'IPV6INIT' => 'yes', 'DHCPV6C' => 'no',
-                              'IPV6ADDR' => 'd:e:a:d:b:e:e:f/127', 'IPV6_DEFAULTGW' => 'd:e:a:d::/64')
+      expect(conf).to include('IPV6INIT' => 'yes', 'DHCPV6C' => 'no', 'IPV6ADDR' => 'd:e:a:d:b:e:e:f/127', 'IPV6_DEFAULTGW' => 'd:e:a:d::/64')
     end
   end
 
@@ -271,7 +269,7 @@ EOF
 
     it "returns false when the interface cannot be brought down" do
       expect(File).to receive(:read).with(iface_file)
-      expect(dhcp_interface).to receive(:stop).and_return(false)
+      expect(dhcp_interface).to receive(:stop).twice.and_return(false)
       expect(File).not_to receive(:write)
       expect(dhcp_interface.save).to be false
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
 platform: ruby
 authors:
 - Brandon Dunne
@@ -17,10 +17,11 @@ authors:
 - Alon Goldboim
 - Šimon Lukašík
 - Joe VLcek
+- Bo Yao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -195,6 +196,7 @@ email:
 - alongoldboim@gmail.com
 - isimluk@fedoraproject.org
 - jvlcek@redhat.com
+- boyao@redhat.com
 executables: []
 extensions: []
 extra_rdoc_files: []