| 1 |
commit: 8071dca45640168787ef1f0793301f7c871da088 |
| 2 |
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org> |
| 3 |
AuthorDate: Fri Mar 30 17:32:40 2012 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 30 17:32:40 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=8071dca4 |
| 7 |
|
| 8 |
Merge branch 'fix-docache' |
| 9 |
|
| 10 |
Conflicts: |
| 11 |
ChangeLog |
| 12 |
|
| 13 |
|
| 14 |
ChangeLog | 4 ++++ |
| 15 |
defaults/initrd.scripts | 5 ++--- |
| 16 |
defaults/linuxrc | 7 ++++++- |
| 17 |
3 files changed, 12 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --cc ChangeLog |
| 20 |
index a1a3aab,f83809b..912f7b7 |
| 21 |
--- a/ChangeLog |
| 22 |
+++ b/ChangeLog |
| 23 |
@@@ -5,24 -5,10 +5,28 @@@ |
| 24 |
# Distributed under the GPL v2 |
| 25 |
# $Id$ |
| 26 |
|
| 27 |
- 17 Mar 2012; Sebastian Pipping <sping@g.o> defaults/initrd.scripts, |
| 28 |
+ 29 Mar 2012; Sebastian Pipping <sping@g.o> defaults/initrd.scripts: |
| 29 |
+ Restore original /dev/tty after GPG (bug #410073), report and initial patch |
| 30 |
+ by Brendan Pike |
| 31 |
+ |
| 32 |
+ 22 Mar 2012; Sebastian Pipping <sping@g.o> genkernel: |
| 33 |
+ Bump version to 3.4.27 |
| 34 |
+ |
| 35 |
+ 22 Mar 2012; Sebastian Pipping <sping@g.o> gen_initramfs.sh: |
| 36 |
+ Fail hard on LUKS inclusion error (bug #409277), advise about |
| 37 |
+ sys-fs/cryptsetup[static], drop support for cryptsetup binary from /bin/ |
| 38 |
+ |
| 39 |
+ 22 Mar 2012; Sebastian Pipping <sping@g.o> gen_funcs.sh, |
| 40 |
+ gen_initramfs.sh: |
| 41 |
+ Make errors stand out more |
| 42 |
+ |
| 43 |
++ 22 Mar 2012; Sebastian Pipping <sping@g.o> defaults/initrd.scripts, |
| 44 |
+ defaults/linuxrc: |
| 45 |
+ Fix docache (bug #397309) |
| 46 |
+ |
| 47 |
+ 22 Mar 2012; Sebastian Pipping <sping@g.o> genkernel: |
| 48 |
+ Bump version to 3.4.26 |
| 49 |
+ |
| 50 |
16 Mar 2012; Sebastian Pipping <sping@g.o> defaults/initrd.scripts, |
| 51 |
defaults/linuxrc: |
| 52 |
Drop into debug shell when squashfs could not be mounted |
Archives