Hello community,
here is the log from the commit of package kiwi-boot-descriptions for
openSUSE:Factory checked in at 2019-08-15 12:25:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-boot-descriptions (Old)
and /work/SRC/openSUSE:Factory/.kiwi-boot-descriptions.new.9556 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-boot-descriptions"
Thu Aug 15 12:25:13 2019 rev:12 rq:721005 version:1.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-boot-descriptions/kiwi-boot-descriptions.changes
2019-07-17 14:23:01.452139816 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-boot-descriptions.new.9556/kiwi-boot-descriptions.changes
2019-08-15 12:25:15.218608388 +0200
@@ -1,0 +2,40 @@
+Mon Jul 29 09:26:18 UTC 2019 - Marcus Schaefer <[email protected]>
+
+- Use %suse_version instead of %sle_version do detect SLE 15 (SP*)
+ %sle_version is different depending on SP1 vs GA, but %suse_version
+ is the same for all SLE 15.
+
+-------------------------------------------------------------------
+Wed Jul 24 10:13:48 UTC 2019 - Marcus Schaefer <[email protected]>
+
+- modify 'dn' to avoid mangling /dev/sdp block names
+
+-------------------------------------------------------------------
+Fri Jul 19 13:55:30 UTC 2019 - [email protected]
+
+- Improve partition validation for PXE
+
+ This commit includes a patch to relax the partition
+ size validation. It turned to happen that under some
+ specific partition size configurations in the PXE client
+ the partition layout was always seen as an invalid one
+ in each boot. This was causing a repartition and redeploy
+ of the PXE image in every single boot.
+
+ Fixes bsc#1141156
+
+-------------------------------------------------------------------
+Fri Jul 19 13:54:33 UTC 2019 - [email protected]
+
+- Normalize partedGetPartitionID output (bsc#1136744)
+
+ This commit ensures the partedGetPartitionID output returns the
+ same partition ID codes with or without the presence of sgdisk
+ utility. It basically trusts partition names provided by KIWI to map
+ partitions to specific IDs.
+
+ Additionally this commit also makes sure that the partition stated
+ to be of `ef` type in config.<mac> is named `legacy`, to be consistent
+ with the partedGetPartitionID expectations.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-boot-descriptions.spec ++++++
--- /var/tmp/diff_new_pack.aPBXzo/_old 2019-08-15 12:25:15.746608256 +0200
+++ /var/tmp/diff_new_pack.aPBXzo/_new 2019-08-15 12:25:15.746608256 +0200
@@ -33,7 +33,7 @@
%endif
# SLE15:
-%if 0%{?sle_version} == 150000 && !0%{?is_opensuse}
+%if 0%{?suse_version} == 1500 && !0%{?is_opensuse}
%define distro suse-SLES15
%endif
@@ -78,11 +78,6 @@
%define distro suse-tumbleweed
%endif
-# SLES with sles_version macro
-%if 0%{?sles_version}
-%define distro suse-SLES%{sles_version}
-%endif
-
# RHEL // CentOS
# use the rhel templates for CentOS, too
%if 0%{?rhel} == 7
++++++ kiwi-boot-descriptions.tar.gz ++++++
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 2019-06-17 09:29:34.379205070 +0200
+++ new/custom_boot/functions.sh 2019-07-24 12:12:55.023323475 +0200
@@ -4491,10 +4491,9 @@
function partedGetPartitionID {
# /.../
# prints the partition ID for the given device and number
- # In case of a GPT map to the GUID code from the sgdisk
- # utility. If sgdisk is not available map to the kiwi
- # fdisk compatible hex id's which uses ee for any kind
- # of unknown GPT partition entry
+ # In case of GPT it maps ID values according to the name kiwi
+ # defines for the partition. In case of unknown name try to use
+ # sgdisk, if available, or just default to `ee`
# ----
local IFS=$IFS_ORIG
local parted=$(parted -m -s $1 print | grep -v Warning:)
@@ -4513,11 +4512,7 @@
sed -e 's@[,; ]@@g' | tr -d 0
else
local name=$(parted -m -s $1 print | grep ^$2: | cut -f6 -d:)
- if lookup sgdisk &>/dev/null;then
- # map to short gdisk code
- echo $(sgdisk -p $1 | grep -E "^ $2") |\
- cut -f6 -d ' ' | cut -c-2 | tr [:upper:] [:lower:]
- elif [ "$name" = "lxroot" ];then
+ if [ "$name" = "lxroot" ];then
# map lxroot to MBR type 83 (linux)
echo 83
elif [ "$name" = "lxswap" ];then
@@ -4532,6 +4527,11 @@
elif [ "$name" = "legacy" ];then
# map bios grub legacy partition to MBR type ef (EFI)
echo ef
+ elif lookup sgdisk &>/dev/null;then
+ # map to short gdisk code
+ local id=$(echo $(sgdisk -p $1 | grep -E "^ $2") |\
+ cut -f6 -d ' ' | cut -c-2)
+ echo ${id,,}
else
# map anything else to ee (GPT)
echo ee
@@ -7332,7 +7332,7 @@
if [[ $part =~ mapper/loop ]];then
part=$(echo $part | sed -e s@/mapper@@)
fi
- local part_new=$(echo $part | sed -e 's@\(^.*\)\(p[0-9].*$\)@\1@')
+ local part_new=$(echo $part | sed -e 's@\(^.*[0-9]+\)\(p[0-9].*$\)@\1@')
if [ $part = $part_new ];then
part_new=$(echo $part | sed -e 's@\(^.*\)\([0-9].*$\)@\1@')
fi
@@ -7871,8 +7871,8 @@
local IFS=$IFS_ORIG
local sizeBytes=$(($1 * 1048576))
# bc truncates to zero decimal places, which results in a partition that
- # is slightly smaller than the requested size. Add one cylinder to
compensate.
- local cylreq=$(echo "scale=0; $sizeBytes / ($partedCylKSize * 1000) + 1" |
bc)
+ # is slightly smaller than the requested size. Add half cylinder to round
to nearest integer value.
+ local cylreq=$(echo "scale=1; cs = $sizeBytes / ($partedCylKSize * 1000) +
0.5; scale=0; cs/1" | bc)
echo $cylreq
}
#======================================
@@ -8628,6 +8628,10 @@
partID=fd
pname=lxroot
fi
+ if [ $partID = "ef" ];then
+ partID=ef
+ pname=legacy
+ fi
if [ $count -eq 1 ];then
echo -n "n p:$pname $count 1 $partSize "
if [ $partID = "82" ] || \
@@ -8850,8 +8854,8 @@
local raidFirst
local raidSecond
local size
- local maxDiffPlus=10240 # max 10MB bigger
- local maxDiffMinus=10240 # max 10MB smaller
+ local maxDiffPlus=12288 # max 1.5cyl ~12MB bigger
+ local maxDiffMinus=12288 # max 1.5cyl ~12MB smaller
for n in $RAID;do
case $field in
0) raidLevel=$n ; field=1 ;;
@@ -8969,8 +8973,8 @@
local partMount
local device
local size
- local maxDiffPlus=10240 # max 10MB bigger
- local maxDiffMinus=10240 # max 10MB smaller
+ local maxDiffPlus=12288 # max 1.5cyl ~12MB bigger
+ local maxDiffMinus=12288 # max 1.5cyl ~12MB smaller
IFS=","
for i in $PART;do
count=$((count + 1))
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 2019-06-14
10:34:26.673450806 +0200
+++ new/custom_boot/package/kiwi-boot-descriptions.spec 2019-07-29
11:25:29.766383356 +0200
@@ -33,7 +33,7 @@
%endif
# SLE15:
-%if 0%{?sle_version} == 150000 && !0%{?is_opensuse}
+%if 0%{?suse_version} == 1500 && !0%{?is_opensuse}
%define distro suse-SLES15
%endif
@@ -78,11 +78,6 @@
%define distro suse-tumbleweed
%endif
-# SLES with sles_version macro
-%if 0%{?sles_version}
-%define distro suse-SLES%{sles_version}
-%endif
-
# RHEL // CentOS
# use the rhel templates for CentOS, too
%if 0%{?rhel} == 7
