X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fstx-puppet%2Fpoky-specific-apply-network-config-script.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fstx-puppet%2Fpoky-specific-apply-network-config-script.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=4cb234445c3400500d0a93031b16fc6252327e03;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/poky-specific-apply-network-config-script.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/poky-specific-apply-network-config-script.patch
deleted file mode 100644
index 4cb2344..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/stx-puppet/poky-specific-apply-network-config-script.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru a/puppet-manifests/src/modules/platform/manifests/network.pp b/puppet-manifests/src/modules/platform/manifests/network.pp
---- a/puppet-manifests/src/modules/platform/manifests/network.pp	2020-04-08 19:10:04.478548420 +0800
-+++ b/puppet-manifests/src/modules/platform/manifests/network.pp	2020-04-08 19:10:22.674548916 +0800
-@@ -208,8 +208,14 @@
-   -> Network_route6 <| |>
-   -> Exec['apply-network-config']
- 
--  exec {'apply-network-config':
--    command => 'apply_network_config.sh',
-+  if($::operatingsystem == 'poky-stx') {
-+    exec {'apply-network-config':
-+      command => 'apply_network_config_poky.sh',
-+    }
-+  } else {
-+    exec {'apply-network-config':
-+      command => 'apply_network_config.sh',
-+    }
-   }
- }
-