Hello community,
here is the log from the commit of package kiwi-boot-descriptions for
openSUSE:Factory checked in at 2019-03-05 12:16:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-boot-descriptions (Old)
and /work/SRC/openSUSE:Factory/.kiwi-boot-descriptions.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-boot-descriptions"
Tue Mar 5 12:16:20 2019 rev:7 rq:679469 version:1.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-boot-descriptions/kiwi-boot-descriptions.changes
2018-10-15 10:05:06.601944522 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-boot-descriptions.new.28833/kiwi-boot-descriptions.changes
2019-03-05 12:16:28.093004176 +0100
@@ -1,0 +2,27 @@
+Mon Jan 7 10:33:48 UTC 2019 - [email protected]
+
+- Fallback to sulogin if setctsid is missing
+
+-------------------------------------------------------------------
+Mon Jan 7 10:33:19 UTC 2019 - [email protected]
+
+- Use setctsid/bash instead of sulogin for debugging
+
+ The custom kiwi boot descriptions supports a boot process
+ accompanying debug shell if the kiwidebug=1 option is
+ set on the kernel command line. That shell was invoked
+ using sulogin. Problem is that this call occupies the
+ controlling terminal and console such that the typical
+ multiplexing of consoles through plymouth is stopped.
+ This means it's not possible to run e.g an oem deployment
+ with several active/multiplexed consoles and a backgrounding
+ debuging shell. This patch moves away from sulogin and
+ calls a bash through setctsid on a free console
+
+-------------------------------------------------------------------
+Mon Dec 17 11:36:13 UTC 2018 - [email protected]
+
+- Fixed console multiplexer when dialogs get displayed.
+ https://github.com/SUSE/kiwi-descriptions/pull/30
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-boot-descriptions.spec ++++++
--- /var/tmp/diff_new_pack.DFeBKM/_old 2019-03-05 12:16:32.273002875 +0100
+++ /var/tmp/diff_new_pack.DFeBKM/_new 2019-03-05 12:16:32.273002875 +0100
@@ -14,9 +14,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
-#
%if 0%{?fedora}
%global debug_package %{nil}
%endif
@@ -100,7 +97,7 @@
Release: 0
Url: https://github.com/SUSE/kiwi-descriptions
Summary: KIWI - Custom Boot Descriptions
-License: GPL-3.0-or-later
+License: GPL-3.0+
Group: System/Management
Source: %{name}.tar.gz
Source1: kiwi-boot-packages
@@ -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
@@ -163,7 +159,6 @@
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
@@ -172,9 +167,9 @@
Summary: KIWI - buildservice host requirements for oem images
Group: System/Management
Provides: kiwi-image:oem
-Requires: jing
Requires: kiwi-filesystem-requires
-
+Requires: jing
+Requires: syslinux
%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
@@ -183,9 +178,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
@@ -194,9 +188,8 @@
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
@@ -208,7 +201,6 @@
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
@@ -221,8 +213,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
++++++ 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-09-20 10:37:45.557901243 +0200
+++ new/custom_boot/functions.sh 2019-01-07 11:31:31.101736304 +0100
@@ -120,11 +120,10 @@
# hook called at the end of this function
# ----
local IFS=$IFS_ORIG
- test -e /proc/splash && echo verbose > /proc/splash
if lookup plymouthd &>/dev/null;then
- plymouth hide-splash
- # reset tty after plymouth messed with it
- consoleInit
+ if [ "$(activeConsoles)" -lt "2" ]; then
+ plymouth hide-splash
+ fi
fi
runHook handleSplash "$@"
}
@@ -336,7 +335,7 @@
Echo "ssh root@${IPADDR}"
fi
echo reset > /root/.bashrc
- sulogin -e -p $ttydev
+ sulogin --force --login-shell $ttydev
;;
"user_reboot")
Echo "reboot triggered by user"
@@ -5627,7 +5626,11 @@
return
fi
Echo "Starting boot shell on $ELOG_BOOTSHELL"
- sulogin -e -p $ELOG_BOOTSHELL &
+ if lookup setctsid &>/dev/null;then
+ setctsid -f $ELOG_BOOTSHELL /bin/bash
+ else
+ sulogin --force --login-shell $ELOG_BOOTSHELL &
+ fi
sleep 2
ELOGSHELL_PID=$(fuser $ELOG_BOOTSHELL | tr -d " ")
echo ELOGSHELL_PID=$ELOGSHELL_PID >> /iprocs
@@ -7357,7 +7360,6 @@
local dialog_code=/tmp/dialog_code
hideSplash
cat > $dialog_call <<- EOF
- reset
dialog \
--ok-label "$TEXT_OK" \
--cancel-label "$TEXT_CANCEL" \
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-09-10
12:30:28.880304509 +0200
+++ new/custom_boot/package/kiwi-boot-descriptions.spec 2018-10-16
09:28:14.705811406 +0200
@@ -169,6 +169,7 @@
Provides: kiwi-image:oem
Requires: kiwi-filesystem-requires
Requires: jing
+Requires: syslinux
%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
