Merge branch 'master' into experimental

cleanup-cruft
Sebastian Pipping 14 years ago
commit 15b4869f50

@ -5,6 +5,16 @@
# Distributed under the GPL v2 # Distributed under the GPL v2
# $Id$ # $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: 29 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
Bump version to 3.4.12.3 Bump version to 3.4.12.3

@ -2,7 +2,7 @@
# $Id$ # $Id$
PATH="${PATH}:/sbin:/usr/sbin" 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 # Set the default for TMPDIR. May be modified by genkernel.conf or the
# --tempdir command line option. # --tempdir command line option.

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Busybox version: 1.7.4 # Busybox version: 1.7.4
# Thu Apr 16 15:04:31 2009 # Tue Apr 13 21:28:34 2010
# #
CONFIG_HAVE_DOT_CONFIG=y CONFIG_HAVE_DOT_CONFIG=y
@ -372,8 +372,8 @@ CONFIG_MESG=y
# Login/Password Management Utilities # Login/Password Management Utilities
# #
CONFIG_FEATURE_SHADOWPASSWDS=y CONFIG_FEATURE_SHADOWPASSWDS=y
# CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_SHADOW=y
# CONFIG_USE_BB_PWD_GRP is not set CONFIG_USE_BB_PWD_GRP=y
# CONFIG_ADDGROUP is not set # CONFIG_ADDGROUP is not set
# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
# CONFIG_DELGROUP is not set # CONFIG_DELGROUP is not set

@ -14,6 +14,10 @@ BasicSetup() {
CPYYEAR="$(echo ${MYDATE} | cut -c 1-4)" CPYYEAR="$(echo ${MYDATE} | cut -c 1-4)"
BBDATE="$(echo ${MYDATE} | cut -c 5-8)$(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)" 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
} }
#//-------------------------------------------------------------------------------- #//--------------------------------------------------------------------------------

Loading…
Cancel
Save