110 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
885998f90a modified: operation/install.txt 2014-03-04 14:55:03 +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
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
Peng Zhihui
21c3272eea Add auto install, HdInstall and state grid custom install
new file:   AutoInstall/auto_install.py
	new file:   StateGrid/state_grid.py
	modified:   interface/ri_data.py
	modified:   operation/exec_finish_install.sh
	new file:   operation/finish_install.py
	renamed:    operation/99finish_install.sh -> operation/finish_install/99finish_install.sh
	new file:   xml/install.xml
2014-02-24 10:44:53 +08:00
Peng Zhihui
5c7c4af1bc Modify partition-tools:
chage the base unit from 'B' to 's'
    correct 4k align
Modify network configure:
    provide a default network configure
Todo:
    support making raid

       modified:   dialog/di_main.py
       modified:   dialog/di_newt.py
       modified:   interface/ri_data.py
       modified:   interface/ri_oper.py
       modified:   new_partition/interface_partition.py
       modified:   new_partition/partition_data.py
       modified:   operation/partition_disks.sh
2014-01-13 10:05:10 +08:00
Qin Bo
02dbaa792b modify follow files for new datastructure
modified:   interface/ri_data.py
    remove MountPoint use new datastructure for instead

modified:   interface/ri_install.py
    add MakePartitions for partition

modified:   interface/ri_oper.py
    1.add MakePartitions class
    2.modify Format, Mount, ConfigureFstab class

modified:   new_partition/partition_data.py
    1.add disk_from_os attribute to Partition class for disk
    2.add process linux-swap(v1) in Partition class
    3.force convert num and sn to int, beacause when read from install.xml
      sn and num is still string.

modified:   operation/format_partition.sh
    1.add timeout beacause use MakePartitions, need time to generate
    device file
    2.add linux-swap for swap

modified:   operation/functions
    1.add % support, beacause of partition may use 1% to partition
    disks.

new file:   operation/partition_disks.sh
    1.use partition_disks as parted stdin wrapper.

Signed-off-by: Qin Bo <bqin@linx-info.com>
2013-12-04 19:16:16 +08:00
Peng Zhihui
3c0236842a rewrite text isntall interface and partition-tool
modified:   dialog/di_dialog.py
	modified:   dialog/di_main.py
	new file:   dialog/di_newt.py
	modified:   interface/ri_inst_cli.py
	modified:   interface/ri_oper.py
	new file:   new_partition/finddisk.sh
	new file:   new_partition/list-devices
	new file:   new_partition/new_partition.py
	new file:   new_partition/parted_devices
	new file:   new_partition/parted_devices.py
	modified:   operation/configure_bootloader_cnf.sh
	modified:   operation/copy_kernels.sh
	modified:   operation/install_bootloader.sh
	modified:   xml/config.xml
	modified:   xml/dependency.xml
2013-12-20 11:10:32 +08:00
Peng Zhihui
1666ccbe3a add multipath-tools to xml/dependency.xml
modify operation/copy_kernels.sh to support the cgroup and nocgroup initrd
modify operation/configure_bootloader_cnf.sh to solve the problem of grub
2013-04-07 11:08:52 +08:00
hbjia
8ecec09ea7 modify fstab, check partitions
modified:   dialog/di_dialog.py
	modified:   interface/ri_oper.py
	modified:   operation/configure_fstab.sh
2012-10-31 15:44:42 +08:00
hbjia
744dc58c5e modify code for bug1241, note user to partition before install the system, adjust /etc/fstab
modified:   dialog/di_dialog.py
	modified:   interface/ri_data.py
	modified:   interface/ri_tk_cmd.py
	modified:   operation/configure_fstab.sh
2012-10-18 15:57:12 +08:00
Qin Bo
a9d1747e04 bug# 1216
use "full" initrd.gz instead of initrd.gz which make by mkinitrd.
	modified:   configure_bootloader_cnf.sh
	modified:   copy_kernels.sh
2012-08-27 16:02:35 +08:00
Qin Bo
0a240351e7 bug# 1214
add initrd-full.gz to harddisk.
	modified:   operation/copy_kernels.sh
2012-08-16 13:56:55 +08:00
Zhi Li
84759bc271 Merge remote branch 'origin/4.3/1126' 2012-05-18 13:05:39 +08:00
hbjia
42794bbd10 add MODPATH variable in makeinitrd; update config.xml,dependency.xml
modified:   operation/makeinitrd
	modified:   xml/config.xml
	modified:   xml/dependency.xml
2012-05-11 17:20:58 +08:00
Qin Bo
3fd74f4f6b fix bug #1126
modified:   operation/configure_bootloader_cnf.sh
2012-05-10 19:08:56 +08:00
fling
ba66604e82 fix: install packages
modified:   operation/install_pkg.sh
2012-01-05 15:32:52 +08:00