diff options
| author |   Sebastian Pipping <sebastian@pipping.org> | 2011-01-30 18:12:33 +0100 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2011-01-30 18:12:33 +0100 |
| commit | 15b4869f5061f152da3b5c2fd04b3567767abbd6 (patch) | |
| tree | 9796fadf431675ce14256a1a108b6f0fcb6d6bd4 | |
| parent | Enable CONFIG_USB_SUSPEND and CONFIG_PM_RUNTIME for x86_64 using "make menuco... (diff) | |
| parent | Bump version to 3.4.12.4 (diff) | |
| download | genkernel-15b4869f5061f152da3b5c2fd04b3567767abbd6.tar.gz genkernel-15b4869f5061f152da3b5c2fd04b3567767abbd6.tar.bz2 genkernel-15b4869f5061f152da3b5c2fd04b3567767abbd6.zip | |
Merge branch 'master' into experimental
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rwxr-xr-x | genkernel | 2 | ||||
| -rw-r--r-- | netboot/busy-config | 6 | ||||
| -rwxr-xr-x | netboot/linuxrc.x | 4 |
4 files changed, 18 insertions, 4 deletions
@@ -5,6 +5,16 @@ # Distributed under the GPL v2 # $Id$ + 30 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel: + Bump version to 3.4.12.4 + + 30 Jan 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog: + Enhance console handling on netboot linuxrc (bug #353084) + Enable shadow on netboot's busybox config (bug #353085) + + Special thanks: + - Raúl Porcel + 29 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel: Bump version to 3.4.12.3 @@ -2,7 +2,7 @@ # $Id$ PATH="${PATH}:/sbin:/usr/sbin" -GK_V='3.4.12.3' +GK_V='3.4.12.4' # Set the default for TMPDIR. May be modified by genkernel.conf or the # --tempdir command line option. diff --git a/netboot/busy-config b/netboot/busy-config index 0691ff0..2aa4804 100644 --- a/netboot/busy-config +++ b/netboot/busy-config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.7.4 -# Thu Apr 16 15:04:31 2009 +# Tue Apr 13 21:28:34 2010 # CONFIG_HAVE_DOT_CONFIG=y @@ -372,8 +372,8 @@ CONFIG_MESG=y # Login/Password Management Utilities # CONFIG_FEATURE_SHADOWPASSWDS=y -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_PWD_GRP is not set +CONFIG_USE_BB_SHADOW=y +CONFIG_USE_BB_PWD_GRP=y # CONFIG_ADDGROUP is not set # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set # CONFIG_DELGROUP is not set diff --git a/netboot/linuxrc.x b/netboot/linuxrc.x index 8586ff6..dc4a9bf 100755 --- a/netboot/linuxrc.x +++ b/netboot/linuxrc.x @@ -14,6 +14,10 @@ BasicSetup() { CPYYEAR="$(echo ${MYDATE} | cut -c 1-4)" BBDATE="$(echo ${MYDATE} | cut -c 5-8)$(echo ${MYDATE} | cut -c 1-4)" DISDATE="$(echo ${MYDATE} | cut -c 7-8) $(echo ${MYDATE} | cut -c 5-6) $(echo ${MYDATE} | cut -c 1-4)" + + . /etc/initrd.defaults + # Clean input/output + exec >${CONSOLE} <${CONSOLE} 2>&1 } #//-------------------------------------------------------------------------------- |