382 Commits

Author SHA1 Message Date
徐顺选
fa9f88298e Merge branch '4.2/ZTtask#1312' into 'master'
[ ZTstory #1312 ] 更改电网40模式安装时,不修改issue文件的情况

See merge request linx6.0.42/new_install!10
2022-03-24 13:50:23 +08:00
zhang
8fa43ab07e [ ZTstory #1312 ] 更改电网40模式安装时,不修改issue文件的情况
电网40模式安装时,会将issue文件更改为4.2.40,在按照最新的产品命名规范修改产品名称后,电网40模式安装匹配失败,不会修改issue文件。
通过更改安装脚本,修复该问题。

要提交的变更:
        修改:     operation/finish_install/exec_install_40.sh
Signed-off-by: zhang <dpzhang@linx-info.com>
2022-03-23 14:56:45 +08:00
徐顺选
27109edb8e Merge branch '4.2/ZTstory#1747' into 'master'
[ ZTstory #1747 ] 更改安装背景图片

See merge request linx6.0.42/new_install!9
2022-02-07 13:43:46 +08:00
Hu.Nan
dab06d8cd6 [ ZTstory #1747 ] 更改安装背景图片
要提交的变更:
	修改:     data/about_4.2_to_6.0.42/ROCKY42.png

Signed-off-by: Hu.Nan <nhu@linx-info.com>
2022-01-05 14:19:37 +08:00
徐顺选
7a9a547eac Merge branch 'issue#1' into 'master'
[ issue #1 ] 修改生成issue脚本中版本号显示错误问题

See merge request linx6.0.42/new_install!8
2021-06-30 16:44:24 +08:00
Wei, Jing
f3b0bb69a4 [ issue #1 ] 修改生成issue脚本中版本号显示错误问题
修改:     interface/ri_oper.py

Signed-off-by: Wei, Jing <jwei@linx-info.com>
2021-06-30 14:31:35 +08:00
魏静
15c94b1f06 Merge branch 'issue#1' into 'master'
[ issue #1 ] 根据最新产品命名规范修改产品名称

See merge request linx6.0.42/new_install!6
2021-06-29 18:26:58 +08:00
Wei, Jing
20962f85e1 [ issue #1 ] 根据最新产品命名规范修改产品名称
修改:     interface/ri_oper.py
	修改:     operation/generate_issue.sh

Signed-off-by: Wei, Jing <jwei@linx-info.com>
2021-06-29 18:24:38 +08:00
徐顺选
6654f39a2d Merge branch '4.2/4267' into 'master'
[ Bug #4267 ] 集成静态编译的perf

See merge request linx6.0.42/new_install!5
2021-06-29 11:46:05 +08:00
Wei, Jing
e59e87aed2 [ Bug #4267 ] 集成静态编译的perf
修改:     xml/dependency.xml

Signed-off-by: Wei, Jing <jwei@linx-info.com>
2021-06-29 11:00:21 +08:00
Wei, Jing
53ca53f033 [ issue #1 ] 修改issue中的版本信息
修改:     operation/generate_issue.sh

Signed-off-by: Wei, Jing <jwei@linx-info.com>
2021-06-29 10:57:20 +08:00
张东鹏
9c63113328 Merge branch '4.2/4900' into 'master'
[ Bug #4900 ] 适配最新的grub2软件包,更改启动配置文件存放位置

See merge request linx6.0.42/new_install!4
2021-05-13 10:09:51 +08:00
zhang
3de49b0830 [ Bug #4900 ] 适配升级的efi启动文件,更换启动配置文件放置位置
要提交的变更:
	修改:     operation/finish_install/99exec_install_efi.sh
Signed-off-by: zhang <dpzhang@linx-info.com>
2021-05-13 09:54:56 +08:00
徐顺选
aa1217a57c Merge branch '4.2/5352' into 'master'
[ Bug #5350 ] V42系统-安装系统后,无法进入图形界面,卡在tty登录界面

See merge request linx6.0.42/new_install!2
2020-10-15 17:52:35 +08:00
zhang
61806dc74f [ Bug #5350 ] V42系统-安装系统后,无法进入图形界面,卡在tty登录界面
修改:     operation/finish_install/99exec_install_efi.sh
Signed-off-by: zhang <dpzhang@linx-info.com>
2020-10-15 17:43:28 +08:00
徐顺选
2e899dfb38 Merge branch '42/4900' into 'master'
[Bug #4900] 42系统集成uefi功能

See merge request linx6.0.42/new_install!1
2020-02-27 14:38:41 +08:00
zhang
268e643cb4 [Bug #4900] 42系统集成uefi功能
修改:     new_partition/interface_partition.py
	新文件:   operation/finish_install/99exec_install_efi.sh
	修改:     text/ri_newt.py
Signed-off-by: zhang <dpzhang@linx-info.com>
2020-02-26 15:57:21 +08:00
Xu, Shunxuan
e7ef3d5b16 添加40安装选项及支持700内核的dmraid识别
modified:   main/begin-install
	modified:   operation/finish_install/98state_grid_custom.py
	new file:   operation/finish_install/exec_install_40.sh
	modified:   operation/functions
	new file:   xml/install-40-d5000.xml

Signed-off-by: Xu, Shunxuan <sxxu@linx-info.com>
2018-11-06 11:21:34 +08:00
Xu, Shunxuan
c394a6318a [Bug #2894] 添加virtio stategrid autoinstall安装选项,此选项安装会替换为G版内核
新文件:   operation/finish_install/67install_virtio_redpath_kernel.sh
	新文件:   operation/finish_install/exec_install_redpatch_kernel.sh

Signed-off-by: Xu, Shunxuan <sxxu@linx-info.com>
2016-11-30 17:36:55 +08:00
PengZhihui
911c08a72a bug 2017:修改安装程序,使6.0.42.41系统支持在fakeraid上安装
修改:      main/begin-install
	修改:      new_partition/interface_partition.py
	修改:      new_partition/parted_devices.py
	修改:      new_partition/partition_data.py
	修改:      operation/install_bootloader.sh
	修改:      text/get_instmode.sh

Signed-off-by: PengZhihui <zhihuipeng@linx-info.com>
2014-09-17 11:18:23 +08:00
Wei,Shuai
40be9d2cad 由于修改后发现问题较多,而又急于发盘,现将之前修改还原,以后
再待修改

	modified:   operation/finish_install/exec_install_lib_32.sh
	modified:   operation/install_pkg.sh

	Signed-off-by: Wei,Shuai <swei@linx-info.com>
2014-08-28 16:01:52 +08:00
Wei,Shuai
8a255b7ddd Merge branch '4.2/2012' 2014-08-28 14:18:02 +08:00
Wei,Shuai
f97252f528 细微修正,判断语句
modified:   operation/finish_install/exec_install_lib_32.sh

	Signed-off-by: Wei,Shuai <swei@linx-info.com>
2014-08-28 14:14:19 +08:00
Wei,Shuai
f8ee3637ab 修复bug2012,安装软件包,出现目录冲突却没有报错的问题
将pkgadd -f改为pkgadd

	modified:   operation/finish_install/exec_install_lib_32.sh
	modified:   operation/install_pkg.sh

	Signed-off-by: Wei,Shuai <swei@linx-info.com>
2014-08-28 14:10:07 +08:00
PengZhihui
4b71210bc6 fix bug 2011:
默认周面壁纸和logo还原为Rocky 4.2字样

	修改:      operation/finish_install/99about_4.2_to_6.0.42.sh

Signed-off-by: PengZhihui <zhihuipeng@linx-info.com>
2014-08-28 13:43:25 +08:00
Zhang, Guodong
1c1565d4b2 Merge remote-tracking branch 'remotes/origin/4.2/1941' 2014-08-25 13:45:32 +08:00
PengZhihui
b4ee6c09aa 修正关机操作,关机操作应该是‘echo o >/proc/sysrq-trigger’,
而不是‘echo b >/proc/sysrq-trigger’

	修改:      interface/ri_install.py

Signed-off-by: PengZhihui <zhihuipeng@linx-info.com>
2014-08-22 10:50:13 +08:00
PengZhihui
370f430b15 调用关机命令’echo b >/proc/sysrq-trigger‘之前先sync
清理注释掉的代码

    修改:      interface/ri_inst_cli.py
	修改:      interface/ri_install.py

Signed-off-by: PengZhihui <zhihuipeng@linx-info.com>
2014-08-19 14:20:46 +08:00
sysadmin
918bf64ea5 Fix bug 1987:
添加安装完成后的动作(重启/关机/待机)

    修改:      interface/ri_data.py
	修改:      interface/ri_inst_cli.py
	修改:      interface/ri_install.py
	修改:      main/setup
	修改:      text/ri_main.py
	修改:      text/ri_newt.py

Signed-off-by: sysadmin <zhihuipeng@linx-info.com>
2014-08-19 10:23:13 +08:00
sysadmin
3594ab8f9c 系统分区信息通过new_partition/partition_data.py来获取,不需要再通过
interface/ri_data.py里写好的Partition类。

	修改:      interface/ri_data.py

Signed-off-by: sysadmin <zhihuipeng@linx-info.com>
2014-08-14 14:19:05 +08:00
Wei,Shuai
04d1a5536f 在安装系统结束后,对/etc/和/usr/share/config/两个目录分别做git库
进行管理(bug1941)

	new file:   operation/finish_install/99create_git_manage.sh
	new file:   operation/finish_install/cfg_create_git.sh

	Signed-off-by: Wei,Shuai <swei@linx-info.com>
2014-08-08 15:23:12 +08:00
Xu, Shunxuan
2cd032b824 fix bug 1960:
检查是否存在硬盘安装的自动安装配置文件,有则根据配置文件自动安装。

	modified:   main/begin-install
2014-08-04 13:17:27 +08:00
Qin, Bo
e711ffc8e7 修改配置fstab中swap相关注释
modified:   operation/configure_fstab.sh
	modified:   operation/install.txt

Signed-off-by: Qin, Bo <bqin@linx-info.com>
2014-07-04 16:55:26 +08:00
Peng Zhihui
3a81e8bc6b fix bug 1909 about partition
modified:   new_partition/interface_partition.py
2014-06-24 13:26:46 +08:00
Peng Zhihui
bbf7182fbf Fix problems with configure mountpoint when auto install:
1. configure root mountpoint ok and and just press Enter when the focus
   on no button, errors occur.

	modified:   text/auto_install.py
2014-06-17 17:14:15 +08:00
Peng Zhihui
2f80cd90f0 Fix problems when configure mountpoint:
1. focus on no item and press "Edit" button ,errors occur.
2. configure root mountpoint ok and and just press Enter when the focus
   on no button, errors occur.

	modified:   text/ri_main.py
	modified:   text/ri_newt.py
2014-06-16 14:53:56 +08:00
Peng Zhihui
f8624a8ba9 Correct operation/finish_install/97update_initrd_noraid.sh 2014-05-16 17:26:30 +08:00
Peng Zhihui
27fed5d1a1 deleted useless script : operation/finish_install.py
add no raid install :
    just move scripts/local-top/mdadm from initrd
    this will support Lenovo RD440 machine

	deleted:    operation/finish_install.py
	new file:   operation/finish_install/97update_initrd_noraid.sh
	modified:   text/get_instmode.sh
2014-05-16 14:51:36 +08:00
Peng Zhihui
3ed56460cd move /tftpboot to /net_inst_server/
move /net_inst_server dir to /usr/lib/

	modified:   main/begin-install
2014-05-15 16:55:58 +08:00
Peng Zhihui
e37712fe11 modified: main/begin-install 2014-04-29 09:15:11 +08:00
Peng Zhihui
bee7e14e77 Correct getting instmode
modified:   interface/ri_inst_cli.py
	modified:   operation/finish_install/98state_grid_custom.py
2014-04-28 09:27:16 +08:00
Peng Zhihui
b3e847c59c Enable to select install mode when net-install and hd-install
modified:   interface/ri_inst_cli.py
	new file:   main/begin-install
	modified:   operation/finish_install/98state_grid_custom.py
	new file:   text/get_instmode.sh
	new file:   text/select_inst_mode.py
2014-04-22 16:16:47 +08:00
Peng Zhihui
9c1fbe799e exchange the running order of state_grid_custom and run_post_add script
renamed:    operation/finish_install/98run_post_add.sh ->
		    operation/finish_install/95run_post_add.sh
	renamed:    operation/finish_install/95state_grid_custom.py ->
		    operation/finish_install/98state_grid_custom.py
2014-04-15 17:31:24 +08:00
Peng Zhihui
a4bcbf4fc6 modified: interface/ri_inst_cli.py
modified:   operation/finish_install/66install_lib_32.sh
modified:   operation/finish_install/95state_grid_custom.py
2014-04-08 17:24:05 +08:00
Peng Zhihui
4961b6fe49 Add sth about version 4.2 to 6.0.42
new file:   data/about_4.2_to_6.0.42/ROCKY42-logo.png
	new file:   data/about_4.2_to_6.0.42/ROCKY42.png
	renamed:    operation/finish_install/99run_post_add.sh -> operation/finish_install/98run_post_add.sh
	new file:   operation/finish_install/99about_4.2_to_6.0.42.sh
2014-04-03 17:18:27 +08:00
Peng Zhihui
6eb9e46109 Get kernel parameter instmode's value correctly
modified:   interface/ri_inst_cli.py
	modified:   operation/finish_install/95state_grid_custom.py
2014-04-03 15:45:43 +08:00
Peng Zhihui
d906d2e489 renamed: operation/finish_install/99finish_install.sh ->
operation/finish_install/99run_post_add.sh
2014-03-27 09:29:46 +08:00
Peng Zhihui
f60e3e75c9 change the dir to save install log from '/var/log/' to '/var/log/installer'
modified:   operation/exec_finish_install.sh
2014-03-26 17:13:29 +08:00
Peng Zhihui
aa8c7ada19 New file: operation/finish_install/10collect_install_info.sh 2014-03-26 17:07:44 +08:00
Peng Zhihui
bbbc86793f omit unecessary information
modified:   operation/exec_finish_install.sh
2014-03-19 15:53:20 +08:00