diff options
| author | varac <varacanero@zeromail.org> | 2016-11-04 14:39:23 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-11-04 14:39:23 +0100 |
| commit | 5d001efb65f4ac2afa39d17b7b62d4f861f450a3 (patch) | |
| tree | 88b282297150f4890fce19182206dc9bfa0f3a9d /manifests/dist_upgrade.pp | |
| parent | 33c61e8df59db1abbed379a9e9790946060a8f1e (diff) | |
| parent | 584b7aad338206026d62d846122e6bef532a2d2a (diff) | |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'manifests/dist_upgrade.pp')
| -rw-r--r-- | manifests/dist_upgrade.pp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/manifests/dist_upgrade.pp b/manifests/dist_upgrade.pp index 19c031e..3061fb8 100644 --- a/manifests/dist_upgrade.pp +++ b/manifests/dist_upgrade.pp @@ -1,8 +1,11 @@ -class apt::dist_upgrade { +class apt::dist_upgrade ( + $timeout = 300, +) { exec { 'apt_dist-upgrade': command => '/usr/bin/apt-get -q -y -o \'DPkg::Options::=--force-confold\' dist-upgrade', refreshonly => true, + timeout => $timeout, before => Exec['apt_updated'] } |