diff options
Diffstat (limited to 'classes/image_types_ostree.bbclass')
-rw-r--r-- | classes/image_types_ostree.bbclass | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 0acc786..9ecaaa1 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -113,8 +113,7 @@ IMAGE_CMD_ostree () { | |||
113 | 113 | ||
114 | if [ -d root ] && [ ! -L root ]; then | 114 | if [ -d root ] && [ ! -L root ]; then |
115 | if [ "$(ls -A root)" ]; then | 115 | if [ "$(ls -A root)" ]; then |
116 | bberror "Data in /root directory is not preserved by OSTree." | 116 | bbfatal "Data in /root directory is not preserved by OSTree." |
117 | exit 1 | ||
118 | fi | 117 | fi |
119 | 118 | ||
120 | if [ -n "$SYSTEMD_USED" ]; then | 119 | if [ -n "$SYSTEMD_USED" ]; then |
@@ -197,11 +196,9 @@ IMAGE_CMD_garagesign () { | |||
197 | 196 | ||
198 | java_version=$( java -version 2>&1 | awk -F '"' '/version/ {print $2}' ) | 197 | java_version=$( java -version 2>&1 | awk -F '"' '/version/ {print $2}' ) |
199 | if [ "${java_version}" = "" ]; then | 198 | if [ "${java_version}" = "" ]; then |
200 | bberror "Java is required for synchronization with update backend, but is not installed on the host machine" | 199 | bbfatal "Java is required for synchronization with update backend, but is not installed on the host machine" |
201 | exit 1 | ||
202 | elif [ "${java_version}" \< "1.8" ]; then | 200 | elif [ "${java_version}" \< "1.8" ]; then |
203 | bberror "Java version >= 8 is required for synchronization with update backend" | 201 | bbfatal "Java version >= 8 is required for synchronization with update backend" |
204 | exit 1 | ||
205 | fi | 202 | fi |
206 | 203 | ||
207 | rm -rf ${GARAGE_SIGN_REPO} | 204 | rm -rf ${GARAGE_SIGN_REPO} |
@@ -252,8 +249,7 @@ IMAGE_CMD_garagesign () { | |||
252 | rm -rf ${GARAGE_SIGN_REPO} | 249 | rm -rf ${GARAGE_SIGN_REPO} |
253 | 250 | ||
254 | if [ "$push_success" -ne "1" ]; then | 251 | if [ "$push_success" -ne "1" ]; then |
255 | bberror "Couldn't push to garage repository" | 252 | bbfatal "Couldn't push to garage repository" |
256 | exit 1 | ||
257 | fi | 253 | fi |
258 | fi | 254 | fi |
259 | } | 255 | } |