From ae0917c4c23d951f3265b030971459a0f05a10bb4deded8cde5eb180c3406c03 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 3 Dec 2019 15:40:04 +0000 Subject: [PATCH] - Fix editbootinstall_rpi.sh with newer kiwi OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=12 --- editbootinstall_rpi.sh | 5 ++--- kiwi-templates-JeOS.changes | 5 +++++ kiwi-templates-JeOS.spec | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/editbootinstall_rpi.sh b/editbootinstall_rpi.sh index 107cfee..5e5cd40 100644 --- a/editbootinstall_rpi.sh +++ b/editbootinstall_rpi.sh @@ -1,10 +1,9 @@ #!/bin/bash - -set -x +set -euxo pipefail diskname=$1 devname="$2" -loopname="${devname%*p2}" +loopname="${devname%*p?}" loopdev=/dev/${loopname#/dev/mapper/*} #========================================== diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes index d32888a..ef91725 100644 --- a/kiwi-templates-JeOS.changes +++ b/kiwi-templates-JeOS.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 3 15:31:37 UTC 2019 - Fabian Vogt + +- Fix editbootinstall_rpi.sh with newer kiwi + ------------------------------------------------------------------- Tue Nov 26 13:11:12 UTC 2019 - Fabian Vogt diff --git a/kiwi-templates-JeOS.spec b/kiwi-templates-JeOS.spec index d53290d..9e4ca33 100644 --- a/kiwi-templates-JeOS.spec +++ b/kiwi-templates-JeOS.spec @@ -1,7 +1,7 @@ # # spec file for package kiwi-templates-JeOS # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ #