Skip to content

Commit e3cb27e

Browse files
mkutsevolfacebook-github-bot
authored andcommitted
Back out "Fix fbkpatch override reference script too early"
Summary: Original commit changeset: 0dce8b171ed8 Original Phabricator Diff: D67226415 Revert b/c the fb_kpatch is opensource. Differential Revision: D67288917 fbshipit-source-id: 4666206a3bb093e51d79cde0c534ff9b1e485326
1 parent f3626a5 commit e3cb27e

File tree

2 files changed

+5
-119
lines changed

2 files changed

+5
-119
lines changed

cookbooks/fb_kpatch/files/default/fbkpatch

Lines changed: 0 additions & 105 deletions
This file was deleted.

cookbooks/fb_kpatch/recipes/default.rb

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
action :upgrade
2828
end
2929

30+
service 'kpatch' do
31+
only_if { node['fb_kpatch']['enable'] }
32+
action [:enable, :start]
33+
end
34+
3035
service 'disable kpatch' do
3136
not_if { node['fb_kpatch']['enable'] }
3237
service_name 'kpatch'
@@ -42,15 +47,6 @@
4247
},
4348
})
4449
end
45-
46-
# Script to log kpatch results to scribe
47-
cookbook_file '/usr/local/bin/fbkpatch' do
48-
source 'fbkpatch'
49-
owner node.root_user
50-
group node.root_group
51-
mode '0755'
52-
end
53-
5450
fb_systemd_override 'fbkpatch' do
5551
unit_name 'kpatch.service'
5652
content({
@@ -61,8 +57,3 @@
6157
},
6258
})
6359
end
64-
65-
service 'kpatch' do
66-
only_if { node['fb_kpatch']['enable'] }
67-
action [:enable, :start]
68-
end

0 commit comments

Comments
 (0)