From cda2585f3678a87de71593682c90a72ef6f57cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ospal=C3=BD?= Date: Thu, 30 Apr 2020 17:33:43 +0200 Subject: [PATCH] M #-: Cleanup Alpine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - remove vrouter dependencies from vanilla alpine - rename legacy vrouter services with a tag #vr Signed-off-by: Petr Ospalý --- src/etc/init.d/one-context-local##apk.one | 2 +- .../{loc-12-firewall##apk => loc-12-firewall##vr} | 0 .../{loc-15-ip_forward##apk => loc-15-ip_forward##vr} | 0 .../{loc-15-keepalived##apk => loc-15-keepalived##vr} | 0 targets.sh | 4 ++-- 5 files changed, 3 insertions(+), 3 deletions(-) rename src/etc/one-context.d/{loc-12-firewall##apk => loc-12-firewall##vr} (100%) rename src/etc/one-context.d/{loc-15-ip_forward##apk => loc-15-ip_forward##vr} (100%) rename src/etc/one-context.d/{loc-15-keepalived##apk => loc-15-keepalived##vr} (100%) diff --git a/src/etc/init.d/one-context-local##apk.one b/src/etc/init.d/one-context-local##apk.one index 1eba8c4..dc833b8 100755 --- a/src/etc/init.d/one-context-local##apk.one +++ b/src/etc/init.d/one-context-local##apk.one @@ -4,7 +4,7 @@ name="OpenNebula pre-networking contextualization" depend() { need localmount udev udev-trigger udev-settle - before net iptables keepalived + before net use logger keyword -stop -shutdown } diff --git a/src/etc/one-context.d/loc-12-firewall##apk b/src/etc/one-context.d/loc-12-firewall##vr similarity index 100% rename from src/etc/one-context.d/loc-12-firewall##apk rename to src/etc/one-context.d/loc-12-firewall##vr diff --git a/src/etc/one-context.d/loc-15-ip_forward##apk b/src/etc/one-context.d/loc-15-ip_forward##vr similarity index 100% rename from src/etc/one-context.d/loc-15-ip_forward##apk rename to src/etc/one-context.d/loc-15-ip_forward##vr diff --git a/src/etc/one-context.d/loc-15-keepalived##apk b/src/etc/one-context.d/loc-15-keepalived##vr similarity index 100% rename from src/etc/one-context.d/loc-15-keepalived##apk rename to src/etc/one-context.d/loc-15-keepalived##vr diff --git a/targets.sh b/targets.sh index 4d99221..c1b1137 100644 --- a/targets.sh +++ b/targets.sh @@ -190,7 +190,7 @@ case "${TARGET}" in RELSUFFIX=${RELSUFFIX:-} TYPE=${TYPE:-apk} TAGS=${TAGS:-apk one} - DEPENDS=${DEPENDS:-util-linux bash curl rsync udev iptables sfdisk parted e2fsprogs-extra keepalived quagga sudo shadow ruby ruby-json bind-tools openssh open-vm-tools qemu-guest-agent} + DEPENDS=${DEPENDS:-util-linux bash curl udev sfdisk parted e2fsprogs-extra sudo shadow ruby ruby-json bind-tools openssh open-vm-tools qemu-guest-agent} PROVIDES=${PROVIDES:-} REPLACES=${REPLACES:-} #not respected CONFLICTS=${CONFLICTS:-one-context-ec2} @@ -205,7 +205,7 @@ case "${TARGET}" in RELSUFFIX=${RELSUFFIX:-} TYPE=${TYPE:-apk} TAGS=${TAGS:-apk ec2} - DEPENDS=${DEPENDS:-util-linux bash curl rsync udev iptables sfdisk parted e2fsprogs-extra keepalived quagga sudo shadow ruby ruby-json bind-tools openssh} + DEPENDS=${DEPENDS:-util-linux bash curl udev sfdisk parted e2fsprogs-extra sudo shadow ruby ruby-json bind-tools openssh} PROVIDES=${PROVIDES:-} REPLACES=${REPLACES:-} #not respected CONFLICTS=${CONFLICTS:-one-context}