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>
This commit is contained in:
PengZhihui
2014-09-17 11:18:23 +08:00
parent 40be9d2cad
commit 911c08a72a
6 changed files with 51 additions and 13 deletions

View File

@@ -73,8 +73,16 @@ EOF
# from di grub-install
device_to_disk ()
{
echo "$1" | \
if [ "$(echo $1 |grep '/dev/mapper')"x != x ];then
if [ "$(echo $1 |grep [0-9]p[0-9]$)"x != x ];then
echo ${1%p*}
else
echo "$1" |sed 's/\(.*[a-z]\)\(.*\)/\1/'
fi
else
echo "$1" | \
sed 's:\(/dev/\(cciss\|ida\|rs\)/c[0-9]d[0-9][0-9]*\|/dev/mmcblk[0-9]\|/dev/\(ad\|da\)[0-9]\+\|/dev/[hs]d[0-9]\+\|/dev/[a-z]\+\).*:\1:'
fi
}
install_grub2()
@@ -91,8 +99,6 @@ install_grub2()
chroot $TARGET update-grub > /dev/null 2>&1
}
main ()
{
if [ $# -eq 0 ];then