M #-: Cleanup Alpine

- remove vrouter dependencies from vanilla alpine
- rename legacy vrouter services with a tag #vr

Signed-off-by: Petr Ospalý <pospaly@opennebula.systems>
pull/205/head
Petr Ospalý 5 years ago committed by Vlastimil Holer
parent e2b2c36f2a
commit cda2585f36

@ -4,7 +4,7 @@ name="OpenNebula pre-networking contextualization"
depend() { depend() {
need localmount udev udev-trigger udev-settle need localmount udev udev-trigger udev-settle
before net iptables keepalived before net
use logger use logger
keyword -stop -shutdown keyword -stop -shutdown
} }

@ -190,7 +190,7 @@ case "${TARGET}" in
RELSUFFIX=${RELSUFFIX:-} RELSUFFIX=${RELSUFFIX:-}
TYPE=${TYPE:-apk} TYPE=${TYPE:-apk}
TAGS=${TAGS:-apk one} 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:-} PROVIDES=${PROVIDES:-}
REPLACES=${REPLACES:-} #not respected REPLACES=${REPLACES:-} #not respected
CONFLICTS=${CONFLICTS:-one-context-ec2} CONFLICTS=${CONFLICTS:-one-context-ec2}
@ -205,7 +205,7 @@ case "${TARGET}" in
RELSUFFIX=${RELSUFFIX:-} RELSUFFIX=${RELSUFFIX:-}
TYPE=${TYPE:-apk} TYPE=${TYPE:-apk}
TAGS=${TAGS:-apk ec2} 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:-} PROVIDES=${PROVIDES:-}
REPLACES=${REPLACES:-} #not respected REPLACES=${REPLACES:-} #not respected
CONFLICTS=${CONFLICTS:-one-context} CONFLICTS=${CONFLICTS:-one-context}

Loading…
Cancel
Save