From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SoI7s-0007TP-R8 for garchives@archives.gentoo.org; Mon, 09 Jul 2012 17:52:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0CAEE06AF; Mon, 9 Jul 2012 17:51:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C45FCE06AF for ; Mon, 9 Jul 2012 17:51:53 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 336291B4005 for ; Mon, 9 Jul 2012 17:51:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EBC7DE5433 for ; Mon, 9 Jul 2012 17:51:51 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1341856226.51dcb157423d660f652e44a795cfb9a51724ad1e.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: /, defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog defaults/initrd.scripts X-VCS-Directories: / defaults/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 51dcb157423d660f652e44a795cfb9a51724ad1e X-VCS-Branch: master Date: Mon, 9 Jul 2012 17:51:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f1235307-4fd8-4f57-9653-b2764732f649 X-Archives-Hash: c28d2c872962c2882b839119bf1a6e7c commit: 51dcb157423d660f652e44a795cfb9a51724ad1e Author: Sebastian Pipping pipping org> AuthorDate: Mon Jul 9 17:47:21 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Mon Jul 9 17:50:26 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D51dcb157 Restore previous handling of real_root due to report of regressions (bug = #419965) This reverts commit f95264added35c25fb557931116edd3cd0aec7ba. Conflicts: defaults/initrd.scripts --- ChangeLog | 4 ++++ defaults/initrd.scripts | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42b6f7c..21e7fdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ =20 + 09 Jul 2012; Sebastian Pipping defaults/initrd.scri= pts: + Restore previous handling of real_root due to report of regressions (b= ug + #419965) + 08 Jul 2012; Sebastian Pipping genkernel: Bump version to 3.4.37 =20 diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index f05a746..258f2bd 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -751,19 +751,16 @@ openLUKS() { # please use 'tr' and this line, or remove it # eval local TYPE=3D`uppercase $1` =20 - local LUKS_NAME=3D"$1" - case $1 in root) local TYPE=3DROOT - [ -n "${REAL_ROOT}" ] && local LUKS_NAME=3D"`echo "${REAL_ROOT}" | se= d -e 's|.*/||'`" ;; swap) local TYPE=3DSWAP ;; esac =20 - eval local LUKS_DEVICE=3D'"${CRYPT_'${TYPE}'}"' LUKS_NAME=3D"$LUKS_NAME= " LUKS_KEY=3D'"${CRYPT_'${TYPE}'_KEY}"' LUKS_KEYDEV=3D'"${CRYPT_'${TYPE}'= _KEYDEV}"' LUKS_TRIM=3D'"${CRYPT_'${TYPE}'_TRIM}"' + eval local LUKS_DEVICE=3D'"${CRYPT_'${TYPE}'}"' LUKS_NAME=3D"$1" LUKS_K= EY=3D'"${CRYPT_'${TYPE}'_KEY}"' LUKS_KEYDEV=3D'"${CRYPT_'${TYPE}'_KEYDEV}= "' LUKS_TRIM=3D'"${CRYPT_'${TYPE}'_TRIM}"' local DEV_ERROR=3D0 KEY_ERROR=3D0 KEYDEV_ERROR=3D0 local mntkey=3D"/mnt/key/" cryptsetup_options=3D'' =20