Hello community,
here is the log from the commit of package kiwi-boot-descriptions for
openSUSE:Factory checked in at 2018-10-15 10:05:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-boot-descriptions (Old)
and /work/SRC/openSUSE:Factory/.kiwi-boot-descriptions.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-boot-descriptions"
Mon Oct 15 10:05:03 2018 rev:6 rq:640113 version:1.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-boot-descriptions/kiwi-boot-descriptions.changes
2018-09-11 17:09:16.748154719 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-boot-descriptions.new/kiwi-boot-descriptions.changes
2018-10-15 10:05:06.601944522 +0200
@@ -1,0 +2,15 @@
+Fri Sep 28 16:16:39 UTC 2018 - David Cassany <[email protected]>
+
+- Added syslinux requirement for kiwi-image-iso-requires, this
+ fixes bnc#1103398
+
+-------------------------------------------------------------------
+Thu Sep 20 08:45:29 UTC 2018 - [email protected]
+
+- Setup swap space with a label in any case
+
+ Independently of the device persistency setup we create
+ the swap space with the label named SWAP and add it as
+ such to the fstab file
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-boot-descriptions.spec ++++++
--- /var/tmp/diff_new_pack.q5NSPG/_old 2018-10-15 10:05:07.725943313 +0200
+++ /var/tmp/diff_new_pack.q5NSPG/_new 2018-10-15 10:05:07.729943309 +0200
@@ -100,7 +100,7 @@
Release: 0
Url: https://github.com/SUSE/kiwi-descriptions
Summary: KIWI - Custom Boot Descriptions
-License: GPL-3.0+
+License: GPL-3.0-or-later
Group: System/Management
Source: %{name}.tar.gz
Source1: kiwi-boot-packages
@@ -162,6 +162,8 @@
%else
Requires: genisoimage
%endif
+Requires: syslinux
+
%description -n kiwi-image-iso-requires
Meta package for the buildservice to pull in all required packages
for the build host to build live iso images
++++++ kiwi-boot-descriptions.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/arch/arm/oemboot/linuxrc
new/custom_boot/arch/arm/oemboot/linuxrc
--- old/custom_boot/arch/arm/oemboot/linuxrc 2018-02-08 11:48:44.477148606
+0100
+++ new/custom_boot/arch/arm/oemboot/linuxrc 2018-09-20 10:37:45.553901244
+0200
@@ -553,7 +553,7 @@
imageSwapDevice=$(cat /mnt/etc/fstab | grep swap | cut -f1 -d " ")
imageSwapDevice=$(echo $imageSwapDevice)
if [ -e "$imageSwapDevice" ];then
- if ! mkswap $imageSwapDevice 1>&2;then
+ if ! createSwap $imageSwapDevice 1>&2;then
systemException "Failed to restore swap signature" "reboot"
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/arch/arm/oemboot/repart
new/custom_boot/arch/arm/oemboot/repart
--- old/custom_boot/arch/arm/oemboot/repart 2018-02-08 11:48:44.477148606
+0100
+++ new/custom_boot/arch/arm/oemboot/repart 2018-09-20 10:37:45.553901244
+0200
@@ -651,7 +651,7 @@
waitForStorageDevice $imageSwapDevice &>/dev/null
if partitionSize $imageSwapDevice &>/dev/null;then
Echo "Creating swap space on $imageSwapDevice"
- if ! mkswap $imageSwapDevice 1>&2;then
+ if ! createSwap $imageSwapDevice 1>&2;then
systemException "Failed to create swap signature" "reboot"
fi
Echo "Activating swap space on $imageSwapDevice"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/arch/ppc/netboot/linuxrc
new/custom_boot/arch/ppc/netboot/linuxrc
--- old/custom_boot/arch/ppc/netboot/linuxrc 2018-02-08 11:48:44.485148633
+0100
+++ new/custom_boot/arch/ppc/netboot/linuxrc 2018-09-20 10:37:45.553901244
+0200
@@ -437,7 +437,7 @@
fi
runHook preswap
if [ ! -z "$imageSwapDevice" ];then
- if ! mkswap $imageSwapDevice 1>&2;then
+ if ! createSwap $imageSwapDevice 1>&2;then
systemException "Failed to create swap signature" "reboot"
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/arch/ppc/oemboot/linuxrc
new/custom_boot/arch/ppc/oemboot/linuxrc
--- old/custom_boot/arch/ppc/oemboot/linuxrc 2018-02-08 11:48:44.485148633
+0100
+++ new/custom_boot/arch/ppc/oemboot/linuxrc 2018-09-20 10:37:45.553901244
+0200
@@ -552,7 +552,7 @@
imageSwapDevice=$(cat /mnt/etc/fstab | grep swap | cut -f1 -d " ")
imageSwapDevice=$(echo $imageSwapDevice)
if [ -e "$imageSwapDevice" ];then
- if ! mkswap $imageSwapDevice 1>&2;then
+ if ! createSwap $imageSwapDevice 1>&2;then
systemException "Failed to restore swap signature" "reboot"
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/arch/ppc/oemboot/repart
new/custom_boot/arch/ppc/oemboot/repart
--- old/custom_boot/arch/ppc/oemboot/repart 2018-02-08 11:48:44.485148633
+0100
+++ new/custom_boot/arch/ppc/oemboot/repart 2018-09-20 10:37:45.553901244
+0200
@@ -651,7 +651,7 @@
waitForStorageDevice $imageSwapDevice &>/dev/null
if partitionSize $imageSwapDevice &>/dev/null;then
Echo "Creating swap space on $imageSwapDevice"
- if ! mkswap $imageSwapDevice 1>&2;then
+ if ! createSwap $imageSwapDevice 1>&2;then
systemException "Failed to create swap signature" "reboot"
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/arch/s390/netboot/linuxrc
new/custom_boot/arch/s390/netboot/linuxrc
--- old/custom_boot/arch/s390/netboot/linuxrc 2018-02-08 11:48:44.489148646
+0100
+++ new/custom_boot/arch/s390/netboot/linuxrc 2018-09-20 10:37:45.553901244
+0200
@@ -454,7 +454,7 @@
fi
runHook preswap
if [ ! -z "$imageSwapDevice" ];then
- if ! mkswap $imageSwapDevice 1>&2;then
+ if ! createSwap $imageSwapDevice 1>&2;then
systemException "Failed to create swap signature" "reboot"
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/arch/s390/oemboot/linuxrc
new/custom_boot/arch/s390/oemboot/linuxrc
--- old/custom_boot/arch/s390/oemboot/linuxrc 2018-02-08 11:48:44.493148659
+0100
+++ new/custom_boot/arch/s390/oemboot/linuxrc 2018-09-20 10:37:45.553901244
+0200
@@ -557,7 +557,7 @@
imageSwapDevice=$(cat /mnt/etc/fstab | grep swap | cut -f1 -d " ")
imageSwapDevice=$(echo $imageSwapDevice)
if [ -e "$imageSwapDevice" ];then
- if ! mkswap $imageSwapDevice 1>&2;then
+ if ! createSwap $imageSwapDevice 1>&2;then
systemException "Failed to restore swap signature" "reboot"
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/arch/s390/oemboot/repart
new/custom_boot/arch/s390/oemboot/repart
--- old/custom_boot/arch/s390/oemboot/repart 2018-02-08 11:48:44.493148659
+0100
+++ new/custom_boot/arch/s390/oemboot/repart 2018-09-20 10:37:45.553901244
+0200
@@ -652,7 +652,7 @@
waitForStorageDevice $imageSwapDevice &>/dev/null
if partitionSize $imageSwapDevice &>/dev/null;then
Echo "Creating swap space on $imageSwapDevice"
- if ! mkswap $imageSwapDevice 1>&2;then
+ if ! createSwap $imageSwapDevice 1>&2;then
systemException "Failed to create swap signature" "reboot"
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/arch/x86_64/netboot/linuxrc
new/custom_boot/arch/x86_64/netboot/linuxrc
--- old/custom_boot/arch/x86_64/netboot/linuxrc 2018-02-08 11:48:44.497148673
+0100
+++ new/custom_boot/arch/x86_64/netboot/linuxrc 2018-09-20 10:37:45.553901244
+0200
@@ -437,7 +437,7 @@
fi
runHook preswap
if [ ! -z "$imageSwapDevice" ];then
- if ! mkswap $imageSwapDevice 1>&2;then
+ if ! createSwap $imageSwapDevice 1>&2;then
systemException "Failed to create swap signature" "reboot"
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/arch/x86_64/oemboot/linuxrc
new/custom_boot/arch/x86_64/oemboot/linuxrc
--- old/custom_boot/arch/x86_64/oemboot/linuxrc 2018-02-08 11:48:44.505148699
+0100
+++ new/custom_boot/arch/x86_64/oemboot/linuxrc 2018-09-20 10:37:45.553901244
+0200
@@ -553,7 +553,7 @@
imageSwapDevice=$(cat /mnt/etc/fstab | grep swap | cut -f1 -d " ")
imageSwapDevice=$(echo $imageSwapDevice)
if [ -e "$imageSwapDevice" ];then
- if ! mkswap $imageSwapDevice 1>&2;then
+ if ! createSwap $imageSwapDevice 1>&2;then
systemException "Failed to restore swap signature" "reboot"
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/arch/x86_64/oemboot/repart
new/custom_boot/arch/x86_64/oemboot/repart
--- old/custom_boot/arch/x86_64/oemboot/repart 2018-02-08 11:48:44.505148699
+0100
+++ new/custom_boot/arch/x86_64/oemboot/repart 2018-09-20 10:37:45.553901244
+0200
@@ -651,7 +651,7 @@
waitForStorageDevice $imageSwapDevice &>/dev/null
if partitionSize $imageSwapDevice &>/dev/null;then
Echo "Creating swap space on $imageSwapDevice"
- if ! mkswap $imageSwapDevice 1>&2;then
+ if ! createSwap $imageSwapDevice 1>&2;then
systemException "Failed to create swap signature" "reboot"
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/functions.sh new/custom_boot/functions.sh
--- old/custom_boot/functions.sh 2018-08-13 11:02:26.378527409 +0200
+++ new/custom_boot/functions.sh 2018-09-20 10:37:45.557901243 +0200
@@ -2198,15 +2198,7 @@
local prefix=$1
local sdev=$2
local nfstab=$prefix/etc/fstab
- local devicepersistency="by-uuid"
- if [ ! -z "$kiwi_devicepersistency" ];then
- devicepersistency=$kiwi_devicepersistency
- fi
- if [ $devicepersistency = "by-label" ];then
- local device="LABEL=$(blkid $sdev -s LABEL -o value)"
- else
- local device="UUID=$(blkid $sdev -s UUID -o value)"
- fi
+ local device="LABEL=$(blkid $sdev -s LABEL -o value)"
echo "$device swap swap defaults 0 0" >> $nfstab
}
#======================================
@@ -5663,6 +5655,17 @@
fi
}
#======================================
+# createSwap
+#--------------------------------------
+function createSwap {
+ # /.../
+ # create swap space on given device
+ # ----
+ local IFS=$IFS_ORIG
+ local device=$1
+ mkswap --label SWAP "${device}"
+}
+#======================================
# waitForStorageDevice
#--------------------------------------
function waitForStorageDevice {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/package/kiwi-boot-descriptions.spec
new/custom_boot/package/kiwi-boot-descriptions.spec
--- old/custom_boot/package/kiwi-boot-descriptions.spec 2018-04-04
11:00:36.805321110 +0200
+++ new/custom_boot/package/kiwi-boot-descriptions.spec 2018-09-10
12:30:28.880304509 +0200
@@ -158,6 +158,7 @@
%else
Requires: genisoimage
%endif
+Requires: syslinux
%description -n kiwi-image-iso-requires
Meta package for the buildservice to pull in all required packages
for the build host to build live iso images
