diff options
| author | Alberto Contreras <alberto.contreras@canonical.com> | 2023-02-10 11:40:47 +0100 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2023-03-04 20:49:40 -0700 |
| commit | 739ec73815072444fcbc98845c5b75ad235865ca (patch) | |
| tree | 0593997973d54c9de5c165d0e68518ce4c727b70 | |
| parent | eeb3c884b5bb1bbac6276415d2b805fa1a9dadd5 (diff) | |
| download | cloud-init-git-739ec73815072444fcbc98845c5b75ad235865ca.tar.gz | |
d/cloud-init.preinst: Oracle to remove network disabling config file
Oracle to remove vestigial /etc/cloud.cloud.cfg.d/99-disable-network-config.cfg
because system config is now honored before datasource config
LP: #1956788
| -rw-r--r-- | debian/cloud-init.preinst | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/debian/cloud-init.preinst b/debian/cloud-init.preinst index 6168aecf..0dcef7c4 100644 --- a/debian/cloud-init.preinst +++ b/debian/cloud-init.preinst @@ -181,6 +181,13 @@ cleanup_lp1552999() { "$hdir/cloud-init-local.service" "$hdir/cloud-init.service" } +cleanup_oci_network_lp1956788() { + # Remove vestigial /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg + # from Oracle now that datasource honors system cfg above datasource cfg. + grep DataSourceOracle /var/lib/cloud/instance/datasource > /dev/null 2>&1 || return 0 + rm -f /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg +} + case "$1" in install|upgrade) if dpkg --compare-versions "$2" le "0.5.11-0ubuntu1"; then @@ -224,6 +231,8 @@ case "$1" in fi cleanup_lp1552999 "$oldver" + cleanup_oci_network_lp1956788 + esac #DEBHELPER# |