Commit Graph

368 Commits

Author SHA1 Message Date
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
Peng Zhihui
78e5cf7f83 Install 32 lib pkgs in finish_install step
modified:   operation/configure_fstab.sh
	new file:   operation/finish_install/66install_lib_32.sh
	new file:   operation/finish_install/exec_install_lib_32.sh
2014-03-19 11:25:43 +08:00
Peng Zhihui
edd0de8e28 add a feature: when run install program you can skip partition
by use parameter -p or --skip-partition.

	modified:   main/setup
	modified:   operation/configure_fstab.sh
	modified:   text/ri_main.py
2014-03-18 14:29:05 +08:00
Peng Zhihui
a2e217c99b Correct the problem of reumount operation
Text mode uses python-newt to show install progress

	modified:   interface/ri_inst_cli.py
	modified:   interface/ri_install.py
	modified:   operation/exec_finish_install.sh
	modified:   operation/functions
	modified:   operation/partition_disks.sh
2014-03-06 16:07:57 +08:00
Peng Zhihui
47eca43729 Merge branch '4.3/1633_gdzhang' into tmp 2014-03-05 15:44:33 +08:00
sxx
aeb687f000 text mode usage pythondialog show install progress
modified:   ri_inst_cli.py
	modified:   ri_install.py
	new file:   ri_progress.py

Signed-off-by: gdzhang <gdzhang@linx-info.com>
2014-03-05 15:21:36 +08:00
Peng Zhihui
885998f90a modified: operation/install.txt 2014-03-04 14:55:03 +08:00
Peng Zhihui
cc0dd53024 Rename xml/config.xml to xml/install_cfg.xml
modified:   interface/ri_data.py
	modified:   interface/test_data.py
	modified:   main/setup
	modified:   text/ri_newt.py
	modified:   xml/dependency.xml
	renamed:    xml/config.xml -> xml/install_cfg.xml
2014-03-03 10:15:27 +08:00
Peng Zhihui
080f7776d7 Modify default network cfg as the same with linx 6.0
modified:   interface/ri_data.py
2014-03-03 09:17:58 +08:00
Peng Zhihui
513f9756bf Modify finish_install interface:
exec_finish_install will run all executable scripts in the
    finish_install dir in turn.
Add support to ext4 in mount_partition.sh
move auto_install.py and state_grid.py to text dir

	modified:   operation/exec_finish_install.sh
	new file:   operation/finish_install/95state_grid_custom.py
	modified:   operation/finish_install/99finish_install.sh
	new file:   operation/finish_install/exec_post_add.sh
	modified:   operation/install.txt
	modified:   operation/mount_partition.sh
	renamed:    AutoInstall/auto_install.py -> text/auto_install.py
	renamed:    StateGrid/state_grid.py -> text/state_grid.py
2014-02-26 09:33:28 +08:00
Peng Zhihui
b0f6069fc0 Correct an IndentationError
modified:   interface/ri_inst_cli.py
2014-02-25 09:12:05 +08:00
Peng Zhihui
1b3752a356 Correct a SyntaxError
modified:   interface/ri_inst_cli.py
2014-02-25 09:01:17 +08:00
Peng Zhihui
3236edd370 Ext4 supports acl and automated install will restart automately
modified:   interface/ri_inst_cli.py
	modified:   operation/configure_fstab.sh
2014-02-24 17:27:23 +08:00
Peng Zhihui
0dc4b94744 Correct a path 'proc/cmdline' -> '/proc/cmdline'
modified:   operation/finish_install.py
2014-02-24 14:02:20 +08:00
Peng Zhihui
8da1885d4d Get the cmdline instmod value in finish_install.py
modified:   interface/ri_oper.py
	modified:   operation/finish_install.py
2014-02-24 13:53:53 +08:00