summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2019-08-21 09:48:35 +0200
committerPatrick Vacek <patrickvacek@gmail.com>2019-08-21 09:48:35 +0200
commit08759ff12ea7a3881870f991ffbeb416b45e2793 (patch)
tree32fbff2ddac89dca769211bf1639e1e982824ef7
parent8434da1a579dc15090cbd1dc57cd8d83c6de613e (diff)
downloadmeta-updater-08759ff12ea7a3881870f991ffbeb416b45e2793.tar.gz
Use a default expiry of one month if nothing is specified.
This mimics the intended behavior of the default in garage-sign, but doesn't rely on the date in the unsigned targets. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
-rw-r--r--classes/image_types_ostree.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index fd67865..795e01b 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -248,6 +248,8 @@ IMAGE_CMD_garagesign () {
248 target_expiry="--expires ${GARAGE_TARGET_EXPIRES}" 248 target_expiry="--expires ${GARAGE_TARGET_EXPIRES}"
249 elif [ -n "${GARAGE_TARGET_EXPIRE_AFTER}" ]; then 249 elif [ -n "${GARAGE_TARGET_EXPIRE_AFTER}" ]; then
250 target_expiry="--expire-after ${GARAGE_TARGET_EXPIRE_AFTER}" 250 target_expiry="--expire-after ${GARAGE_TARGET_EXPIRE_AFTER}"
251 else
252 target_expiry="--expire-after 1M"
251 fi 253 fi
252 254
253 for push_retries in $( seq 3 ); do 255 for push_retries in $( seq 3 ); do