linx/StateGrid
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
66 Commits 2 Branches 0 Tags
c13b0cb0b8126e2702288e1382c935f2e9eaf978
Commit Graph

66 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
徐顺选
c13b0cb0b8 Merge branch '4.2/ZTstory#1419' into 'master' 
[ ZTstory #1419 ] 取消创建rocky用户

See merge request linx6.0.42/StateGrid!1
 2021-11-04 14:30:46 +08:00
Hu.Nan
3efc1bfa00 [ ZTstory #1419 ] 取消创建rocky用户 
修改：     install_shell/create_users.sh

Signed-off-by: Hu.Nan <nhu@linx-info.com>
 2021-11-03 16:47:17 +08:00
Xu, Shunxuan
97d0d3af48 添加国网定制默认安装进有root，添加40选项安装修改 
new file:   install_shell/kdesktoprc
	new file:   install_shell/set_default_root.sh
	modified:   setup.sh

Signed-off-by: Xu, Shunxuan <sxxu@linx-info.com>
 2018-11-06 11:23:40 +08:00
张国栋
591be5e8a8 test for auto build 2015-04-17 15:05:18 +08:00
weishuai
df77b3cbeb 更新install_shell/get_parameter_log.sh文件 
modified:   install_shell/get_parameter_log.sh

    Signed-off-by: weishuai <swei@linx-info.com>
 2015-01-08 15:56:05 +08:00
swei
8155086a9d [Bug:2126] fix openoffice use scim imput 
in disorder

      modified:   set_tcsh_encode.sh

    Signed-off-by: swei <swei@linx-info.com>
 2014-12-25 17:12:11 +08:00
Peng Zhihui
2358b3cb1c Fix bug 1853：设置kde桌面终端默认颜色方案为黑底绿字 
修改：      install_shell/d5000-kde/.kde/share/config/konsolerc
	修改：      install_shell/root-kde/.kde/share/config/konsolerc

Signed-off-by: Peng Zhihui <zhihuipeng@linx-info.com>
 2014-08-05 11:39:22 +08:00
Peng Zhihui
bc58cd0433 set swap and memory limit according to the hdware when starting the service 
modified:   install_shell/cgroup-d5000-install/set_libcgroup.sh
 2014-05-19 16:28:36 +08:00
Peng Zhihui
27bffeaf37 Merge branch '1691-swei': 
modified:   install_shell/set_bonding.sh
 2014-05-16 12:44:42 +08:00
Mu Xiaokang
7767386657 Update cgroup-d5000-install/set_libcgroup.sh. 
modified:   install_shell/cgroup-d5000-install/set_libcgroup.sh
 2014-05-12 11:46:07 +08:00
Qin, Bo
133a399ebf update get_max_mem_process 
modified:   install_shell/get_max_mem_process.sh

Signed-off-by: Qin, Bo <bqin@linx-info.com>
 2014-05-07 15:24:09 +08:00
swei
dac107a1da chown ifcfg-bond0,ifcfg-eth0,ifcfg-eth2 to netadmin 
modified:   set_bonding.sh

    Signed-off-by: swei <swei@linx-info.com>
 2014-05-07 14:53:27 +08:00
Qin, Bo
cf0c07e8c5 modify SWAP_USED_PERCENTAGE_INT to 20 
modified:   install_shell/get_max_mem_process.sh

Signed-off-by: Qin, Bo <bqin@linx-info.com>
 2014-05-07 14:19:54 +08:00
Qin, Bo
3b55b96bc3 add jcye's modify 
modified:   install_shell/crontab
	modified:   install_shell/get_max_mem_process.sh

Signed-off-by: Qin, Bo <bqin@linx-info.com>
 2014-05-07 14:19:12 +08:00
Peng Zhihui
d5fbd0c1b2 useradd rocky 
modified:   install_shell/create_users.sh
 2014-05-07 10:19:48 +08:00
Qin, Bo
66dab6dca7 Fix set_resolv.sh. 
modified:   set_resolv.sh

Signed-off-by: Qin, Bo <bqin@linx-info.com>
 2014-05-05 10:33:12 +08:00
Qin, Bo
658948cba1 Add set_resolv.sh to disable preconfig dns. 
Let configure it after installation.

	new file:   install_shell/set_resolv.sh
	modified:   setup.sh

Signed-off-by: Qin, Bo <bqin@linx-info.com>
 2014-05-04 11:16:26 +08:00
Mu Xiaokang
b916d74985 Fix cgroup. 
modified:   install_shell/cgroup-d5000-install/set_libcgroup.sh
	modified:   setup.sh
 2014-04-24 12:41:53 +08:00
Peng Zhihui
6b7f282d70 chmod +x install_shell/cgroup-d5000-install/set_libcgroup.sh 
modified:   install_shell/cgroup-d5000-install/set_libcgroup.sh
 2014-04-23 10:51:27 +08:00
Qin, Bo
ec37ba8357 use percentage in swap 
modified:   get_max_mem_process.sh

Signed-off-by: Qin, Bo <bqin@linx-info.com>
 2014-04-22 17:05:14 +08:00
Qin, Bo
f9f4545b3e remove linx-watch-top.sh 
deleted:    install_shell/linx-watch-top.sh
	modified:   install_shell/other.sh

Signed-off-by: Qin, Bo <bqin@linx-info.com>
 2014-04-22 15:26:59 +08:00
Qin, Bo
60cec884db 9/min run get_max_mem_process.sh 
if swap >= 3G or thread number >= 1800.
then colloect the information.

	modified:   install_shell/crontab
	modified:   install_shell/get_max_mem_process.sh

Signed-off-by: Qin, Bo <bqin@linx-info.com>
 2014-04-22 15:24:01 +08:00
Zhang, Guodong
e160026dbf Merge branch 'master' of git@172.16.0.4:4.3/StateGrid 2014-04-22 14:09:37 +08:00
swei
3db60bd86b Merge branch '1691-swei' 2014-04-22 14:00:12 +08:00
swei
ef0a216ab9 modify bonding to mode=1 miimon=100 downdelay=200 updelay=200 
modified:   set_bonding.sh

	Signed-off-by: swei <swei@linx-info.com>
 2014-04-22 13:58:51 +08:00
Qin, Bo
71ca491663 Merge remote branch 'origin/4.3/1804' 2014-04-22 13:40:10 +08:00
Wang Jinnan
12b4737f20 Fix bug 1804: 
*Removing some noused cron task.
		*Changing the DAC of the some files
		 about cron and logrotate.
 2014-04-22 12:22:55 +08:00
Wang Jinnan
1999949b75 Fix bug 1803 2014-04-21 15:50:15 +08:00
swei
46d1cc3d69 modify bonding to mode=1 miimon=100 downdelay=200 updelay=200 
primary=eth0

	modified:   set_bonding.sh

	Signed-off-by: swei <swei@linx-info.com>
 2014-04-21 10:15:54 +08:00
Mu Xiaokang
09de1977cd Fix cgroup. 
deleted:    install_shell/cgroup-d5000-install/cgconfig.conf
	deleted:    install_shell/cgroup-d5000-install/cgrules.conf
	deleted:    install_shell/cgroup-d5000-install/install.sh
	new file:   install_shell/cgroup-d5000-install/set_libcgroup.sh
	modified:   setup.sh
 2014-04-16 15:39:07 +08:00
swei
d959a00619 add set_libcgroup.sh by yhsong 
Signed-off-by: swei <swei@linx-info.com>
 2014-04-16 11:19:52 +08:00
swei
972c16b860 modify the bond mode to 1 
modified:   install_shell/set_bonding.sh

	Signed-off-by: swei <swei@linx-info.com>
 2014-04-16 11:06:16 +08:00
Qin, Bo
834acafd37 Fix bug# 1691 
Modify user default password to 'R0ck9'

	modified:   install_shell/create_users.sh

Signed-off-by: Qin, Bo <bqin@linx-info.com>
 2014-03-31 14:50:27 +08:00
Wang Jinnan
c55f2ac107 Merge remote-tracking branch 'remotes/origin/4.3/1691-swei' into master-merge 2014-03-27 01:52:40 -07:00
swei
b46436f532 simplify the code 
modified:   set_bonding.sh

	Signed-off-by: swei <swei@linx-info.com>
 2014-03-27 16:13:10 +08:00
Wang Jinnan
957b9898e9 Remove chown/chmod /var/log/* scripts. 
Because We exchange sysklogd to rsyslog in rocky4.2
	and rsyslog will be hold by sysadmin.
 2014-03-26 22:33:50 -07:00
swei
a34b33497d modify set_bonding.sh and set bond0 base on eth0 ip arg set 
modified:   set_bonding.sh

    Signed-off-by: swei <swei@linx-info.com>
 2014-03-27 11:40:46 +08:00
Wang Jinnan
e1aa4b189c Update get_parameter_log.sh to the last version 2014-03-26 01:50:46 -07:00
Peng Zhihui
cb5f09c5dc cp /etc/skel/.kde to d5000's home dir. 
modified:   install_shell/create_users.sh
 2014-03-21 09:03:12 +08:00
Jinnan Wang
c413fef4e6 Merge remote-tracking branch 'origin/4.3/1691-swei' 2014-03-20 12:50:13 +08:00
root
42a3c37c19 modify set bonding function 
new file:   install_shell/set_bonding.sh
	deleted:    install_shell/set_network.sh
	modified:   setup.sh

	Signed-off-by: swei <swei@linx-info.com>
 2014-03-19 15:53:35 +08:00
Jinnan Wang
c73d3597cb Merge remote-tracking branch 'origin/4.3/1691-swei' 
IPv6 默认关闭
 2014-03-19 11:35:27 +08:00
root
182bbfdace add set_close_ipv6.sh to procps module-init-tools 
deleted:    set_close_ipv6.sh
	modified:   ../setup.sh

	Signed-off-by: root <root@Rocky1111.(none)>
 2014-03-19 09:15:55 +08:00
Jinnan Wang
24d67fe7b7 Merge remote-tracking branch 'origin/4.3/1691_xkmu' into master-merge 2014-03-18 17:16:05 +08:00
Jinnan Wang
423690a9c9 Merge remote-tracking branch 'origin/4.3/1691-jgmu' into master-merge 2014-03-18 17:15:41 +08:00
Jinnan Wang
23a3d8d247 删除set_limits.conf.sh中无用的行 
由于默认的栈大小就是8192所以
	删除冗余行
 2014-03-18 17:00:40 +08:00
Jinnan Wang
9588a21091 清理与ntpd和ntpdate相关的问题 
删除ntpd_cron_patch.sh脚本，修改update_time.sh
	做为它的替代品。在setup.sh中不再调用ntpd_cron_patch.sh
	而改为调用update_time.sh。
 2014-03-18 15:57:38 +08:00
Qin, Bo
9f0210f4eb remove redundancy code. 
modified:   install_shell/other.sh
Signed-off-by: Qin, Bo <bqin@linx-info.com>
 2014-03-18 15:52:42 +08:00
Peng Zhihui
391c6cccaf rm set_fcitx and continue to use scim defaultly 
modified:   install_shell/create_users.sh
	deleted:    install_shell/set_fcitx.sh
	new file:   install_shell/set_tcsh_encode.sh
	modified:   setup.sh
 2014-03-18 15:43:55 +08:00
Jinnan Wang
089b8a41f1 移除other.sh中无用的脚本 
移除的内容包括date能力配置和postfix访问权限。
 2014-03-18 15:07:33 +08:00