Skip to content

Commit a4c95c4

Browse files
committed
Check for pid_file
1 parent 44c651b commit a4c95c4

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

libraries/helpers.rb

-8
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,6 @@ def db_init
256256
mysql_install_db_cmd
257257
end
258258

259-
def db_initialized?
260-
if v80plus
261-
::File.exist? "#{data_dir}/mysql.ibd"
262-
else
263-
::File.exist? "#{data_dir}/mysql/user.frm"
264-
end
265-
end
266-
267259
def mysql_install_db_bin
268260
return "#{base_dir}/scripts/mysql_install_db" if platform_family?('omnios')
269261
return "#{prefix_dir}/bin/mysql_install_db" if platform_family?('smartos')

libraries/mysql_service_base.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ def initialize_database
9191
bash "#{new_resource.name} initial records" do
9292
code init_records_script
9393
umask '022'
94-
returns [0, 1, 2] # facepalm
95-
not_if { db_initialized? }
94+
not_if { ::File.exist?(new_resource.pid_file) }
9695
action :run
9796
end
9897
end

0 commit comments

Comments
 (0)