From 5da770377ec5f58cb2ca3183647f13d7d8c026e6 Mon Sep 17 00:00:00 2001 From: arrow_zhang Date: Thu, 5 Jun 2008 10:03:45 +0800 Subject: [PATCH] [UP] sync acer --- .gitignore | 3 + conf_slk120/bash/.bashrc | 5 +- conf_slk120/fonts/etc_X11_fs_config | 2 +- conf_slk120/fonts/fonts.conf | 2 +- conf_slk120/rest/.arrowwrite | 3 + conf_slk120/ssh/Makefile | 3 +- conf_slk120/ssh/sshd_config | 113 ++++++++++++++++++++++++++++++++++++ conf_slk120/xinit/.xinitrc | 1 + conf_slk120/xorg/xorg.conf.ACER | 4 +- 9 files changed, 130 insertions(+), 6 deletions(-) create mode 100644 conf_slk120/ssh/sshd_config diff --git a/.gitignore b/.gitignore index 5cd4e0c..8482f04 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ *.o.cmd *.ko.cmd *.mod.c +*~ Module.symvers .tmp_versions @@ -13,6 +14,7 @@ conf_slk120/fvwm/.FvwmConsole-History conf_slk120/bin/.bin/shell/fortune conf_slk120/ssh/.ssh/known_hosts +conf_slk120/ssh/.ssh/authorized_keys mysql/test/compile ncurses/attr @@ -23,3 +25,4 @@ ncurses/scanw ncurses/scrollwin ncurses/scrollwin2 ncurses/zz.txt + diff --git a/conf_slk120/bash/.bashrc b/conf_slk120/bash/.bashrc index fde586c..ed69b87 100644 --- a/conf_slk120/bash/.bashrc +++ b/conf_slk120/bash/.bashrc @@ -45,7 +45,7 @@ OLDPATH=/usr/local/bin:/usr/bin:/bin:/usr/games:/usr/lib/java/bin:/usr/lib/java/ export ARROWPATH="$USER" export PATH=${HOME}/.bin/shell:$OLDPATH # export PATH=$PATH:/usr/local/gcc/bin -export PATH=$PATH:/work/catv/CN3XXX-SDK/tools/bin:/work/catv/CN3XXX-SDK/host/bin +#export PATH=$PATH:/work/catv/CN3XXX-SDK/tools/bin:/work/catv/CN3XXX-SDK/host/bin export PATH=$PATH:/usr/local/bin:/usr/local/sbin export PATH=$PATH:/bin:/sbin:/usr/bin:/usr/sbin export PATH=$PATH:/opt/mv_tools/bin @@ -63,6 +63,9 @@ PATH=$PATH:/opt/build_arm_nofpu/staging_dir/bin/ PATH=$PATH:/usr/local/virata/tools_v10.1c/redhat-3-x86/bin PATH=$PATH:/opt/openoffice.org2.0/program/ PATH=$PATH:/opt/extra/bin/ +PATH=$PATH:/opt/iad6358/bin/ + +export MANPATH=$MANPATH:/opt/iad6358/man export EDITOR=vim export MAC_SYS="00:90:F5:25:19:C1" diff --git a/conf_slk120/fonts/etc_X11_fs_config b/conf_slk120/fonts/etc_X11_fs_config index 45dae00..2b8a79a 100644 --- a/conf_slk120/fonts/etc_X11_fs_config +++ b/conf_slk120/fonts/etc_X11_fs_config @@ -3,7 +3,7 @@ clone-self = on use-syslog = off -catalogue = /work/tools/xfonts/ms,/work/tmp/wqy-unibit,/work/tmp/wqy-bitmapfont,/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/TTF/,/usr/lib/X11/fonts/Type1/,/usr/lib/X11/fonts/CID/,/usr/lib/X11/fonts/100dpi/,/usr/lib/X11/fonts/75dpi/ +catalogue = /work/tools/xfonts/ms,/work/tools/xfonts/wqy-unibit,/work/tools/xfonts/wqy-bitmapfont,/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/TTF/,/usr/lib/X11/fonts/Type1/,/usr/lib/X11/fonts/CID/,/usr/lib/X11/fonts/100dpi/,/usr/lib/X11/fonts/75dpi/ error-file = /var/log/xfs.log # in decipoints default-point-size = 120 diff --git a/conf_slk120/fonts/fonts.conf b/conf_slk120/fonts/fonts.conf index bb2966e..1d8b7f3 100644 --- a/conf_slk120/fonts/fonts.conf +++ b/conf_slk120/fonts/fonts.conf @@ -24,7 +24,7 @@ /usr/share/fonts/OTF - /work/tmp/wqy-bitmapfont + /work/tools/xfonts/wqy-bitmapfont /work/tools/xfonts/ms /usr/share/fonts/TTF /usr/share/fonts/Type1 diff --git a/conf_slk120/rest/.arrowwrite b/conf_slk120/rest/.arrowwrite index 7e0a900..826cbc8 100644 --- a/conf_slk120/rest/.arrowwrite +++ b/conf_slk120/rest/.arrowwrite @@ -17,3 +17,6 @@ dd if=/dev/cdrom of=/cdrom_image.iso cd /usr/share/icons/hicolor gtk-update-icon-cache --ignore-theme-index -f . "gtk-update-icon-cache ." + +# dpi +(width(millimeter)/1024(1280)) * 25.4 diff --git a/conf_slk120/ssh/Makefile b/conf_slk120/ssh/Makefile index 7fc7eba..b316540 100644 --- a/conf_slk120/ssh/Makefile +++ b/conf_slk120/ssh/Makefile @@ -3,6 +3,7 @@ TMP_KNM_HOST=/tmp/.tmp_known_hosts all: ${LN} ${TOP}/ssh/.ssh ~/.ssh + ${LN} ${TOP}/ssh/sshd_config /etc/ssh/ ${TOUCH} ${TMP_KNM_HOST} ${INSTALL} ${TMP_KNM_HOST} ~/.ssh/known_hosts sudo ${LN} ${TOP}/ssh/Equifax_Secure_Certificate_Authority.pem /etc/ssl/certs/Equifax_Secure_Certificate_Authority.pem @@ -12,5 +13,5 @@ del: test -a ~/.ssh/known_hosts && ${INSTALL} ~/.ssh/known_hosts ${TMP_KNM_HOST} || ${ECHO} "re-del?" ${RM} ~/.ssh sudo ${RM} /etc/ssl/certs/Equifax_Secure_Certificate_Authority.pem - + sudo ${RM} /etc/ssh/sshd_config diff --git a/conf_slk120/ssh/sshd_config b/conf_slk120/ssh/sshd_config new file mode 100644 index 0000000..d0c5ee1 --- /dev/null +++ b/conf_slk120/ssh/sshd_config @@ -0,0 +1,113 @@ +# $OpenBSD: sshd_config,v 1.74 2006/07/19 13:07:10 dtucker Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options change a +# default value. + +Port 22 +#Port 30005 +#Protocol 2,1 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 768 + +# Logging +# obsoletes QuietMode and FascistLogging +SyslogFacility AUTH +LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +PermitRootLogin no +StrictModes yes +MaxAuthTries 8 + +#RSAAuthentication yes +#PubkeyAuthentication yes +AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +PasswordAuthentication no +PermitEmptyPasswords no + +# Change to no to disable s/key passwords +ChallengeResponseAuthentication no + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +#UsePAM yes + +#AllowTcpForwarding yes +#GatewayPorts no +X11Forwarding yes +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +#UseLogin no +#UsePrivilegeSeparation yes +#PermitUserEnvironment no +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no + +# no default banner path +#Banner /some/path + +# override default of no subsystems +Subsystem sftp /usr/libexec/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server diff --git a/conf_slk120/xinit/.xinitrc b/conf_slk120/xinit/.xinitrc index 817faf9..b04a868 100644 --- a/conf_slk120/xinit/.xinitrc +++ b/conf_slk120/xinit/.xinitrc @@ -39,6 +39,7 @@ xset s noblank s 24000 2400 s expose xsetroot -solid SteelBlue killall -9 ssh-agent ssh-agent > /tmp/.ssh_agent_q && source /tmp/.ssh_agent_q && rm -f /tmp/.ssh_agent_q +xv -root -quit ~/.wallpaper/a.png fvwm2 # fvwm-themes-start # startkde diff --git a/conf_slk120/xorg/xorg.conf.ACER b/conf_slk120/xorg/xorg.conf.ACER index 5c124a7..99e7468 100644 --- a/conf_slk120/xorg/xorg.conf.ACER +++ b/conf_slk120/xorg/xorg.conf.ACER @@ -9,8 +9,8 @@ Section "Files" RgbPath "/usr/share/X11/rgb" ModulePath "/usr/lib/xorg/modules" FontPath "/usr/share/fonts/TTF" - FontPath "/work/tmp/wqy-unibit" - FontPath "/work/tmp/wqy-bitmapfont" + FontPath "/work/tools/xfonts/wqy-unibit" + FontPath "/work/tools/xfonts/wqy-bitmapfont" FontPath "/usr/share/fonts/OTF" FontPath "/usr/share/fonts/Type1" FontPath "/usr/share/fonts/misc" -- 2.11.4.GIT