Merge branch 'openelec-next' of github.com:OpenELEC/OpenELEC.tv into openelec-eden

This commit is contained in:
Stephan Raue 2011-08-08 12:13:14 +02:00
commit 85207e25c8
7 changed files with 22 additions and 10 deletions

View File

@ -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
}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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