summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apt/manifests/dist_upgrade.pp
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/modules/site_apt/manifests/dist_upgrade.pp')
-rw-r--r--puppet/modules/site_apt/manifests/dist_upgrade.pp6
1 files changed, 4 insertions, 2 deletions
diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp
index f129dd73..08de31bb 100644
--- a/puppet/modules/site_apt/manifests/dist_upgrade.pp
+++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp
@@ -1,15 +1,17 @@
class site_apt::dist_upgrade {
- if $::apt_running == 'true' {
+ if $::apt_running == 'true' {
fail ('apt-get is running in background - Please wait until it finishes. Exiting.')
} else {
exec{'initial_apt_update':
- command => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean',
+ command => '/usr/bin/apt-get update',
refreshonly => false,
+ timeout => 360,
}
exec{'initial_apt_dist_upgrade':
command => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold' dist-upgrade",
refreshonly => false,
+ timeout => 1200,
}
}
}