X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppet-dnsmasq%2F0005-puppet-dnsmasq-updates-for-poky-stx.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppet-dnsmasq%2F0005-puppet-dnsmasq-updates-for-poky-stx.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=7383ce2e4ce45d8c6444433bab54b877164e0aab;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-dnsmasq/0005-puppet-dnsmasq-updates-for-poky-stx.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-dnsmasq/0005-puppet-dnsmasq-updates-for-poky-stx.patch
deleted file mode 100644
index 7383ce2..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-dnsmasq/0005-puppet-dnsmasq-updates-for-poky-stx.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/packstack/puppet/modules/dnsmasq/manifests/params.pp b/packstack/puppet/modules/dnsmasq/manifests/params.pp
-index 4d8e70a..b978224 100644
---- a/packstack/puppet/modules/dnsmasq/manifests/params.pp
-+++ b/packstack/puppet/modules/dnsmasq/manifests/params.pp
-@@ -38,7 +38,7 @@ class dnsmasq::params {
- 
-   $process_user = $::operatingsystem ? {
-     /(?i:Debian|Ubuntu|Mint)/ => 'dnsmasq',
--    /(?i:wrlinux)/            => 'root',
-+    /(?i:wrlinux|poky-stx)/       => 'root',
-     default                   => 'nobody',
-   }
- 
-@@ -63,7 +63,7 @@ class dnsmasq::params {
-   }
- 
-   $config_file_init = $::operatingsystem ? {
--    /(?i:Debian|Ubuntu|Mint|wrlinux)/ => '/etc/default/dnsmasq',
-+    /(?i:Debian|Ubuntu|Mint|wrlinux|poky-stx)/ => '/etc/default/dnsmasq',
-     default                   => '/etc/sysconfig/dnsmasq',
-   }
-