From: Andrew Gaffney Date: Tue, 12 May 2009 22:53:27 +0000 (-0500) Subject: Apply fix to deference links for gentoo bug #269603 X-Git-Tag: v3.4.10.905~5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8b3093a153bbf97849f319b310c037fd84016ed0;p=genkernel.git Apply fix to deference links for gentoo bug #269603 --- diff --git a/ChangeLog b/ChangeLog index 1d69360..7ff705e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) # Distributed under the GPL v2 + 12 May 2009; Andrew Gaffney arch/x86/modules_load, + defaults/initrd.scripts: + Apply fix to deference links for gentoo bug #269603 + + 09 May 2009; Andrew Gaffney arch/x86/modules_load: + foo + 09 May 2009; Andrew Gaffney arch/x86/modules_load, arch/x86_64/modules_load: Add dm-crypt module for gentoo bug #269042 diff --git a/arch/x86/modules_load b/arch/x86/modules_load index a70d531..e480050 100644 --- a/arch/x86/modules_load +++ b/arch/x86/modules_load @@ -1,3 +1,4 @@ + # Module groups for genkernel initramfs auto-loading # RAID diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index ae22dd5..b63568d 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -858,7 +858,7 @@ rundebugshell() { swsusp_resume() { # determine swap resume partition - local device=$(ls -l "${REAL_RESUME}" | sed 's/\ */ /g' | cut -d \ -f 6-7 | sed 's/,\ */:/') + local device=$(ls -Ll "${REAL_RESUME}" | sed 's/\ */ /g' | cut -d \ -f 6-7 | sed 's/,\ */:/') [ -f /sys/power/resume ] && echo "${device}" > /sys/power/resume return 0 }