saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-17 10:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add and use __apt_get_upgrade_noinput

Browse source
This commit is contained in:
Pedro Algarvio 2013-09-25 17:35:06 +01:00
parent fac777d024
commit 1b52356df2
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
bootstrap-salt.sh
View file

@ -954,6 +954,14 @@ __apt_get_install_noinput() {
}
#--- FUNCTION ----------------------------------------------------------------
# NAME: __apt_get_upgrade_noinput
# DESCRIPTION: (DRY) apt-get upgrade with noinput options
#-------------------------------------------------------------------------------
__apt_get_upgrade_noinput() {
apt-get upgrade -y -o DPkg::Options::=--force-confold $@; return $?
}
#--- FUNCTION ----------------------------------------------------------------
# NAME: copyfile
@ -1135,7 +1143,7 @@ install_ubuntu_deps() {
apt-get update
if [ $_UPGRADE_SYS -eq $BS_TRUE ]; then
apt-get upgrade -y -o DPkg::Options::=--force-confold || return 1
__apt_get_upgrade_noinput || return 1
fi
return 0
@ -1158,7 +1166,7 @@ install_ubuntu_daily_deps() {
apt-get update
if [ $_UPGRADE_SYS -eq $BS_TRUE ]; then
apt-get upgrade -y -o DPkg::Options::=--force-confold || return 1
__apt_get_upgrade_noinput || return 1
fi
return 0
@ -1173,7 +1181,7 @@ install_ubuntu_11_10_deps() {
apt-get update
if [ $_UPGRADE_SYS -eq $BS_TRUE ]; then
apt-get upgrade -y -o DPkg::Options::=--force-confold || return 1
__apt_get_upgrade_noinput || return 1
fi
return 0
@ -1306,7 +1314,7 @@ install_debian_deps() {
apt-get update
if [ $_UPGRADE_SYS -eq $BS_TRUE ]; then
apt-get upgrade -y -o DPkg::Options::=--force-confold || return 1
__apt_get_upgrade_noinput || return 1
fi
}
@ -1369,7 +1377,7 @@ _eof
apt-get update || return 1
if [ $_UPGRADE_SYS -eq $BS_TRUE ]; then
apt-get upgrade -y -o DPkg::Options::=--force-confold || return 1
__apt_get_upgrade_noinput || return 1
fi
__apt_get_install_noinput python-zmq || return 1
@ -1421,7 +1429,7 @@ _eof
fi
if [ $_UPGRADE_SYS -eq $BS_TRUE ]; then
apt-get upgrade -y -o DPkg::Options::=--force-confold || return 1
__apt_get_upgrade_noinput || return 1
fi
return 0
@ -1445,7 +1453,7 @@ install_debian_git_deps() {
fi
if [ $_UPGRADE_SYS -eq $BS_TRUE ]; then
apt-get upgrade -y -o DPkg::Options::=--force-confold || return 1
__apt_get_upgrade_noinput || return 1
fi
return 0
@ -1470,7 +1478,7 @@ install_debian_6_git_deps() {
fi
if [ $_UPGRADE_SYS -eq $BS_TRUE ]; then
apt-get upgrade -y -o DPkg::Options::=--force-confold || return 1
__apt_get_upgrade_noinput || return 1
fi
return 0