Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c3a8e7525b7621693f227c5cf9abf5a05fa713bf
commit c3a8e7525b7621693f227c5cf9abf5a05fa713bf Author: DeX77 <[email protected]> Date: Tue Feb 4 16:49:03 2014 +0100 grub2-2.00-12-x86_64 * relbump * simplify uuid generation for resume from swap: also works with llvm * and other kinds of mapping diff --git a/source/base/grub2/FrugalBuild b/source/base/grub2/FrugalBuild index b3665ad..1b69759 100644 --- a/source/base/grub2/FrugalBuild +++ b/source/base/grub2/FrugalBuild @@ -4,7 +4,7 @@ pkgname=grub2 _F_archive_name=grub pkgver=2.00 -pkgrel=11 +pkgrel=12 pkgdesc="The GNU GRand Unified Bootloader" url="http://www.gnu.org/software/grub/"; rodepends=('grub-theme-frugalware' 'scriptlet-core') diff --git a/source/base/grub2/grub2-frugalware-config.patch b/source/base/grub2/grub2-frugalware-config.patch index e8b17f2..48dd671 100644 --- a/source/base/grub2/grub2-frugalware-config.patch +++ b/source/base/grub2/grub2-frugalware-config.patch @@ -20,7 +20,7 @@ diff -ur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in + _device=$(echo $line | cut -f 1 -d ' ') + _type=$(echo $line | cut -f 2 -d ' ') + [ "$_type" != "partition" ] && continue -+ _uuid=$(blkid | grep -m 1 "^$_device:" | sed -rn 's|.*UUID="([^"]+)".*|\1|p') ++ _uuid=$(blkid $_device | sed -rn 's|.*UUID="([^"]+)".*|\1|p') + _resume="resume=UUID=$_uuid" + break +done << EOF _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
