commit cloud-netconfig for openSUSE:Factory

Hello community, here is the log from the commit of package cloud-netconfig for openSUSE:Factory checked in at 2019-12-02 11:27:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cloud-netconfig (Old) and /work/SRC/openSUSE:Factory/.cloud-netconfig.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cloud-netconfig" Mon Dec 2 11:27:27 2019 rev:9 rq:751653 version:1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/cloud-netconfig/cloud-netconfig.changes 2019-05-22 15:42:10.086427021 +0200 +++ /work/SRC/openSUSE:Factory/.cloud-netconfig.new.4691/cloud-netconfig.changes 2019-12-02 11:29:02.778623849 +0100 @@ -1,0 +2,27 @@ +Thu Nov 28 15:22:49 UTC 2019 - Joachim Gleissner <jgleissner@suse.com> + +- Removed obsolete Group tag from spec file + +------------------------------------------------------------------- +Tue Nov 26 16:31:27 UTC 2019 - Joachim Gleissner <jgleissner@suse.com> + +- Update to version 1.3: + + Fix IPv4 address handling on secondary NICs in Azure + +------------------------------------------------------------------- +Tue Nov 26 08:43:38 UTC 2019 - Joachim Gleissner <jgleissner@suse.com> + +- Update to version 1.2: + + support AWS IMDSv2 token + +------------------------------------------------------------------- +Thu Nov 21 13:19:18 UTC 2019 - Joachim Gleissner <jgleissner@suse.com> + +- Update to version 1.1 + + fix use of GATEWAY variable (bsc#1157117, bsc#1157190) + + remove secondary IPv4 address only when added by cloud-netconfig + (bsc#1144282) + + simplify routing setup for single NIC systems (partly fixes + bsc#1135592) + +------------------------------------------------------------------- Old: ---- cloud-netconfig-1.0.tar.bz2 New: ---- cloud-netconfig-1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cloud-netconfig.spec ++++++ --- /var/tmp/diff_new_pack.LNvqkk/_old 2019-12-02 11:29:03.542623495 +0100 +++ /var/tmp/diff_new_pack.LNvqkk/_new 2019-12-02 11:29:03.550623492 +0100 @@ -1,7 +1,7 @@ # # spec file for package cloud-netconfig # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,12 +33,11 @@ %endif Name: %{base_name}%{flavor_suffix} -Version: 1.0 +Version: 1.3 Release: 0 Summary: Network configuration scripts for %{csp_string} License: GPL-3.0-or-later -Group: System/Management -Url: https://github.com/SUSE-Enceladus/cloud-netconfig +URL: https://github.com/SUSE-Enceladus/cloud-netconfig Source0: %{base_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ cloud-netconfig-1.0.tar.bz2 -> cloud-netconfig-1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/COMMIT_EDITMSG new/cloud-netconfig-1.3/.git/COMMIT_EDITMSG --- old/cloud-netconfig-1.0/.git/COMMIT_EDITMSG 2019-05-15 22:18:31.591315910 +0200 +++ new/cloud-netconfig-1.3/.git/COMMIT_EDITMSG 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -slow API requests down if necessary - -If an instance has many IP addresses (about 40+) repeated requests to the -metadata server may be denied in Azure. This change makes cloud-netconfig slow -down when this situation is detected. [bsc#1135257 bsc#1135263] -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# On branch fix-azure-throttle -# Changes to be committed: -# modified: VERSION -# modified: azure/functions.cloud-netconfig -# modified: cloud-netconfig-azure.spec -# modified: cloud-netconfig-ec2.spec -# modified: cloud-netconfig.spec -# -# Untracked files: -# cloud-netconfig-0.9.tar.bz2 -# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/FETCH_HEAD new/cloud-netconfig-1.3/.git/FETCH_HEAD --- old/cloud-netconfig-1.0/.git/FETCH_HEAD 2019-05-15 22:09:32.234241555 +0200 +++ new/cloud-netconfig-1.3/.git/FETCH_HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -737eef55e55d7dfc91c693d4863c1ac0191d7481 branch 'master' of github.com:SUSE-Enceladus/cloud-netconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/HEAD new/cloud-netconfig-1.3/.git/HEAD --- old/cloud-netconfig-1.0/.git/HEAD 2019-05-15 22:09:54.642451697 +0200 +++ new/cloud-netconfig-1.3/.git/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ref: refs/heads/fix-azure-throttle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/ORIG_HEAD new/cloud-netconfig-1.3/.git/ORIG_HEAD --- old/cloud-netconfig-1.0/.git/ORIG_HEAD 2019-05-15 22:09:32.394243055 +0200 +++ new/cloud-netconfig-1.3/.git/ORIG_HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -737eef55e55d7dfc91c693d4863c1ac0191d7481 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/config new/cloud-netconfig-1.3/.git/config --- old/cloud-netconfig-1.0/.git/config 2018-07-10 18:22:11.169301686 +0200 +++ new/cloud-netconfig-1.3/.git/config 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[remote "origin"] - url = git@github.com:SUSE-Enceladus/cloud-netconfig.git - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/description new/cloud-netconfig-1.3/.git/description --- old/cloud-netconfig-1.0/.git/description 2018-07-10 18:22:09.533288144 +0200 +++ new/cloud-netconfig-1.3/.git/description 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/applypatch-msg.sample new/cloud-netconfig-1.3/.git/hooks/applypatch-msg.sample --- old/cloud-netconfig-1.0/.git/hooks/applypatch-msg.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/applypatch-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message taken by -# applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. The hook is -# allowed to edit the commit message file. -# -# To enable this hook, rename this file to "applypatch-msg". - -. git-sh-setup -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} -: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/commit-msg.sample new/cloud-netconfig-1.3/.git/hooks/commit-msg.sample --- old/cloud-netconfig-1.0/.git/hooks/commit-msg.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message. -# Called by "git commit" with one argument, the name of the file -# that has the commit message. The hook should exit with non-zero -# status after issuing an appropriate message if it wants to stop the -# commit. The hook is allowed to edit the commit message file. -# -# To enable this hook, rename this file to "commit-msg". - -# Uncomment the below to add a Signed-off-by line to the message. -# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -# hook is more suited to it. -# -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" - -# This example catches duplicate Signed-off-by lines. - -test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { - echo >&2 Duplicate Signed-off-by lines. - exit 1 -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/fsmonitor-watchman.sample new/cloud-netconfig-1.3/.git/hooks/fsmonitor-watchman.sample --- old/cloud-netconfig-1.0/.git/hooks/fsmonitor-watchman.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/fsmonitor-watchman.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,114 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; -use IPC::Open2; - -# An example hook script to integrate Watchman -# (https://facebook.github.io/watchman/) with git to speed up detecting -# new and modified files. -# -# The hook is passed a version (currently 1) and a time in nanoseconds -# formatted as a string and outputs to stdout all files that have been -# modified since the given time. Paths must be relative to the root of -# the working tree and separated by a single NUL. -# -# To enable this hook, rename this file to "query-watchman" and set -# 'git config core.fsmonitor .git/hooks/query-watchman' -# -my ($version, $time) = @ARGV; - -# Check the hook interface version - -if ($version == 1) { - # convert nanoseconds to seconds - $time = int $time / 1000000000; -} else { - die "Unsupported query-fsmonitor hook version '$version'.\n" . - "Falling back to scanning...\n"; -} - -my $git_work_tree; -if ($^O =~ 'msys' || $^O =~ 'cygwin') { - $git_work_tree = Win32::GetCwd(); - $git_work_tree =~ tr/\\/\//; -} else { - require Cwd; - $git_work_tree = Cwd::cwd(); -} - -my $retry = 1; - -launch_watchman(); - -sub launch_watchman { - - my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') - or die "open2() failed: $!\n" . - "Falling back to scanning...\n"; - - # In the query expression below we're asking for names of files that - # changed since $time but were not transient (ie created after - # $time but no longer exist). - # - # To accomplish this, we're using the "since" generator to use the - # recency index to select candidate nodes and "fields" to limit the - # output to file names only. Then we're using the "expression" term to - # further constrain the results. - # - # The category of transient files that we want to ignore will have a - # creation clock (cclock) newer than $time_t value and will also not - # currently exist. - - my $query = <<" END"; - ["query", "$git_work_tree", { - "since": $time, - "fields": ["name"], - "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] - }] - END - - print CHLD_IN $query; - close CHLD_IN; - my $response = do {local $/; <CHLD_OUT>}; - - die "Watchman: command returned no output.\n" . - "Falling back to scanning...\n" if $response eq ""; - die "Watchman: command returned invalid output: $response\n" . - "Falling back to scanning...\n" unless $response =~ /^\{/; - - my $json_pkg; - eval { - require JSON::XS; - $json_pkg = "JSON::XS"; - 1; - } or do { - require JSON::PP; - $json_pkg = "JSON::PP"; - }; - - my $o = $json_pkg->new->utf8->decode($response); - - if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { - print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; - $retry--; - qx/watchman watch "$git_work_tree"/; - die "Failed to make watchman watch '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - - # Watchman will always return all files on the first query so - # return the fast "everything is dirty" flag to git and do the - # Watchman query just to get it over with now so we won't pay - # the cost in git to look up each individual file. - print "/\0"; - eval { launch_watchman() }; - exit 0; - } - - die "Watchman: $o->{error}.\n" . - "Falling back to scanning...\n" if $o->{error}; - - binmode STDOUT, ":utf8"; - local $, = "\0"; - print @{$o->{files}}; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/post-update.sample new/cloud-netconfig-1.3/.git/hooks/post-update.sample --- old/cloud-netconfig-1.0/.git/hooks/post-update.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/post-update.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare a packed repository for use over -# dumb transports. -# -# To enable this hook, rename this file to "post-update". - -exec git update-server-info diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/pre-applypatch.sample new/cloud-netconfig-1.3/.git/hooks/pre-applypatch.sample --- old/cloud-netconfig-1.0/.git/hooks/pre-applypatch.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/pre-applypatch.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed -# by applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-applypatch". - -. git-sh-setup -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} -: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/pre-commit.sample new/cloud-netconfig-1.3/.git/hooks/pre-commit.sample --- old/cloud-netconfig-1.0/.git/hooks/pre-commit.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/pre-commit.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=$(git hash-object -t tree /dev/null) -fi - -# If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --bool hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# Cross platform projects tend to avoid non-ASCII filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - cat <<\EOF -Error: Attempt to add a non-ASCII file name. - -This can cause problems if you want to work with people on other platforms. - -To be portable it is advisable to rename the file. - -If you know what you are doing you can disable this check using: - - git config hooks.allownonascii true -EOF - exit 1 -fi - -# If there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/pre-push.sample new/cloud-netconfig-1.3/.git/hooks/pre-push.sample --- old/cloud-netconfig-1.0/.git/hooks/pre-push.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/pre-push.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -#!/bin/sh - -# An example hook script to verify what is about to be pushed. Called by "git -# push" after it has checked the remote status, but before anything has been -# pushed. If this script exits with a non-zero status nothing will be pushed. -# -# This hook is called with the following parameters: -# -# $1 -- Name of the remote to which the push is being done -# $2 -- URL to which the push is being done -# -# If pushing without using a named remote those arguments will be equal. -# -# Information about the commits which are being pushed is supplied as lines to -# the standard input in the form: -# -# <local ref> <local sha1> <remote ref> <remote sha1> -# -# This sample shows how to prevent push of commits where the log message starts -# with "WIP" (work in progress). - -remote="$1" -url="$2" - -z40=0000000000000000000000000000000000000000 - -while read local_ref local_sha remote_ref remote_sha -do - if [ "$local_sha" = $z40 ] - then - # Handle delete - : - else - if [ "$remote_sha" = $z40 ] - then - # New branch, examine all commits - range="$local_sha" - else - # Update to existing branch, examine new commits - range="$remote_sha..$local_sha" - fi - - # Check for WIP commit - commit=`git rev-list -n 1 --grep '^WIP' "$range"` - if [ -n "$commit" ] - then - echo >&2 "Found WIP commit in $local_ref, not pushing" - exit 1 - fi - fi -done - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/pre-rebase.sample new/cloud-netconfig-1.3/.git/hooks/pre-rebase.sample --- old/cloud-netconfig-1.0/.git/hooks/pre-rebase.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/pre-rebase.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,169 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2008 Junio C Hamano -# -# The "pre-rebase" hook is run just before "git rebase" starts doing -# its job, and can prevent the command from running by exiting with -# non-zero status. -# -# The hook is called with the following parameters: -# -# $1 -- the upstream the series was forked from. -# $2 -- the branch being rebased (or empty when rebasing the current branch). -# -# This sample shows how to prevent topic branches that are already -# merged to 'next' branch from getting rebased, because allowing it -# would result in rebasing already published history. - -publish=next -basebranch="$1" -if test "$#" = 2 -then - topic="refs/heads/$2" -else - topic=`git symbolic-ref HEAD` || - exit 0 ;# we do not interrupt rebasing detached HEAD -fi - -case "$topic" in -refs/heads/??/*) - ;; -*) - exit 0 ;# we do not interrupt others. - ;; -esac - -# Now we are dealing with a topic branch being rebased -# on top of master. Is it OK to rebase it? - -# Does the topic really exist? -git show-ref -q "$topic" || { - echo >&2 "No such branch $topic" - exit 1 -} - -# Is topic fully merged to master? -not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -if test -z "$not_in_master" -then - echo >&2 "$topic is fully merged to master; better remove it." - exit 1 ;# we could allow it, but there is no point. -fi - -# Is topic ever merged to next? If so you should not be rebasing it. -only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -only_next_2=`git rev-list ^master ${publish} | sort` -if test "$only_next_1" = "$only_next_2" -then - not_in_topic=`git rev-list "^$topic" master` - if test -z "$not_in_topic" - then - echo >&2 "$topic is already up to date with master" - exit 1 ;# we could allow it, but there is no point. - else - exit 0 - fi -else - not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /usr/bin/perl -e ' - my $topic = $ARGV[0]; - my $msg = "* $topic has commits already merged to public branch:\n"; - my (%not_in_next) = map { - /^([0-9a-f]+) /; - ($1 => 1); - } split(/\n/, $ARGV[1]); - for my $elem (map { - /^([0-9a-f]+) (.*)$/; - [$1 => $2]; - } split(/\n/, $ARGV[2])) { - if (!exists $not_in_next{$elem->[0]}) { - if ($msg) { - print STDERR $msg; - undef $msg; - } - print STDERR " $elem->[1]\n"; - } - } - ' "$topic" "$not_in_next" "$not_in_master" - exit 1 -fi - -<<\DOC_END - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master". - -DOC_END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/pre-receive.sample new/cloud-netconfig-1.3/.git/hooks/pre-receive.sample --- old/cloud-netconfig-1.0/.git/hooks/pre-receive.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/pre-receive.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to make use of push options. -# The example simply echoes all push options that start with 'echoback=' -# and rejects all pushes when the "reject" push option is used. -# -# To enable this hook, rename this file to "pre-receive". - -if test -n "$GIT_PUSH_OPTION_COUNT" -then - i=0 - while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" - do - eval "value=\$GIT_PUSH_OPTION_$i" - case "$value" in - echoback=*) - echo "echo from the pre-receive-hook: ${value#*=}" >&2 - ;; - reject) - exit 1 - esac - i=$((i + 1)) - done -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/prepare-commit-msg.sample new/cloud-netconfig-1.3/.git/hooks/prepare-commit-msg.sample --- old/cloud-netconfig-1.0/.git/hooks/prepare-commit-msg.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/prepare-commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first one removes the -# "# Please enter the commit message..." help message. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -COMMIT_MSG_FILE=$1 -COMMIT_SOURCE=$2 -SHA1=$3 - -/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" - -# case "$COMMIT_SOURCE,$SHA1" in -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; -# *) ;; -# esac - -# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" -# if test -z "$COMMIT_SOURCE" -# then -# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" -# fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/hooks/update.sample new/cloud-netconfig-1.3/.git/hooks/update.sample --- old/cloud-netconfig-1.0/.git/hooks/update.sample 2018-07-10 18:22:09.529288112 +0200 +++ new/cloud-netconfig-1.3/.git/hooks/update.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to block unannotated tags from entering. -# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -# -# To enable this hook, rename this file to "update". -# -# Config -# ------ -# hooks.allowunannotated -# This boolean sets whether unannotated tags will be allowed into the -# repository. By default they won't be. -# hooks.allowdeletetag -# This boolean sets whether deleting tags will be allowed in the -# repository. By default they won't be. -# hooks.allowmodifytag -# This boolean sets whether a tag may be modified after creation. By default -# it won't be. -# hooks.allowdeletebranch -# This boolean sets whether deleting branches will be allowed in the -# repository. By default they won't be. -# hooks.denycreatebranch -# This boolean sets whether remotely creating branches will be denied -# in the repository. By default this is allowed. -# - -# --- Command line -refname="$1" -oldrev="$2" -newrev="$3" - -# --- Safety check -if [ -z "$GIT_DIR" ]; then - echo "Don't run this script from the command line." >&2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 <ref> <oldrev> <newrev>)" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "usage: $0 <ref> <oldrev> <newrev>" >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --bool hooks.allowunannotated) -allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -denycreatebranch=$(git config --bool hooks.denycreatebranch) -allowdeletetag=$(git config --bool hooks.allowdeletetag) -allowmodifytag=$(git config --bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero="0000000000000000000000000000000000000000" -if [ "$newrev" = "$zero" ]; then - newrev_type=delete -else - newrev_type=$(git cat-file -t $newrev) -fi - -case "$refname","$newrev_type" in - refs/tags/*,commit) - # un-annotated tag - short_refname=${refname##refs/tags/} - if [ "$allowunannotated" != "true" ]; then - echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0 Binary files old/cloud-netconfig-1.0/.git/index and new/cloud-netconfig-1.3/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/info/exclude new/cloud-netconfig-1.3/.git/info/exclude --- old/cloud-netconfig-1.0/.git/info/exclude 2018-07-10 18:22:09.533288144 +0200 +++ new/cloud-netconfig-1.3/.git/info/exclude 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/HEAD new/cloud-netconfig-1.3/.git/logs/HEAD --- old/cloud-netconfig-1.0/.git/logs/HEAD 2019-05-15 22:18:34.671345031 +0200 +++ new/cloud-netconfig-1.3/.git/logs/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -0000000000000000000000000000000000000000 e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 Joachim Gleissner <jgleissner@suse.com> 1531239731 +0200 clone: from git@github.com:SUSE-Enceladus/cloud-netconfig.git -e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 Joachim Gleissner <jgleissner@suse.com> 1545065645 +0100 checkout: moving from master to timeout-fix -e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 796f9018f2db0d79a3c82355241d9316cb4ad9cb Joachim Gleissner <jgleissner@suse.com> 1545069164 +0100 commit: reduce timeout on metadata read (bsc#1112822) -796f9018f2db0d79a3c82355241d9316cb4ad9cb e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 Joachim Gleissner <jgleissner@suse.com> 1548779137 +0100 checkout: moving from timeout-fix to master -e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 2f1207e6cea5f7f0b14dab0982d39425437ec099 Joachim Gleissner <jgleissner@suse.com> 1548779143 +0100 pull --rebase: Fast-forward -2f1207e6cea5f7f0b14dab0982d39425437ec099 2f1207e6cea5f7f0b14dab0982d39425437ec099 Joachim Gleissner <jgleissner@suse.com> 1548781615 +0100 checkout: moving from master to fixes -2f1207e6cea5f7f0b14dab0982d39425437ec099 4b83c00df18f23c88ae32e1f642a6b4a44efbcd6 Joachim Gleissner <jgleissner@suse.com> 1548854431 +0100 commit: ec2: fix search-and-replace accident -4b83c00df18f23c88ae32e1f642a6b4a44efbcd6 d43a993fe138431f16ee2a62a5e450551a4b1420 Joachim Gleissner <jgleissner@suse.com> 1548862579 +0100 commit: do not treat eth0 special wrt routing policies (bsc#1123008) -d43a993fe138431f16ee2a62a5e450551a4b1420 c706e96b9c508b7df831ed7d5c41e689372d357e Joachim Gleissner <jgleissner@suse.com> 1548863506 +0100 commit: run cloud-netconfig periodically (bsc#1118783 bsc#1122013) -c706e96b9c508b7df831ed7d5c41e689372d357e 2f1207e6cea5f7f0b14dab0982d39425437ec099 Joachim Gleissner <jgleissner@suse.com> 1548940283 +0100 checkout: moving from fixes to master -2f1207e6cea5f7f0b14dab0982d39425437ec099 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner@suse.com> 1548940287 +0100 pull --rebase: Fast-forward -737eef55e55d7dfc91c693d4863c1ac0191d7481 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner@suse.com> 1548940329 +0100 reset: moving to HEAD -737eef55e55d7dfc91c693d4863c1ac0191d7481 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner@suse.com> 1557950956 +0100 reset: moving to HEAD -737eef55e55d7dfc91c693d4863c1ac0191d7481 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner@suse.com> 1557950994 +0100 checkout: moving from master to fix-azure-throttle -737eef55e55d7dfc91c693d4863c1ac0191d7481 ef84f3b5b4c1383fb8850bdb33f20f155616e9d9 Joachim Gleissner <jgleissner@suse.com> 1557951273 +0100 commit: slow API requests down if necessary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/heads/fix-azure-throttle new/cloud-netconfig-1.3/.git/logs/refs/heads/fix-azure-throttle --- old/cloud-netconfig-1.0/.git/logs/refs/heads/fix-azure-throttle 2019-05-15 22:18:34.671345031 +0200 +++ new/cloud-netconfig-1.3/.git/logs/refs/heads/fix-azure-throttle 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner@suse.com> 1557950994 +0100 branch: Created from HEAD -737eef55e55d7dfc91c693d4863c1ac0191d7481 ef84f3b5b4c1383fb8850bdb33f20f155616e9d9 Joachim Gleissner <jgleissner@suse.com> 1557951273 +0100 commit: slow API requests down if necessary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/heads/fixes new/cloud-netconfig-1.3/.git/logs/refs/heads/fixes --- old/cloud-netconfig-1.0/.git/logs/refs/heads/fixes 2019-01-30 16:53:13.518767715 +0100 +++ new/cloud-netconfig-1.3/.git/logs/refs/heads/fixes 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 2f1207e6cea5f7f0b14dab0982d39425437ec099 Joachim Gleissner <jgleissner@suse.com> 1548781615 +0100 branch: Created from HEAD -2f1207e6cea5f7f0b14dab0982d39425437ec099 4b83c00df18f23c88ae32e1f642a6b4a44efbcd6 Joachim Gleissner <jgleissner@suse.com> 1548854431 +0100 commit: ec2: fix search-and-replace accident -4b83c00df18f23c88ae32e1f642a6b4a44efbcd6 d43a993fe138431f16ee2a62a5e450551a4b1420 Joachim Gleissner <jgleissner@suse.com> 1548862579 +0100 commit: do not treat eth0 special wrt routing policies (bsc#1123008) -d43a993fe138431f16ee2a62a5e450551a4b1420 c706e96b9c508b7df831ed7d5c41e689372d357e Joachim Gleissner <jgleissner@suse.com> 1548863506 +0100 commit: run cloud-netconfig periodically (bsc#1118783 bsc#1122013) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/heads/master new/cloud-netconfig-1.3/.git/logs/refs/heads/master --- old/cloud-netconfig-1.0/.git/logs/refs/heads/master 2019-01-31 14:11:27.891295667 +0100 +++ new/cloud-netconfig-1.3/.git/logs/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 Joachim Gleissner <jgleissner@suse.com> 1531239731 +0200 clone: from git@github.com:SUSE-Enceladus/cloud-netconfig.git -e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 2f1207e6cea5f7f0b14dab0982d39425437ec099 Joachim Gleissner <jgleissner@suse.com> 1548779143 +0100 pull --rebase: Fast-forward -2f1207e6cea5f7f0b14dab0982d39425437ec099 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner@suse.com> 1548940287 +0100 pull --rebase: Fast-forward diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/heads/timeout-fix new/cloud-netconfig-1.3/.git/logs/refs/heads/timeout-fix --- old/cloud-netconfig-1.0/.git/logs/refs/heads/timeout-fix 2018-12-17 18:55:31.043403154 +0100 +++ new/cloud-netconfig-1.3/.git/logs/refs/heads/timeout-fix 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 Joachim Gleissner <jgleissner@suse.com> 1545065645 +0100 branch: Created from HEAD -e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 796f9018f2db0d79a3c82355241d9316cb4ad9cb Joachim Gleissner <jgleissner@suse.com> 1545069164 +0100 commit: reduce timeout on metadata read (bsc#1112822) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/HEAD new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/HEAD --- old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/HEAD 2018-07-10 18:22:11.165301652 +0200 +++ new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 Joachim Gleissner <jgleissner@suse.com> 1531239731 +0200 clone: from git@github.com:SUSE-Enceladus/cloud-netconfig.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/fix-azure-throttle new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/fix-azure-throttle --- old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/fix-azure-throttle 2019-05-15 22:19:00.291587328 +0200 +++ new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/fix-azure-throttle 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 ef84f3b5b4c1383fb8850bdb33f20f155616e9d9 Joachim Gleissner <jgleissner@suse.com> 1557951540 +0100 update by push diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/fixes new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/fixes --- old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/fixes 2019-01-30 16:53:22.570830496 +0100 +++ new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/fixes 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 c706e96b9c508b7df831ed7d5c41e689372d357e Joachim Gleissner <jgleissner@suse.com> 1548863602 +0100 update by push diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/master new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/master --- old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/master 2019-01-31 14:11:27.867295451 +0100 +++ new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/master 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 2f1207e6cea5f7f0b14dab0982d39425437ec099 Joachim Gleissner <jgleissner@suse.com> 1548779143 +0100 pull --rebase: fast-forward -2f1207e6cea5f7f0b14dab0982d39425437ec099 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner@suse.com> 1548940287 +0100 pull --rebase: fast-forward diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/timeout-fix new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/timeout-fix --- old/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/timeout-fix 2018-12-17 18:55:48.847561483 +0100 +++ new/cloud-netconfig-1.3/.git/logs/refs/remotes/origin/timeout-fix 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 796f9018f2db0d79a3c82355241d9316cb4ad9cb Joachim Gleissner <jgleissner@suse.com> 1545069348 +0100 update by push diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/objects/04/6cc9365ec9653588d97831e6a5dd9a8827cda1 new/cloud-netconfig-1.3/.git/objects/04/6cc9365ec9653588d97831e6a5dd9a8827cda1 --- old/cloud-netconfig-1.0/.git/objects/04/6cc9365ec9653588d97831e6a5dd9a8827cda1 2019-01-30 16:51:33.330076410 +0100 +++ new/cloud-netconfig-1.3/.git/objects/04/6cc9365ec9653588d97831e6a5dd9a8827cda1 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -x
eÍ1Â0@QfŸ"[§( ±fƒ„NU‡Ä54R±£ÄAp{ã_ÞO›$s8îwÓÈYg8Qڋfa?–%*Ü€/–IQøšo&ö0ªŒ4ÃåUÈS[Eáü$«zëRf—b[E3žöÉcïrÿxSÁ4\ \ No newline at end of file Binary files old/cloud-netconfig-1.0/.git/objects/07/1f4b5f79e241938292e093ba0c10fbcba40ada and new/cloud-netconfig-1.3/.git/objects/07/1f4b5f79e241938292e093ba0c10fbcba40ada differ Binary files old/cloud-netconfig-1.0/.git/objects/12/c36215c1a207f5f65f645e6d5377e2d24707da and new/cloud-netconfig-1.3/.git/objects/12/c36215c1a207f5f65f645e6d5377e2d24707da differ Binary files old/cloud-netconfig-1.0/.git/objects/13/b39fb65834123021738237b8fc4d708112620a and new/cloud-netconfig-1.3/.git/objects/13/b39fb65834123021738237b8fc4d708112620a differ Binary files old/cloud-netconfig-1.0/.git/objects/1c/fb47615b0cf98cacdb6275b3241f8ca43e5cca and new/cloud-netconfig-1.3/.git/objects/1c/fb47615b0cf98cacdb6275b3241f8ca43e5cca differ Binary files old/cloud-netconfig-1.0/.git/objects/2f/1207e6cea5f7f0b14dab0982d39425437ec099 and new/cloud-netconfig-1.3/.git/objects/2f/1207e6cea5f7f0b14dab0982d39425437ec099 differ Binary files old/cloud-netconfig-1.0/.git/objects/3e/339cd857644a997adabd21cd657996fc85dc7d and new/cloud-netconfig-1.3/.git/objects/3e/339cd857644a997adabd21cd657996fc85dc7d differ Binary files old/cloud-netconfig-1.0/.git/objects/48/40019d6ffabbcb9042f28dfef38067d0a308f8 and new/cloud-netconfig-1.3/.git/objects/48/40019d6ffabbcb9042f28dfef38067d0a308f8 differ Binary files old/cloud-netconfig-1.0/.git/objects/49/6a942a8d96bac29c93815998acbce1f6c2fd25 and new/cloud-netconfig-1.3/.git/objects/49/6a942a8d96bac29c93815998acbce1f6c2fd25 differ Binary files old/cloud-netconfig-1.0/.git/objects/4a/dd01ba4a5e729e023d967d743c180b9fae8b6e and new/cloud-netconfig-1.3/.git/objects/4a/dd01ba4a5e729e023d967d743c180b9fae8b6e differ Binary files old/cloud-netconfig-1.0/.git/objects/4b/83c00df18f23c88ae32e1f642a6b4a44efbcd6 and new/cloud-netconfig-1.3/.git/objects/4b/83c00df18f23c88ae32e1f642a6b4a44efbcd6 differ Binary files old/cloud-netconfig-1.0/.git/objects/4b/e816e55e0b2e0f4a1a859b37ef754ce7bba79d and new/cloud-netconfig-1.3/.git/objects/4b/e816e55e0b2e0f4a1a859b37ef754ce7bba79d differ Binary files old/cloud-netconfig-1.0/.git/objects/4d/a1372a5345b2bcb0c963251cc1c16004503ff0 and new/cloud-netconfig-1.3/.git/objects/4d/a1372a5345b2bcb0c963251cc1c16004503ff0 differ Binary files old/cloud-netconfig-1.0/.git/objects/5c/56f1f9a7efce40caf157485791ac27dabb4a5a and new/cloud-netconfig-1.3/.git/objects/5c/56f1f9a7efce40caf157485791ac27dabb4a5a differ Binary files old/cloud-netconfig-1.0/.git/objects/60/f86a550f51231ff1265ca4d2e0eff1d594da49 and new/cloud-netconfig-1.3/.git/objects/60/f86a550f51231ff1265ca4d2e0eff1d594da49 differ Binary files old/cloud-netconfig-1.0/.git/objects/6d/94b3ff49c6123eb07f45e74a7d5ff21e1af71a and new/cloud-netconfig-1.3/.git/objects/6d/94b3ff49c6123eb07f45e74a7d5ff21e1af71a differ Binary files old/cloud-netconfig-1.0/.git/objects/70/11b267c7f77f50c531103e1b331d6d8d330d24 and new/cloud-netconfig-1.3/.git/objects/70/11b267c7f77f50c531103e1b331d6d8d330d24 differ Binary files old/cloud-netconfig-1.0/.git/objects/73/7eef55e55d7dfc91c693d4863c1ac0191d7481 and new/cloud-netconfig-1.3/.git/objects/73/7eef55e55d7dfc91c693d4863c1ac0191d7481 differ Binary files old/cloud-netconfig-1.0/.git/objects/79/6f9018f2db0d79a3c82355241d9316cb4ad9cb and new/cloud-netconfig-1.3/.git/objects/79/6f9018f2db0d79a3c82355241d9316cb4ad9cb differ Binary files old/cloud-netconfig-1.0/.git/objects/7c/04573ce239e4de2f37db3b00307cc2268605eb and new/cloud-netconfig-1.3/.git/objects/7c/04573ce239e4de2f37db3b00307cc2268605eb differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/objects/7e/34485e7d3874dbbec8b73c601654cc7087323d new/cloud-netconfig-1.3/.git/objects/7e/34485e7d3874dbbec8b73c601654cc7087323d --- old/cloud-netconfig-1.0/.git/objects/7e/34485e7d3874dbbec8b73c601654cc7087323d 2019-01-30 16:51:33.330076410 +0100 +++ new/cloud-netconfig-1.3/.git/objects/7e/34485e7d3874dbbec8b73c601654cc7087323d 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -x
=Œ± -Â0@ï+ú -Á9ƒÅÅIAÅ!dH/g9Hï$¹ -ý{ÛÅñ=xo(:tîèvá)lÎÔ°òÇXÅßš²fÆTÊÒÕY:,:眐¡Ê›G€ðà‰j„«ôªv'ônbYq›ÐøK á"ÍÖW„W£Ü/Þ¶Œ,Ց~ I1Ï \ No newline at end of file Binary files old/cloud-netconfig-1.0/.git/objects/82/86b36a8d28cf6d56101cd418a5bf5af40125c3 and new/cloud-netconfig-1.3/.git/objects/82/86b36a8d28cf6d56101cd418a5bf5af40125c3 differ Binary files old/cloud-netconfig-1.0/.git/objects/89/a5a3b338143dd9ac70691d8dd482c5e4060dd2 and new/cloud-netconfig-1.3/.git/objects/89/a5a3b338143dd9ac70691d8dd482c5e4060dd2 differ Binary files old/cloud-netconfig-1.0/.git/objects/8e/000346ea1962f51c5a5ca7bce3d3786e9b4157 and new/cloud-netconfig-1.3/.git/objects/8e/000346ea1962f51c5a5ca7bce3d3786e9b4157 differ Binary files old/cloud-netconfig-1.0/.git/objects/97/d11cb66ab2c429a8202573fe7ef3bf66321798 and new/cloud-netconfig-1.3/.git/objects/97/d11cb66ab2c429a8202573fe7ef3bf66321798 differ Binary files old/cloud-netconfig-1.0/.git/objects/a2/c0140c77324435d782eaab908478462ad12456 and new/cloud-netconfig-1.3/.git/objects/a2/c0140c77324435d782eaab908478462ad12456 differ Binary files old/cloud-netconfig-1.0/.git/objects/ae/c258df73d39d2122706793921981f4a0f672f8 and new/cloud-netconfig-1.3/.git/objects/ae/c258df73d39d2122706793921981f4a0f672f8 differ Binary files old/cloud-netconfig-1.0/.git/objects/b6/3ba696b7a7e4d89fa1517b02bfdccb2f1a10e1 and new/cloud-netconfig-1.3/.git/objects/b6/3ba696b7a7e4d89fa1517b02bfdccb2f1a10e1 differ Binary files old/cloud-netconfig-1.0/.git/objects/c2/b4feaffc8bf22017302d294c1edaa93396c34c and new/cloud-netconfig-1.3/.git/objects/c2/b4feaffc8bf22017302d294c1edaa93396c34c differ Binary files old/cloud-netconfig-1.0/.git/objects/c5/061e53e3c111670cfbb0950d292c3a92a2896c and new/cloud-netconfig-1.3/.git/objects/c5/061e53e3c111670cfbb0950d292c3a92a2896c differ Binary files old/cloud-netconfig-1.0/.git/objects/c7/06e96b9c508b7df831ed7d5c41e689372d357e and new/cloud-netconfig-1.3/.git/objects/c7/06e96b9c508b7df831ed7d5c41e689372d357e differ Binary files old/cloud-netconfig-1.0/.git/objects/d1/fe500e9088901e6f954daf0815cc080ba386c7 and new/cloud-netconfig-1.3/.git/objects/d1/fe500e9088901e6f954daf0815cc080ba386c7 differ Binary files old/cloud-netconfig-1.0/.git/objects/d3/827e75a5cadb9fe4a27e1cb9b6d192e7323120 and new/cloud-netconfig-1.3/.git/objects/d3/827e75a5cadb9fe4a27e1cb9b6d192e7323120 differ Binary files old/cloud-netconfig-1.0/.git/objects/d4/3a993fe138431f16ee2a62a5e450551a4b1420 and new/cloud-netconfig-1.3/.git/objects/d4/3a993fe138431f16ee2a62a5e450551a4b1420 differ Binary files old/cloud-netconfig-1.0/.git/objects/e5/542e464447d1beb5b6cf426eb8c2247c6e0ab1 and new/cloud-netconfig-1.3/.git/objects/e5/542e464447d1beb5b6cf426eb8c2247c6e0ab1 differ Binary files old/cloud-netconfig-1.0/.git/objects/eb/606f2ee5e19f79c366d1fa47cfe4abae4f33b0 and new/cloud-netconfig-1.3/.git/objects/eb/606f2ee5e19f79c366d1fa47cfe4abae4f33b0 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/objects/ef/84f3b5b4c1383fb8850bdb33f20f155616e9d9 new/cloud-netconfig-1.3/.git/objects/ef/84f3b5b4c1383fb8850bdb33f20f155616e9d9 --- old/cloud-netconfig-1.0/.git/objects/ef/84f3b5b4c1383fb8850bdb33f20f155616e9d9 2019-05-15 22:18:34.671345031 +0200 +++ new/cloud-netconfig-1.3/.git/objects/ef/84f3b5b4c1383fb8850bdb33f20f155616e9d9 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -x
RËnÛ0ì™_±@/-Œ8’%ê
4EåGmÙ±l§Ií€è"ז‹tDʯ¯/“¢COÝÓb03˜Á.WUUÝð©ÁgB8nÎ|F1ìÄèt<¡}»‘“Çk†Q Ù±¥z!âšR€T„bÍc—±'ü(°|Æ7v­6r kL¡j+Ƌ²‚áK­%Öðáqókÿ€m®ªàRÆÔí„Ž×qˆEmPcÿm±Ùmt¹‹—é†ióៀÃ,¹œ»Œâ”£ttœ€Ÿ.ÓÅb9Rc~Žö×éˆ>GÓD_ŠÁ\µhnwœUvt>œUB?,·gÞ¡[ü©{«l{]eû|‘Lz7©Zô>ûåì”Óû‡du0žîLњ™ô1j‡È.c?ÓŸæ“€?~)5}¯ŽÞxsEàêÄ'}ò³É ëÿ«Ñ[u€džBÏ j£Ašƒ„r 9jÍê!é˜Å€6Lr„‚iš˜<A:ûµ¥¡†w,W
ßiœ·f;dÅW£ÀH*4L0Ã@cœ·WªØ r²ŽìRBrnjlÃmQjà“Žœ'kÏ·ª WrmïóœŒf=(­¹èÒ4̔Êfµ=Ð ·Úð-×ü­ëzŽCCøœÞwòQæ\ \ No newline at end of file Binary files old/cloud-netconfig-1.0/.git/objects/ef/8c805970ea806cf5bcfe83836bf6df497185bc and new/cloud-netconfig-1.3/.git/objects/ef/8c805970ea806cf5bcfe83836bf6df497185bc differ Binary files old/cloud-netconfig-1.0/.git/objects/f3/0b99c472500392a2f3968b8d180291a2f3ce03 and new/cloud-netconfig-1.3/.git/objects/f3/0b99c472500392a2f3968b8d180291a2f3ce03 differ Binary files old/cloud-netconfig-1.0/.git/objects/f3/c5fc104902b88e088d404eeba1766e265839e7 and new/cloud-netconfig-1.3/.git/objects/f3/c5fc104902b88e088d404eeba1766e265839e7 differ Binary files old/cloud-netconfig-1.0/.git/objects/pack/pack-ec8edb97d66920a48612f9b67aaa17c4d6ad40f3.idx and new/cloud-netconfig-1.3/.git/objects/pack/pack-ec8edb97d66920a48612f9b67aaa17c4d6ad40f3.idx differ Binary files old/cloud-netconfig-1.0/.git/objects/pack/pack-ec8edb97d66920a48612f9b67aaa17c4d6ad40f3.pack and new/cloud-netconfig-1.3/.git/objects/pack/pack-ec8edb97d66920a48612f9b67aaa17c4d6ad40f3.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/packed-refs new/cloud-netconfig-1.3/.git/packed-refs --- old/cloud-netconfig-1.0/.git/packed-refs 2018-07-10 18:22:11.165301652 +0200 +++ new/cloud-netconfig-1.3/.git/packed-refs 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -e0616bb9d8f7935e02c23b8a9b462c9a08ae3bf5 refs/remotes/origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/heads/fix-azure-throttle new/cloud-netconfig-1.3/.git/refs/heads/fix-azure-throttle --- old/cloud-netconfig-1.0/.git/refs/heads/fix-azure-throttle 2019-05-15 22:18:34.671345031 +0200 +++ new/cloud-netconfig-1.3/.git/refs/heads/fix-azure-throttle 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ef84f3b5b4c1383fb8850bdb33f20f155616e9d9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/heads/fixes new/cloud-netconfig-1.3/.git/refs/heads/fixes --- old/cloud-netconfig-1.0/.git/refs/heads/fixes 2019-01-30 16:53:13.518767715 +0100 +++ new/cloud-netconfig-1.3/.git/refs/heads/fixes 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -c706e96b9c508b7df831ed7d5c41e689372d357e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/heads/master new/cloud-netconfig-1.3/.git/refs/heads/master --- old/cloud-netconfig-1.0/.git/refs/heads/master 2019-01-31 14:11:27.891295667 +0100 +++ new/cloud-netconfig-1.3/.git/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -737eef55e55d7dfc91c693d4863c1ac0191d7481 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/heads/timeout-fix new/cloud-netconfig-1.3/.git/refs/heads/timeout-fix --- old/cloud-netconfig-1.0/.git/refs/heads/timeout-fix 2018-12-17 18:55:31.043403154 +0100 +++ new/cloud-netconfig-1.3/.git/refs/heads/timeout-fix 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -796f9018f2db0d79a3c82355241d9316cb4ad9cb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/remotes/origin/HEAD new/cloud-netconfig-1.3/.git/refs/remotes/origin/HEAD --- old/cloud-netconfig-1.0/.git/refs/remotes/origin/HEAD 2018-07-10 18:22:11.165301652 +0200 +++ new/cloud-netconfig-1.3/.git/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/remotes/origin/fix-azure-throttle new/cloud-netconfig-1.3/.git/refs/remotes/origin/fix-azure-throttle --- old/cloud-netconfig-1.0/.git/refs/remotes/origin/fix-azure-throttle 2019-05-15 22:19:00.291587328 +0200 +++ new/cloud-netconfig-1.3/.git/refs/remotes/origin/fix-azure-throttle 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ef84f3b5b4c1383fb8850bdb33f20f155616e9d9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/remotes/origin/fixes new/cloud-netconfig-1.3/.git/refs/remotes/origin/fixes --- old/cloud-netconfig-1.0/.git/refs/remotes/origin/fixes 2019-01-30 16:53:22.570830496 +0100 +++ new/cloud-netconfig-1.3/.git/refs/remotes/origin/fixes 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -c706e96b9c508b7df831ed7d5c41e689372d357e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/remotes/origin/master new/cloud-netconfig-1.3/.git/refs/remotes/origin/master --- old/cloud-netconfig-1.0/.git/refs/remotes/origin/master 2019-01-31 14:11:27.867295451 +0100 +++ new/cloud-netconfig-1.3/.git/refs/remotes/origin/master 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -737eef55e55d7dfc91c693d4863c1ac0191d7481 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/.git/refs/remotes/origin/timeout-fix new/cloud-netconfig-1.3/.git/refs/remotes/origin/timeout-fix --- old/cloud-netconfig-1.0/.git/refs/remotes/origin/timeout-fix 2018-12-17 18:55:48.847561483 +0100 +++ new/cloud-netconfig-1.3/.git/refs/remotes/origin/timeout-fix 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -796f9018f2db0d79a3c82355241d9316cb4ad9cb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/Makefile new/cloud-netconfig-1.3/Makefile --- old/cloud-netconfig-1.0/Makefile 2019-01-31 14:11:27.887295630 +0100 +++ new/cloud-netconfig-1.3/Makefile 2019-11-26 17:29:23.506433126 +0100 @@ -56,6 +56,7 @@ --warning=no-file-changed \ --exclude cloud-netconfig-$(verSrc)/cloud-netconfig-$(verSrc) \ --exclude cloud-netconfig-$(verSrc)/cloud-netconfig-$(verSrc).tar.bz2 \ + --exclude .git \ cloud-netconfig-$(verSrc) @rm -f cloud-netconfig-$(verSrc) @ls -l cloud-netconfig-$(verSrc).tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/VERSION new/cloud-netconfig-1.3/VERSION --- old/cloud-netconfig-1.0/VERSION 2019-05-15 22:13:24.984426821 +0200 +++ new/cloud-netconfig-1.3/VERSION 2019-11-26 17:28:15.794079567 +0100 @@ -1 +1 @@ -1.0 +1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/azure/functions.cloud-netconfig new/cloud-netconfig-1.3/azure/functions.cloud-netconfig --- old/cloud-netconfig-1.0/azure/functions.cloud-netconfig 2019-05-15 22:10:36.470844110 +0200 +++ new/cloud-netconfig-1.3/azure/functions.cloud-netconfig 2019-11-26 17:28:15.794079567 +0100 @@ -67,7 +67,7 @@ for idx in `get_from_metadata "${if_idx}/ipv4/ipAddress"` ; do [[ $count -ge 1 ]] && echo -n " " - get_from_metadata "${if_idx}/ipv4/ipAddress/${idx}/privateIpAddress" + get_from_metadata "${if_idx}/ipv4/ipAddress/${idx}privateIpAddress" echo -n "/" get_from_metadata "${if_idx}/ipv4/subnet/0/prefix" count=$((count+1)) @@ -85,9 +85,9 @@ local oldopt=$(shopt -p nocasematch) shopt -s nocasematch get_from_metadata | \ - while read idx || [[ -n "$idx" ]] ; do - if [[ "$(get_iface_mac $idx)" == "${hwaddr//:/}" ]]; then - get_ipv4_addresses_by_index $idx + for idx in $(get_from_metadata) ; do + if [[ "$(get_iface_mac ${idx%/*})" == "${hwaddr//:/}" ]]; then + get_ipv4_addresses_by_index ${idx%/*} fi done eval "$oldopt" Binary files old/cloud-netconfig-1.0/cloud-netconfig-0.9.tar.bz2 and new/cloud-netconfig-1.3/cloud-netconfig-0.9.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/cloud-netconfig-azure.spec new/cloud-netconfig-1.3/cloud-netconfig-azure.spec --- old/cloud-netconfig-1.0/cloud-netconfig-azure.spec 2019-05-15 22:13:48.776650510 +0200 +++ new/cloud-netconfig-1.3/cloud-netconfig-azure.spec 2019-11-26 17:28:15.794079567 +0100 @@ -18,7 +18,7 @@ %define base_name cloud-netconfig Name: %{base_name}-azure -Version: 1.0 +Version: 1.3 Release: 0 License: GPL-3.0+ Summary: Network configuration scripts for Microsoft Azure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/cloud-netconfig-ec2.spec new/cloud-netconfig-1.3/cloud-netconfig-ec2.spec --- old/cloud-netconfig-1.0/cloud-netconfig-ec2.spec 2019-05-15 22:13:53.952699180 +0200 +++ new/cloud-netconfig-1.3/cloud-netconfig-ec2.spec 2019-11-26 17:28:15.794079567 +0100 @@ -18,7 +18,7 @@ %define base_name cloud-netconfig Name: %{base_name}-ec2 -Version: 1.0 +Version: 1.3 Release: 0 License: GPL-3.0+ Summary: Network configuration scripts for Amazon EC2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/cloud-netconfig.spec new/cloud-netconfig-1.3/cloud-netconfig.spec --- old/cloud-netconfig-1.0/cloud-netconfig.spec 2019-05-15 22:14:00.660762259 +0200 +++ new/cloud-netconfig-1.3/cloud-netconfig.spec 2019-11-26 17:28:15.794079567 +0100 @@ -32,7 +32,7 @@ %endif Name: %{base_name}%{flavor_suffix} -Version: 1.0 +Version: 1.3 Release: 0 License: GPL-3.0+ Summary: Network configuration scripts for %{csp_string} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/common/cloud-netconfig new/cloud-netconfig-1.3/common/cloud-netconfig --- old/cloud-netconfig-1.0/common/cloud-netconfig 2019-01-31 14:11:27.891295667 +0100 +++ new/cloud-netconfig-1.3/common/cloud-netconfig 2019-11-21 14:12:18.156387464 +0100 @@ -27,6 +27,7 @@ . "$r/etc/sysconfig/network/scripts/functions.cloud-netconfig" STATEDIR=/var/run/netconfig +ADDRDIR=/var/run/netconfig/cloud # ------------------------------------------------------------------- # return all IPv4 addresses currently configured on given interface @@ -77,6 +78,21 @@ } # ------------------------------------------------------------------- +# check wether $2 is an element of array $1 +# +is_element() +{ + local array=(${!1}) item=${2} + local elem + for elem in ${array[@]} ; do + if [[ $elem == $item ]]; then + return 0 + fi + done + return 1 +} + +# ------------------------------------------------------------------- # look up a free priority with a given prefix from the rule table # get_free_priority() @@ -108,6 +124,58 @@ } # ------------------------------------------------------------------- +# get IPv4 addresses from log dir +# +get_cn_assigned_addrs() +{ + local iface="$1" + test -z "$iface" && return 1 + + if [[ -e ${ADDRDIR}/${iface} ]]; then + echo $(cat ${ADDRDIR}/${iface}) + fi +} + +# ------------------------------------------------------------------- +# add address to log +# +add_addr_to_log() +{ + local iface="$1" + local addr="$2" + + test -z "$iface" -o -z "$addr" && return 1 + addr_log_file="${ADDRDIR}/${iface}" + if [[ -e ${addr_log_file} ]]; then + grep -q -x "${addr}" "${addr_log_file}" || echo "${addr}" >> "${addr_log_file}" + else + mkdir -p "${ADDRDIR}" + echo "${addr}" > "${addr_log_file}" + fi +} + +# ------------------------------------------------------------------- +# remove address from log +# +remove_addr_from_log() +{ + local iface="$1" + local addr="$2" + + test -z "$iface" -o -z "$addr" && return 1 + addr_log_file="${ADDRDIR}/${iface}" + if [[ -e ${addr_log_file} ]]; then + addr_log_file_tmp=$(mktemp ${ADDRDIR}/${iface}.XXXXXXXX) + if [ $? -ne 0 ]; then + log "could not create temp file, not removing address from log" + else + grep -v -x "${addr}" "${addr_log_file}" >> "${addr_log_file_tmp}" + mv "${addr_log_file_tmp}" "${addr_log_file}" + fi + fi +} + +# ------------------------------------------------------------------- # configure interface with secondary IPv4 addresses configured in the # cloud framework and set up routing policies # @@ -132,11 +200,14 @@ # get differences local addr_to_remove=($(get_extra_elements laddrs[@] raddrs[@])) local addr_to_add=($(get_extra_elements raddrs[@] laddrs[@])) - + + # get addresses cloud-netconfig configured + local addr_cn=($(get_cn_assigned_addrs $INTERFACE)) + debug "active IPv4 addresses on $INTERFACE: ${laddrs[@]}" - debug "configured IPv4 addresses on $INTERFACE: ${raddrs[@]}" - debug "addresses to remove on $INTERFACE: ${addr_to_remove[@]}" - debug "addresses to add on $INTERFACE: ${addr_to_add[@]}" + debug "configured IPv4 addresses for $INTERFACE: ${raddrs[@]}" + debug "excess addresses on $INTERFACE: ${addr_to_remove[@]}" + debug "addresses to configure on $INTERFACE: ${addr_to_add[@]}" local addr priority for addr in ${addr_to_remove[@]} ; do @@ -147,19 +218,32 @@ continue fi - # remove old IP address - log "removing address $addr from interface $INTERFACE" - ip -4 addr del $addr dev $INTERFACE + if is_element addr_cn[@] ${addr} ; then + # remove old IP address + log "removing address $addr from interface $INTERFACE" + ip -4 addr del $addr dev $INTERFACE + + # drop routing policy rule + ip -4 rule del from ${addr%/*} - # drop routing policy rule - ip -4 rule del from ${addr%/*} + # remove from address log + remove_addr_from_log $INTERFACE $addr + else + debug "not removing address ${addr} (was not added by cloud-netconfig)" + fi done for addr in ${addr_to_add[@]} ; do # add new IP address log "adding address $addr to interface $INTERFACE" ip -4 addr add $addr broadcast $BROADCAST dev $INTERFACE + add_addr_to_log $INTERFACE $addr done + # If we have a single NIC configuration, skip routing policies + if [[ $SINGLE_NIC = yes ]]; then + return + fi + # To make a working default route for secondary interfaces, we # need a separate route table so we can send packets there # using routing policy. Check whether the table is there and @@ -168,8 +252,8 @@ local GW GWS=() # we simply take the first gateway in case there is more than one eval GWS=\(${GATEWAYS}\) - if [[ -n "${GW[0]}" ]]; then - GW="${GW[0]}" + if [[ -n "${GWS[0]}" ]]; then + GW="${GWS[0]}" else # no default route, guess one # FIXME: this is not ideal; make it at least configurable @@ -288,7 +372,20 @@ done } -for IFDIR in $STATEDIR/* ; do +if_dirs=() +for IFDIR in $STATEDIR/* ; do test -d $IFDIR -a -d "/sys/class/net/${IFDIR##*/}" || continue + test ${IFDIR##*/} = "lo" && continue + if_dirs+=($IFDIR) +done + +# set single NIC flag if appropriate +if [[ ${#if_dirs[@]} -eq 1 ]]; then + SINGLE_NIC=yes +else + SINGLE_NIC=no +fi + +for IFDIR in ${if_dirs[@]} ; do manage_interfaceconfig $IFDIR done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-1.0/ec2/functions.cloud-netconfig new/cloud-netconfig-1.3/ec2/functions.cloud-netconfig --- old/cloud-netconfig-1.0/ec2/functions.cloud-netconfig 2019-01-31 14:11:27.891295667 +0100 +++ new/cloud-netconfig-1.3/ec2/functions.cloud-netconfig 2019-11-26 09:42:05.428870360 +0100 @@ -16,9 +16,52 @@ # # You should have received a copy of the GNU General Public License -API_VERSION="2016-09-02" -METADATA_URL_BASE="http://169.254.169.254/${API_VERSION}/meta-data/network/interfaces/macs/" +API_VERSION="2018-09-24" +METADATA_URL_BASE="http://169.254.169.254/${API_VERSION}" +METADATA_URL_IFACE="${METADATA_URL_BASE}/meta-data/network/interfaces/macs" CURL="curl -m 3" +TOKEN_TTL="60" +declare TOKEN + +# ------------------------------------------------------------------- +# get a session token for metadata access and store it in TOKEN +# +set_metadata_token() +{ + if [ -z "$TOKEN" ]; then + TOKEN=$($CURL -X PUT "http://169.254.169.254/latest/api/token" \ + -H "X-aws-ec2-metadata-token-ttl-seconds: $TOKEN_TTL" 2>/dev/null) + fi +} + +# ------------------------------------------------------------------- +# check whether given URL is available +# +check_url() +{ + test -z "$1" && return 1 + set_metadata_token + CODE=$($CURL -H "X-aws-ec2-metadata-token: $TOKEN" -I "$1" 2>/dev/null | \ + grep '^HTTP' | cut -d' ' -f2) + [ "$CODE" = "200" ] + return $? +} + +# ------------------------------------------------------------------- +# assign provided variable with value from metadata URL +# refresh token if necessary +# +set_from_metadata() +{ + test -z "$1" -o -z "$2" && return 1 + set_metadata_token + if check_url "$2" ; then + eval ${1}=\"$($CURL -H "X-aws-ec2-metadata-token: $TOKEN" "$2" 2>/dev/null)\" + else + return 1 + fi + return 0 +} # ------------------------------------------------------------------- # get IPv4 address from the EC2 meta data server and return them @@ -26,25 +69,23 @@ get_ipv4_addresses_from_metadata() { local addr count=0 hwaddr="$1" prefixlen - test -z "$hwaddr" && return 1 + test -z "$hwaddr" && return - # sometimes the entry for a newly attach NIC is not there yet - local check_md=$($CURL "${METADATA_URL_BASE}" 2>/dev/null | grep "$hwaddr") - local attempts=0 - while [ -z "$check_md" ]; do - if [ $attempts -ge 5 ]; then + # sometimes the entry for a newly attached NIC is not there yet, retry + # a few times if necessary + local cidr_block local_ips attempts=0 + while ! set_from_metadata cidr_block "${METADATA_URL_IFACE}/${hwaddr}/subnet-ipv4-cidr-block" ; do + if [[ $attempts -ge 5 ]]; then log "Could not get metadata for nic $hwaddr" return fi attempts=$((attempts+1)) sleep 1 - check_md=$($CURL "${METADATA_URL_BASE}" 2>/dev/null | grep "$hwaddr") done - local cidr_block=$($CURL "${METADATA_URL_BASE}/$hwaddr/subnet-ipv4-cidr-block" 2>/dev/null) - prefixlen=${cidr_block##*/} - $CURL "${METADATA_URL_BASE}/$hwaddr/local-ipv4s" 2>/dev/null | \ - while read -r addr || [[ -n "$addr" ]]; do + set_from_metadata local_ips "${METADATA_URL_IFACE}/${hwaddr}/local-ipv4s" + local prefixlen=${cidr_block##*/} + for addr in ${local_ips} ; do [[ $count -ge 1 ]] && echo -n " " echo -n "${addr}/${prefixlen}" count=$((count+1)) @@ -56,8 +97,7 @@ # metadata_available() { - local resp=$($CURL "http://169.254.169.254/latest/meta-data/" 2>/dev/null) - [[ "$resp" == *ami-id* ]] + check_url "${METADATA_URL_BASE}/meta-data/" return $? }