Hello community,
here is the log from the commit of package kiwi-boot-descriptions for
openSUSE:Factory checked in at 2018-07-07 21:56:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-boot-descriptions (Old)
and /work/SRC/openSUSE:Factory/.kiwi-boot-descriptions.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-boot-descriptions"
Sat Jul 7 21:56:47 2018 rev:4 rq:620212 version:1.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-boot-descriptions/kiwi-boot-descriptions.changes
2018-03-20 21:53:55.987566550 +0100
+++
/work/SRC/openSUSE:Factory/.kiwi-boot-descriptions.new/kiwi-boot-descriptions.changes
2018-07-07 21:57:16.451403211 +0200
@@ -1,0 +2,14 @@
+Mon May 28 09:17:51 UTC 2018 - [email protected]
+
+- Make sure root entry in fstab is created for pxe
+
+ On pxe deployment via netboot the root entry in fstab was
+ not created even if the client config file contains a DISK
+ setup
+
+-------------------------------------------------------------------
+Wed Apr 4 14:55:17 UTC 2018 - [email protected]
+
+- Add kiwi-image-tbz-requires to provide kiwi-image:tbz
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-boot-descriptions.spec ++++++
--- /var/tmp/diff_new_pack.jsb4ya/_old 2018-07-07 21:57:17.195402268 +0200
+++ /var/tmp/diff_new_pack.jsb4ya/_new 2018-07-07 21:57:17.195402268 +0200
@@ -14,9 +14,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
-#
%if 0%{?fedora}
%global debug_package %{nil}
%endif
@@ -143,10 +140,9 @@
Summary: KIWI - buildservice host requirements for docker images
Group: System/Management
Provides: kiwi-image:docker
-Requires: jing
Requires: skopeo
Requires: umoci
-
+Requires: jing
%description -n kiwi-image-docker-requires
Meta package for the buildservice to pull in all required packages
for the build host to build docker images
@@ -170,9 +166,8 @@
Summary: KIWI - buildservice host requirements for oem images
Group: System/Management
Provides: kiwi-image:oem
-Requires: jing
Requires: kiwi-filesystem-requires
-
+Requires: jing
%description -n kiwi-image-oem-requires
Meta package for the buildservice to pull in all required packages
for the build host to build oem disk images
@@ -181,9 +176,8 @@
Summary: KIWI - buildservice host requirements for pxe images
Group: System/Management
Provides: kiwi-image:pxe
-Requires: jing
Requires: kiwi-filesystem-requires
-
+Requires: jing
%description -n kiwi-image-pxe-requires
Meta package for the buildservice to pull in all required packages
for the build host to build pxe images
@@ -192,13 +186,23 @@
Summary: KIWI - buildservice host requirements for vmx images
Group: System/Management
Provides: kiwi-image:vmx
-Requires: jing
Requires: kiwi-filesystem-requires
-
+Requires: jing
%description -n kiwi-image-vmx-requires
Meta package for the buildservice to pull in all required packages
for the build host to build simple disk images
+%package -n kiwi-image-tbz-requires
+Summary: KIWI - buildservice host requirements for root archive tarball
+Group: System/Management
+Provides: kiwi-image:tbz
+Requires: jing
+Requires: tar
+Requires: xz
+%description -n kiwi-image-tbz-requires
+Meta package for the buildservice to pull in all required packages
+for the build host to build root archive tarball
+
%package -n kiwi-filesystem-requires
Summary: KIWI - buildservice host requirements for filesystems
Group: System/Management
@@ -207,8 +211,8 @@
Provides: kiwi-filesystem:ext4
Provides: kiwi-filesystem:squashfs
Provides: kiwi-filesystem:xfs
-Requires: e2fsprogs
Requires: jing
+Requires: e2fsprogs
Requires: xfsprogs
%if 0%{?fedora} || 0%{?rhel}
Requires: btrfs-progs
@@ -259,6 +263,9 @@
%files -n kiwi-image-vmx-requires
%defattr(-, root, root)
+%files -n kiwi-image-tbz-requires
+%defattr(-, root, root)
+
%files -n kiwi-filesystem-requires
%defattr(-, root, root)
++++++ 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 2018-02-08 11:48:44.513148726 +0100
+++ new/custom_boot/functions.sh 2018-05-28 11:11:04.853197153 +0200
@@ -683,6 +683,19 @@
export UDEVD_PID=$(pidof $udev_bin | tr ' ' ,)
}
#======================================
+# udevModulesLoad
+#--------------------------------------
+function udevModulesLoad {
+ # /.../
+ # autoload system modules from /usr/lib/modules-load.d et al
+ # ----
+ local loadmod_bin=/usr/lib/systemd/systemd-modules-load
+ $loadmod_bin
+ # run the coldplug triggers as well
+ /usr/bin/udevadm trigger --type=subsystems --action=add
+ /usr/bin/udevadm trigger --type=devices --action=add
+}
+#======================================
# udevSystemStop
#--------------------------------------
function udevSystemStop {
@@ -764,6 +777,8 @@
# start the udev daemon
udevSystemStart
echo UDEVD_PID=$UDEVD_PID >> /iprocs
+ # trigger module loading as configured in modules-load
+ udevModulesLoad
# trigger events for all devices
udevTrigger
# wait for events to finish
@@ -2139,6 +2154,10 @@
local config_tmp=$1
local rdev=$2
local nfstab=$config_tmp/etc/fstab
+ local devicepersistency="by-uuid"
+ if [ ! -z "$kiwi_devicepersistency" ];then
+ devicepersistency=$kiwi_devicepersistency
+ fi
#======================================
# check for NFSROOT
#--------------------------------------
@@ -2154,6 +2173,18 @@
if [ ! -z "$UNIONFS_CONFIG" ]; then
echo "/dev/root / auto defaults 1 1" >> $nfstab
fi
+ #======================================
+ # check for device by DISK
+ #--------------------------------------
+ if [ ! -z "$DISK" ];then
+ if [ $devicepersistency = "by-label" ];then
+ local device="LABEL=$(blkid $rdev -s LABEL -o value)"
+ else
+ local device="UUID=$(blkid $rdev -s UUID -o value)"
+ fi
+ local filesystem=$(blkid $rdev -s TYPE -o value)
+ echo "$device / $filesystem defaults 1 1" >> $nfstab
+ fi
}
#======================================
# updateSwapDeviceFstab
@@ -4665,6 +4696,7 @@
# An information about the sizes is printed out
# ----
local IFS=$IFS_ORIG
+ waitForStorageDevice $imageDevice
haveBytes=$(partitionSize $imageDevice)
haveBytes=$((haveBytes * 1024))
haveMByte=$((haveBytes / 1048576))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/custom_boot/package/kiwi-boot-descriptions.changes
new/custom_boot/package/kiwi-boot-descriptions.changes
--- old/custom_boot/package/kiwi-boot-descriptions.changes 2018-02-08
11:48:44.529148779 +0100
+++ new/custom_boot/package/kiwi-boot-descriptions.changes 1970-01-01
01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
--------------------------------------------------------------------
-Tue Feb 6 20:30:33 CET 2018 - [email protected]
-
-- Move of kiwi boot descriptions to its own package
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-03-13
15:15:08.420947715 +0100
+++ new/custom_boot/package/kiwi-boot-descriptions.spec 2018-04-04
11:00:36.805321110 +0200
@@ -192,6 +192,17 @@
Meta package for the buildservice to pull in all required packages
for the build host to build simple disk images
+%package -n kiwi-image-tbz-requires
+Summary: KIWI - buildservice host requirements for root archive tarball
+Group: System/Management
+Provides: kiwi-image:tbz
+Requires: jing
+Requires: tar
+Requires: xz
+%description -n kiwi-image-tbz-requires
+Meta package for the buildservice to pull in all required packages
+for the build host to build root archive tarball
+
%package -n kiwi-filesystem-requires
Summary: KIWI - buildservice host requirements for filesystems
Group: System/Management
@@ -252,6 +263,9 @@
%files -n kiwi-image-vmx-requires
%defattr(-, root, root)
+%files -n kiwi-image-tbz-requires
+%defattr(-, root, root)
+
%files -n kiwi-filesystem-requires
%defattr(-, root, root)
