commit suspend for openSUSE:12.3
Hello community, here is the log from the commit of package suspend for openSUSE:12.3 checked in at 2013-02-26 15:25:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/suspend (Old) and /work/SRC/openSUSE:12.3/.suspend.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "suspend", Maintainer is "trenn@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/suspend/suspend.changes 2013-01-31 01:39:04.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.suspend.new/suspend.changes 2013-02-26 15:25:15.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 25 22:36:11 UTC 2013 - jslaby@suse.com + +- fix path to resume, it's in /usr/sbin (bnc#802882) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suspend.spec ++++++ --- /var/tmp/diff_new_pack.YEWPXS/_old 2013-02-26 15:25:15.000000000 +0100 +++ /var/tmp/diff_new_pack.YEWPXS/_new 2013-02-26 15:25:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package suspend # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ mkinitrd-boot.kernel.sh ++++++ --- /var/tmp/diff_new_pack.YEWPXS/_old 2013-02-26 15:25:15.000000000 +0100 +++ /var/tmp/diff_new_pack.YEWPXS/_new 2013-02-26 15:25:15.000000000 +0100 @@ -21,7 +21,7 @@ # Verify manual resume mode if [ "$resume_mode" != "off" -a -n "$resumedev" ]; then - if [ -x /sbin/resume -o -w /sys/power/resume ]; then + if [ -x /usr/sbin/resume -o -w /sys/power/resume ]; then echo "Trying manual resume from $resumedev" resume_mode=1 else ++++++ mkinitrd-boot.userspace.sh ++++++ --- /var/tmp/diff_new_pack.YEWPXS/_old 2013-02-26 15:25:15.000000000 +0100 +++ /var/tmp/diff_new_pack.YEWPXS/_new 2013-02-26 15:25:15.000000000 +0100 @@ -5,7 +5,7 @@ #%depends: dump # #%if: -x /usr/sbin/resume -o -x /sbin/resume -#%programs: /sbin/resume +#%programs: /usr/sbin/resume # ##### software suspend resume ## @@ -24,7 +24,7 @@ # Verify manual resume mode if [ "$resume_mode" != "off" -a -n "$resumedev" ]; then - if [ -x /sbin/resume -o -w /sys/power/resume ]; then + if [ -x /usr/sbin/resume -o -w /sys/power/resume ]; then echo "Trying manual resume from $resumedev" resume_mode=1 else @@ -43,16 +43,16 @@ fi # Waits for the resume device to appear if [ "$resume_mode" != "off" ]; then - if [ -x /sbin/resume ]; then + if [ -x /usr/sbin/resume ]; then echo "Invoking userspace resume from $resumedev" [ -f /proc/splash ] && read procsplash < /proc/splash case "$procsplash" in *silent*) # if the version of "resume" is not new enough, "-P" will fail. - /sbin/resume -P 'splash = y' $resumedev || /sbin/resume $resumedev + /usr/sbin/resume -P 'splash = y' $resumedev || /usr/sbin/resume $resumedev ;; *) - /sbin/resume -P 'splash = n' $resumedev || /sbin/resume $resumedev + /usr/sbin/resume -P 'splash = n' $resumedev || /usr/sbin/resume $resumedev ;; esac fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de