From 5eb9c5cc9aa91da4a66e1aea0c4e3e0b2b3a5db0 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Wed, 5 Aug 2009 08:22:53 -0500 Subject: [PATCH 1/7] This is genkernel 3.4.10.906 --- ChangeLog | 3 +++ genkernel | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1e16904..f60d2f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ # Distributed under the GPL v2 # $Id$ + 05 Aug 2009; Andrew Gaffney genkernel: + This is genkernel 3.4.10.906 + 25 Jul 2009; Chris Gianelloni genkernel.conf, .gitattributes: Adding Id header and Ident for genkernel.conf diff --git a/genkernel b/genkernel index 9b9b300..ac3237f 100755 --- a/genkernel +++ b/genkernel @@ -2,7 +2,7 @@ # $Id$ PATH="${PATH}:/sbin:/usr/sbin" -GK_V='3.4.10.905' +GK_V='3.4.10.906' # Set the default for TMPDIR. May be modified by genkernel.conf or the # --tempdir command line option. From 1831b40cbff79b8760cfa1930c3b01d1a1b182f6 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Fri, 14 Aug 2009 09:52:18 -0500 Subject: [PATCH 2/7] Enable DISKLABEL=yes by default --- ChangeLog | 3 +++ genkernel.conf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f60d2f4..d7a40d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ # Distributed under the GPL v2 # $Id$ + 14 Aug 2009; Andrew Gaffney genkernel.conf: + Enable DISKLABEL=yes by default + 05 Aug 2009; Andrew Gaffney genkernel: This is genkernel 3.4.10.906 diff --git a/genkernel.conf b/genkernel.conf index 7a726d0..1995b88 100644 --- a/genkernel.conf +++ b/genkernel.conf @@ -78,7 +78,7 @@ USECOLOR="yes" # FIRMWARE_FILES="" # Enable disklabel support (copies blkid to initrd) -# DISKLABEL="yes" +DISKLABEL="yes" # Add new kernel to grub? # BOOTLOADER="grub" From 588ef85661999d2cbb7d463d20b8ba48cb37d3a4 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Fri, 4 Sep 2009 23:43:08 -0500 Subject: [PATCH 3/7] Apply patch from Gentoo bug #220913 for tuxonice resume --- ChangeLog | 4 ++++ defaults/initrd.scripts | 31 ++++++++++++++++++++++++++----- defaults/linuxrc | 6 ++---- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7a40d7..c2df1c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ # Distributed under the GPL v2 # $Id$ + 05 Sep 2009; Andrew Gaffney defaults/initrd.scripts, + defaults/linuxrc: + Apply patch from Gentoo bug #220913 for tuxonice resume + 14 Aug 2009; Andrew Gaffney genkernel.conf: Enable DISKLABEL=yes by default diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 66130ae..4c233bb 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -856,24 +856,30 @@ rundebugshell() { fi } +do_resume() { + if [ -d /proc/suspend2 -o -d /sys/power/suspend2 -o -d /sys/power/tuxonice ]; then + tuxonice_resume + else + swsusp_resume + fi +} + swsusp_resume() { # determine swap resume partition local device=$(ls -lL "${REAL_RESUME}" | sed 's/\ */ /g' | cut -d \ -f 5-6 | sed 's/,\ */:/') [ -f /sys/power/resume ] && echo "${device}" > /sys/power/resume - return 0 } tuxonice_resume() { - [ -d /proc/suspend2 -o -d /sys/power/suspend2 -o -d /sys/power/tuxonice ] || return - local splash_theme - if grep "splash=" /proc/cmdline > /dev/null 2>&1; then splash_theme=$(cat /proc/cmdline | sed 's/.*splash=/splash=/' | sed 's/ .*//' | sed 's/.*theme://' | sed 's/,.*//') fi local tuxonice_userui_program="/sys/power/tuxonice/user_interface/program" local tuxonice_do_resume="/sys/power/tuxonice/do_resume" + local tuxonice_resumedev="/sys/power/tuxonice/resume" + local tuxonice_replace_swsusp="/sys/power/tuxonice/replace_swsusp" # # Backward compatibility @@ -881,13 +887,27 @@ tuxonice_resume() { if [ -e /sys/power/suspend2 ]; then tuxonice_userui_program="/sys/power/suspend2/user_interface/program" tuxonice_do_resume="/sys/power/suspend2/do_resume" + tuxonice_resumedev="/sys/power/suspend2/resume" + tuxonice_replace_swsusp="/sys/power/suspend2/replace_swsusp" elif [ -e /proc/suspend2 ]; then tuxonice_userui_program="/proc/suspend2/userui_program" tuxonice_do_resume="/proc/suspend2/do_resume" + tuxonice_resumedev="/proc/suspend2/resume" + tuxonice_replace_swsusp="/proc/suspend2/replace_swsusp" + fi + + # if 'use_swsusp' is given, use swsusp instead + if grep "use_swsusp" /proc/cmdline > /dev/null 2>&1; then + echo 0 > ${tuxonice_replace_swsusp} + swsusp_resume + return fi modules_scan tuxonice + # we both configure tuxonice and activate resuming, + # however the kernel will resume only if an image is found + if ! grep suspend_noui /proc/cmdline > /dev/null 2>&1; then which suspend2ui_text > /dev/null 2>&1 && which suspend2ui_text > "${tuxonice_userui_program}" which tuxoniceui_text > /dev/null 2>&1 && which tuxoniceui_text > "${tuxonice_userui_program}" @@ -900,8 +920,9 @@ tuxonice_resume() { which tuxoniceui_fbsplash > /dev/null 2>&1 && which tuxoniceui_fbsplash > "${tuxonice_userui_program}" fi - echo > "${tuxonice_do_resume}" fi + echo "${REAL_RESUME}" > "${tuxonice_resumedev}" + echo > "${tuxonice_do_resume}" } find_loop() { diff --git a/defaults/linuxrc b/defaults/linuxrc index 3fac6ad..e109534 100755 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -167,7 +167,7 @@ do swap_keydev\=*) CRYPT_SWAP_KEYDEV=`parse_opt "${x}"` ;; - real_resume\=*) + real_resume\=*|resume\=*) REAL_RESUME=`parse_opt "${x}"` ;; noresume) @@ -299,9 +299,7 @@ then ;; esac - swsusp_resume -# suspend_resume - tuxonice_resume + do_resume fi fi From 5539d255345057a79c832c3f79edcb571ff66828 Mon Sep 17 00:00:00 2001 From: tsunam Date: Mon, 21 Sep 2009 11:12:08 -0700 Subject: [PATCH 4/7] Updating some multipath code from Gentoo bug #284589 --- ChangeLog | 3 +++ gen_initramfs.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c2df1c4..c4aaee6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ # Distributed under the GPL v2 # $Id$ + 21 Sep 2009; gen_initramfs.sh: + Update to fix broken initramfs caused by multipath config in Gentoo bug #284589 + 05 Sep 2009; Andrew Gaffney defaults/initrd.scripts, defaults/linuxrc: Apply patch from Gentoo bug #220913 for tuxonice resume diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 2ad0deb..4654eef 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -166,7 +166,7 @@ append_multipath(){ then cp /etc/scsi_id.config "${TEMP}/initramfs-multipath-temp/etc/" || gen_die 'could not copy scsi_id.config' fi - cd "${TEMP/initramfs-multipath-temp/}" + cd "${TEMP}/initramfs-multipath-temp" find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" rm -r "${TEMP}/initramfs-multipath-temp/" } From 494f9c1d7b251534d5376591ca1f320b4420fa7e Mon Sep 17 00:00:00 2001 From: tsunam Date: Mon, 21 Sep 2009 11:27:02 -0700 Subject: [PATCH 5/7] Should have all the proper libraries now for multipath for Gentoo bug #284592 --- ChangeLog | 3 +++ gen_initramfs.sh | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c4aaee6..1847e21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ # Distributed under the GPL v2 # $Id$ + 21 Sep 2009; gen_initramfs.sh: + Fix broken libraries for multipath per Gentoo bug #284592 + 21 Sep 2009; gen_initramfs.sh: Update to fix broken initramfs caused by multipath config in Gentoo bug #284589 diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 4654eef..3aa5d1b 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -138,12 +138,18 @@ append_multipath(){ mkdir -p "${TEMP}/initramfs-multipath-temp/lib/" # Copy files to /lib - for i in /lib/{ld-*,libc-*,libc.*,libdl-*,libdl.*,libsysfs*so*,libdevmapper*so*} + for i in /lib/{ld-*,libc-*,libc.*,libdl-*,libdl.*,libsysfs*so*,libdevmapper*so*,libpthread*,librt*,libreadline*,libncurses*} do cp -a "${i}" "${TEMP}/initramfs-multipath-temp/lib" \ || gen_die "Could not copy file ${i} for MULTIPATH" done + for i in /usr/lib/{libaio*} + do + cp -a "${i}" "${TEMP}/initramfs-multipath-temp/lib" \ + || gen_die "Could not copy file ${i} for MULTIPATH" + done + # Copy files to /sbin for i in /sbin/{multipath,kpartx,mpath_prio_*,devmap_name,dmsetup} /lib64/udev/scsi_id do From 98831e77bad16c4d32fae6fc1915d97c53786f24 Mon Sep 17 00:00:00 2001 From: tsunam Date: Tue, 22 Sep 2009 07:36:32 -0700 Subject: [PATCH 6/7] fixing the libaio search as its a singular element not part of a multipart search --- gen_initramfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 3aa5d1b..2809f61 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -144,7 +144,7 @@ append_multipath(){ || gen_die "Could not copy file ${i} for MULTIPATH" done - for i in /usr/lib/{libaio*} + for i in /usr/lib/libaio* do cp -a "${i}" "${TEMP}/initramfs-multipath-temp/lib" \ || gen_die "Could not copy file ${i} for MULTIPATH" From cf1570f74262fb066d540715d582e06663fa837b Mon Sep 17 00:00:00 2001 From: tsunam Date: Tue, 22 Sep 2009 07:41:15 -0700 Subject: [PATCH 7/7] updating the changelog is good k --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1847e21..43d2c11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ # Distributed under the GPL v2 # $Id$ + 22 Sep 2009; ChangeLog: + modified the libaio search so it'll actually work, cause I'm a dork + 21 Sep 2009; gen_initramfs.sh: Fix broken libraries for multipath per Gentoo bug #284592