diff --git a/config/functions b/config/functions index c7bb854ba8..dad3e96545 100644 --- a/config/functions +++ b/config/functions @@ -92,7 +92,16 @@ add_user() { mkdir -p ${INSTALL}/etc touch ${INSTALL}/etc/passwd if [ -z "`grep "$1:" ${INSTALL}/etc/passwd`" ]; then - echo "$1:$2:$3:$4:$5:$6:$7" >> ${INSTALL}/etc/passwd + echo "$1:x:$3:$4:$5:$6:$7" >> ${INSTALL}/etc/passwd + fi + + touch ${INSTALL}/etc/shadow + PASSWORD="$2" + if [ "$PASSWORD" = "x" ]; then + PASSWORD="*" + fi + if [ -z "`grep "$1:" ${INSTALL}/etc/shadow`" ]; then + echo "$1:$PASSWORD:::::::" >> ${INSTALL}/etc/shadow fi } diff --git a/packages/network/openssh/config/sshd_config b/packages/network/openssh/config/sshd_config index c382be2d32..c6c33776f9 100644 --- a/packages/network/openssh/config/sshd_config +++ b/packages/network/openssh/config/sshd_config @@ -32,6 +32,7 @@ HostKey ~/.cache/ssh/ssh_host_dsa_key # Logging # obsoletes QuietMode and FascistLogging #SyslogFacility AUTH +SyslogFacility AUTHPRIV #LogLevel INFO # Authentication: @@ -106,7 +107,7 @@ HostKey ~/.cache/ssh/ssh_host_dsa_key #ChrootDirectory none # no default banner path -#Banner none +Banner /etc/issue # override default of no subsystems Subsystem sftp /usr/libexec/sftp-server diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index 7bbe59f996..278abe0024 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.18.5 -# Sat Aug 6 19:21:09 2011 +# Sun Aug 7 23:33:27 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -432,9 +432,9 @@ CONFIG_INIT_TERMINAL_TYPE="" # # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set -# CONFIG_FEATURE_SHADOWPASSWDS is not set +CONFIG_FEATURE_SHADOWPASSWDS=y CONFIG_USE_BB_PWD_GRP=y -# CONFIG_USE_BB_SHADOW is not set +CONFIG_USE_BB_SHADOW=y CONFIG_USE_BB_CRYPT=y CONFIG_USE_BB_CRYPT_SHA=y # CONFIG_ADDUSER is not set diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index 495e6ff12a..8cd9fde3a5 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -45,6 +45,7 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`" mkdir -p $INSTALL/etc cp $PKG_DIR/config/profile $INSTALL/etc cp $PKG_DIR/config/httpd.conf $INSTALL/etc + echo "chmod 000 $INSTALL/etc/shadow" >> $FAKEROOT_SCRIPT # /etc/fstab is needed by... touch $INSTALL/etc/fstab diff --git a/packages/sysutils/busybox/profile.d/shell.conf b/packages/sysutils/busybox/profile.d/shell.conf index 3e71edd8f9..947cfe2ecc 100644 --- a/packages/sysutils/busybox/profile.d/shell.conf +++ b/packages/sysutils/busybox/profile.d/shell.conf @@ -24,5 +24,7 @@ ################################################################################ PS1='\[\e[0;32m\]\u\[\e[m\] \[\e[1;34m\]\w\[\e[m\] \[\e[1;32m\]\$\[\e[m\] \[\e[1;37m\]' - export PS1 + +TERM="xterm" +export TERM \ No newline at end of file diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index a8ef205ed3..437a114493 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -2190,7 +2190,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=2 CONFIG_SND_HDA_INPUT_JACK=y CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_CODEC_REALTEK=y -# CONFIG_SND_HDA_CODEC_ANALOG is not set +CONFIG_SND_HDA_CODEC_ANALOG=y # CONFIG_SND_HDA_CODEC_SIGMATEL is not set CONFIG_SND_HDA_CODEC_VIA=y CONFIG_SND_HDA_CODEC_HDMI=y diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index d0e07c94a8..cdda19af5c 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.0 Kernel Configuration +# Linux/x86_64 3.0.1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -750,7 +750,6 @@ CONFIG_MISC_DEVICES=y # CONFIG_TIFM_CORE is not set # CONFIG_ICS932S401 is not set # CONFIG_ENCLOSURE_SERVICES is not set -# CONFIG_CS5535_MFGPT is not set # CONFIG_HP_ILO is not set # CONFIG_APDS9802ALS is not set # CONFIG_ISL29003 is not set @@ -2132,7 +2131,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=2 CONFIG_SND_HDA_INPUT_JACK=y CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_CODEC_REALTEK=y -# CONFIG_SND_HDA_CODEC_ANALOG is not set +CONFIG_SND_HDA_CODEC_ANALOG=y # CONFIG_SND_HDA_CODEC_SIGMATEL is not set CONFIG_SND_HDA_CODEC_VIA=y CONFIG_SND_HDA_CODEC_HDMI=y