sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add package uninstall support"

Browse Source
This commit is contained in:
Jenkins 2014-04-29 08:10:31 +00:00 committed by Gerrit Code Review
commit 59a2ccc6c3
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elements/dpkg/bin/install-packages
View File

@ -28,6 +28,9 @@ install_deb_packages () {
if [ "$1" = "-u" ] ; then if [ "$1" = "-u" ] ; then
install_deb_packages dist-upgrade install_deb_packages dist-upgrade
exit 0 exit 0
elif [ "$1" = "-e" ]; then
install_deb_packages remove $@
shift
else else
install_deb_packages install $@ install_deb_packages install $@
fi fi

6
elements/yum/bin/install-packages
View File

@ -17,6 +17,7 @@
set -e set -e
EXTRA_ARGS= EXTRA_ARGS=
ACTION=install
if [ "$1" = "-u" ] ; then if [ "$1" = "-u" ] ; then
yum -y update yum -y update
@ -24,6 +25,9 @@ if [ "$1" = "-u" ] ; then
elif [ "$1" = "-d" ] ; then elif [ "$1" = "-d" ] ; then
EXTRA_ARGS="--downloadonly" EXTRA_ARGS="--downloadonly"
shift shift
elif [ "$1" = "-e" ]; then
ACTION=erase
shift
fi fi
# Packages that aren't available in the distro but requested for installation # Packages that aren't available in the distro but requested for installation
@ -42,7 +46,7 @@ if [ -n "$WHITELIST" ]; then
if [ -f /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release ]; then if [ -f /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release ]; then
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
fi fi
yum -y install $EXTRA_ARGS $(map-packages $WHITELIST) yum -y $ACTION $EXTRA_ARGS $(map-packages $WHITELIST)
for pkg in "$@"; do for pkg in "$@"; do
if [ "$pkg" = "python-pip" ] ; then if [ "$pkg" = "python-pip" ] ; then
alternatives --install /usr/bin/pip pip /usr/bin/pip-python 10 alternatives --install /usr/bin/pip pip /usr/bin/pip-python 10