From 3762a620681039ee28778998b4c0ab431a1393f4d209b48224367f42ca94fb5d Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Fri, 7 Jun 2019 11:21:10 +0000
Subject: [PATCH] - Move OBS comment - Use set in config.sh correctly

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=35
---
 config.sh                    | 2 +-
 livecd-leap-gnome.kiwi       | 4 +++-
 livecd-leap-kde.kiwi         | 4 +++-
 livecd-leap-x11.kiwi         | 4 +++-
 livecd-openSUSE.changes      | 6 ++++++
 livecd-tumbleweed-gnome.kiwi | 4 +++-
 livecd-tumbleweed-kde.kiwi   | 4 +++-
 livecd-tumbleweed-x11.kiwi   | 4 +++-
 livecd-tumbleweed-xfce.kiwi  | 4 +++-
 livecd.kiwi.in               | 4 +++-
 10 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/config.sh b/config.sh
index ff7d1fe..b08a0c4 100644
--- a/config.sh
+++ b/config.sh
@@ -14,7 +14,7 @@
 test -f /.kconfig && . /.kconfig
 test -f /.profile && . /.profile
 
-set -euox pipefail
+set -euxo pipefail
 
 exec | tee /var/log/config.log
 exec 2>&1
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index b00232c..b61ad50 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -1,5 +1,7 @@
-<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="openSUSE-Leap-15.1-GNOME-Live" displayname="openSUSE Leap 15.1 GNOME Live">
   <description type="system">
     <author>openSUSE Project</author>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 2a8e07e..85c8ddf 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -1,5 +1,7 @@
-<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="openSUSE-Leap-15.1-KDE-Live" displayname="openSUSE Leap 15.1 KDE Live">
   <description type="system">
     <author>openSUSE Project</author>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index e445138..9ae6d55 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -1,5 +1,7 @@
-<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="openSUSE-Leap-15.1-Rescue-CD" displayname="openSUSE Leap 15.1 Rescue CD">
   <description type="system">
     <author>openSUSE Project</author>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index c7182dc..8e39cb4 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun  7 11:20:37 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- Move OBS comment
+- Use set in config.sh correctly
+
 -------------------------------------------------------------------
 Fri Jun  7 07:39:29 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 9fb3ebd..f3f1289 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -1,5 +1,7 @@
-<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="openSUSE-Tumbleweed-GNOME-Live" displayname="openSUSE Tumbleweed GNOME Live">
   <description type="system">
     <author>openSUSE Project</author>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 9981826..f2445f7 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -1,5 +1,7 @@
-<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="openSUSE-Tumbleweed-KDE-Live" displayname="openSUSE Tumbleweed KDE Live">
   <description type="system">
     <author>openSUSE Project</author>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 8c1b7bc..381d712 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -1,5 +1,7 @@
-<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="openSUSE-Tumbleweed-Rescue-CD" displayname="openSUSE Tumbleweed Rescue CD">
   <description type="system">
     <author>openSUSE Project</author>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index b5190ae..d232c6a 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -1,5 +1,7 @@
-<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="openSUSE-Tumbleweed-XFCE-Live" displayname="openSUSE Tumbleweed XFCE Live">
   <description type="system">
     <author>openSUSE Project</author>
diff --git a/livecd.kiwi.in b/livecd.kiwi.in
index b1a1535..1725f1d 100644
--- a/livecd.kiwi.in
+++ b/livecd.kiwi.in
@@ -1,5 +1,7 @@
-<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="@NAME@" displayname="@DISPLAYNAME@">
   <description type="system">
     <author>openSUSE Project</author>