Hello community, here is the log from the commit of package suse-prime for openSUSE:Factory checked in at 2020-01-15 16:18:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suse-prime (Old) and /work/SRC/openSUSE:Factory/.suse-prime.new.30080 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-prime" Wed Jan 15 16:18:05 2020 rev:18 rq:764618 version:0.7.5 Changes: -------- --- /work/SRC/openSUSE:Factory/suse-prime/suse-prime.changes 2019-11-30 10:40:15.780151422 +0100 +++ /work/SRC/openSUSE:Factory/.suse-prime.new.30080/suse-prime.changes 2020-01-15 16:52:22.193403101 +0100 @@ -1,0 +2,13 @@ +Wed Jan 15 10:51:06 UTC 2020 - Stefan Dirsch <sndir...@suse.com> + +- Update to version 0.7.5 + * Runlevel switch not needed anymore + + Service only starts/stops display-manager service + - Faster switch operation + - No conflicts with services that run in runlev. 3 + - Consistence + + Removed references of target/runlevel switch + + Removed a duplicate of "systemctl stop display-manager" in + "user_logout_waiter" section + +------------------------------------------------------------------- Old: ---- SUSEPrime-0.7.4.tar.gz New: ---- SUSEPrime-0.7.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suse-prime.spec ++++++ --- /var/tmp/diff_new_pack.8K4uXj/_old 2020-01-15 16:52:22.653403317 +0100 +++ /var/tmp/diff_new_pack.8K4uXj/_new 2020-01-15 16:52:22.657403319 +0100 @@ -1,7 +1,7 @@ # # spec file for package suse-prime # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: suse-prime -Version: 0.7.4 +Version: 0.7.5 Release: 0 Summary: GPU (nvidia/intel) selection for NVIDIA optimus laptops License: SUSE-Public-Domain ++++++ SUSEPrime-0.7.4.tar.gz -> SUSEPrime-0.7.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SUSEPrime-0.7.4/prime-select.sh new/SUSEPrime-0.7.5/prime-select.sh --- old/SUSEPrime-0.7.4/prime-select.sh 2019-11-28 22:14:22.000000000 +0100 +++ new/SUSEPrime-0.7.5/prime-select.sh 2020-01-15 11:47:11.000000000 +0100 @@ -73,8 +73,7 @@ echo "boot: select default card at boot or set last used" echo "next-boot: select card ONLY for next boot, it not touches your boot preference. abort: restores next boot to default" echo "get-boot: display default card at boot" - echo "service: disable, check or restore prime-select service. Could be useful disabling service" - echo " before isolating multi-user.target to prevent service execution." + echo "service: disable, check or restore prime-select service." fi #if (( service_test == 0)); then @@ -199,17 +198,20 @@ function set_nvidia { if (( service_test == 0)); then - + if [ -f /proc/acpi/bbswitch ]; then tee /proc/acpi/bbswitch > /dev/null <<EOF ON EOF - fi + fi logging "trying switch ON nvidia: $(bbcheck)" - + currtime=$(date +"%T"); # will also load all necessary dependent modules modprobe nvidia_drm + + #waits nvidia modules properly loaded + until [ "$(journalctl --since "$currtime" | grep -E "[nvidia-drm]".*"Loading driver")" > /dev/null ]; do echo; done fi @@ -276,8 +278,10 @@ cat $conf | sed -e 's/PCI:X:X:X/'${intel_busid}'/' > /etc/X11/xorg.conf.d/90-intel.conf if (( service_test == 0)); then - - modprobe -r $nvidia_modules + + while [ "$(lsmod | grep nvidia)" > /dev/null ]; do + modprobe -r $nvidia_modules + done if [ -f /proc/acpi/bbswitch ]; then tee /proc/acpi/bbswitch > /dev/null <<EOF @@ -360,7 +364,7 @@ fi if ! [ -f /etc/prime/boot ]; then echo "last" > /etc/prime/boot - fi + fi if [ -f /etc/prime/forced_boot ]; then echo "$(cat /etc/prime/forced_boot)" > /etc/prime/current_type @@ -381,8 +385,8 @@ function logout_switch { apply_current echo "N" > /etc/prime/boot_state - logging "HotSwitch: Reaching graphical.target [ boot_state > N ]" - systemctl isolate graphical.target & + logging "HotSwitch: starting Display Manager [ boot_state > N ]" + systemctl start display-manager & systemctl stop prime-select } @@ -679,7 +683,8 @@ done logging "user_logout_waiter: X restart detected, preparing switch to $2 [ boot_state > S ]" #stopping display-manager before runlev.3 seems work faster - systemctl stop display-manager + #systemctl stop display-manager + ;; #manually_started_X_case @@ -698,8 +703,8 @@ echo $2 > /etc/prime/current_type set_user $4 - logging "HotSwitch: Reaching multi-user.target" - systemctl isolate multi-user.target & + systemctl stop display-manager + systemctl start prime-select & ;; systemd_call)