BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393629 )
Change subject: Revert "kmod::blacklist: prevent manual install, update
initramfs"
......................................................................
Revert "kmod::blacklist: prevent manual install, update initramfs"
This reverts commit 2c71a7b87bb8d6049f6f4fe85c60710c293e7b02.
Change-Id: Ia7827c94c92b2fd93fc58fd4b235cc7e9c990aa7
---
M modules/kmod/manifests/blacklist.pp
M modules/kmod/templates/blacklist.conf.erb
2 files changed, 0 insertions(+), 2 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/kmod/manifests/blacklist.pp
b/modules/kmod/manifests/blacklist.pp
index 46649f3..f33b1e3 100644
--- a/modules/kmod/manifests/blacklist.pp
+++ b/modules/kmod/manifests/blacklist.pp
@@ -20,6 +20,5 @@
group => 'root',
mode => '0444',
content => template('kmod/blacklist.conf.erb'),
- notify => Exec['update-initramfs'],
}
}
diff --git a/modules/kmod/templates/blacklist.conf.erb
b/modules/kmod/templates/blacklist.conf.erb
index acd86dd..4da3f52 100644
--- a/modules/kmod/templates/blacklist.conf.erb
+++ b/modules/kmod/templates/blacklist.conf.erb
@@ -3,5 +3,4 @@
#
<%- @modules.sort.each do |mod| -%>
blacklist <%= mod %>
-install <%= mod %> /bin/true
<%- end -%>
--
To view, visit https://gerrit.wikimedia.org/r/393629
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7827c94c92b2fd93fc58fd4b235cc7e9c990aa7
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
