IA-64 CPU suppout tmppoint

2011-03-04 17:36:32 +08:00
parent 30059dc679
commit 0bdbe9d664
7 changed files with 49 additions and 20 deletions
--- a/interface/ri_cmd.py
+++ b/interface/ri_cmd.py
@@ -28,10 +28,9 @@ def previous():
 def next():
    ''' correspond to next button '''
    q, t = ri_widget.Sequence.current()
+    ri_widget.Widget.dict[t].hide()
    wid_name = ri_widget.Sequence.next()
    if wid_name is not None:
-        ri_widget.Widget.dict[t].hide()
-
        ri_widget.Widget.dict[wid_name].show()
    else:
        code = ri_widget.MessageBox.dict["next"].show()
--- a/interface/ri_data.py
+++ b/interface/ri_data.py
@@ -2,7 +2,6 @@

 import re
 import commands
-import ri_oper
 from xml.dom import minidom
 from xml.dom.ext import PrettyPrint

@@ -421,8 +420,6 @@ p_node - xml node (parent node)'''
            return False
        elif dr in ['/','/boot'] and fs in ['reiserfs','xfs']:
            return False
-        elif dr in ['/boot'] and ri_oper.Operation.getarch() == "ia64" and fs not in ['vfat']:
-	    return False

        return True

--- a/interface/ri_tk_cmd.py
+++ b/interface/ri_tk_cmd.py
@@ -5,7 +5,7 @@ import ri_widget
 import ri_data
 import ri_dep
 import ri_func_dep
-
+import ri_oper
 import re
 import copy
 import sys
@@ -31,6 +31,14 @@ def mount_list_init():
        l.append(s)
    display.var_dict['mount.list'].set(value=tuple([str(i) for i in l]))

+def mount_quit():
+    if ri_oper.Operation.getarch() == "ia64":
+        for (key,value) in ri_data.MountPoint.dict.items():
+            if (value.directory,value.filesystem,value.format) == ("/tmppoint","vfat","yes"):
+                return 
+        ri_widget.MessageBox.dict['check_special_mount'].show()
+        ri_widget.Sequence.previous()
+
 def mount_list_modify(*args):
    ''' modify an item in mount list '''
    tw = ri_widget.TopWindow.dict['mount_list_modify']
@@ -104,6 +112,7 @@ def mp_top_cancel():
    ''' mount dir top window cancel '''
    ri_widget.TopWindow.dict['mount_list_modify'].hide()

+
 def network_init():
    ''' network initialize '''
    if ri_data.Network.hostname.strip():
@@ -135,6 +144,7 @@ def network_quit():
            not ri_data.Network.gateway          or \
            not ri_data.Network.primary_dns)      :
        ri_widget.MessageBox.dict['check_ip_hostname'].show()
+        ri_widget.Sequence.previous()

 def ncm_dynamic():
    ''' when radio button ncm dynamic is checked, several data entry will be set 'disable' '''
--- a/operation/copy_kernels.sh
+++ b/operation/copy_kernels.sh
@@ -29,14 +29,7 @@ source ./functions

 main ()
 {
-	info "copy $KERNELS/* to $TARGET/boot/"
-	if [ -d "$KERNELS" ];then
-		cp -r "$KERNELS"/*	"$TARGET/boot/" 2>>$DEV_LOG
-	else
-		err "$KERNELS directory doesn't exist "
-		exit 1
-	fi
-
+	
 	info "copy $MODULES/* to $TARGET/lib/modules/"
 	if [ -d "$MODULES" ];then
 		cp -r "$MODULES"/* "$TARGET/lib/modules/"  2>>$DEV_LOG
@@ -47,6 +40,15 @@ main ()

 	case `uname -m` in 
 	    x86_64 | i686)
+        info "copy $KERNELS/* to $TARGET/boot/"
+
+        if [ -d "$KERNELS" ];then
+            cp -r "$KERNELS"/*	"$TARGET/boot/" 2>>$DEV_LOG
+        else
+            err "$KERNELS directory doesn't exist "
+            exit 1
+        fi
+
 		info "copy $INITRD/initrd.gz to $TARGET/boot/initrd.gz.old"
 		if [ -e "$INITRD/initrd.gz" ];then
 			cp "$INITRD/initrd.gz" "$TARGET/boot/initrd.gz.old" 2>>$DEV_LOG
@@ -63,7 +65,16 @@ main ()
 			exit 1
 		fi
 		;;
-	   ia64)
+	    ia64)
+        info "copy $KERNELS/* to /tmp/tmppoint"
+        if [ -d "$KERNELS" ];then
+            cp -r "$KERNELS"/*	"/tmp/tmppoint/" 2>>$DEV_LOG
+            umount /tmp/tmppoint
+            rm /tmp/tmppoint
+        else
+            err "$KERNELS directory doesn't exist "
+            exit 1
+        fi
 	   	;;
 	   *)
 	   	err "architecture is not allowing"
--- a/operation/install_bootloader.sh
+++ b/operation/install_bootloader.sh
@@ -104,7 +104,7 @@ main ()
 				;;
 			elilo)
 				echo "install elilo";
-				sed -i '/boot/d' $TARGET/etc/fstab
+				sed -i '/tmppoint/d' $TARGET/etc/fstab
 				;;
 			*)
 			
--- a/operation/mount_partition.sh
+++ b/operation/mount_partition.sh
@@ -45,8 +45,6 @@ mount_partition ()
 	local fs_type="$3"
 	local fs_mntops="$4"

-    mountpoint=$(echo "$mountpoint" |sed "s@`uname -m`@@g")
-
 	if [ $# -lt 3 ];then
 		err "$FUNCNAME function argument error, it need 3 arguments at least !"
 		return 1
@@ -88,6 +86,12 @@ mount_partition ()
 	fi

 	info "mounting $devname on $mount_pos with $fs_type filesystem"
+
+    if [ $mount_pos = "$TARGET/tmppoint" ]; then
+        mkdir -p "/tmp/tmppoint"
+        $mount_pos="/tmp/tmppoint"
+    fi
+
 	mount -t "$fs_type" -o $fs_mntops "$devname" "$mount_pos"  1>>"$DEV_LOG" 2>&1
 }

--- a/xml/interface.xml
+++ b/xml/interface.xml
@@ -466,6 +466,7 @@ row 4 |                                                            |
      <configure column='0' weight='1'/>
    </grid_management>
    <grid_location row='2' column='1' columnspan='2' sticky='NSWE'/>
+      <action quit='mount_quit'/>

    <widget type='Frame'>
      <grid_management rows='2' columns='2'>
@@ -796,6 +797,7 @@ row 4 |                                                            |
  <message_box name='raid_add_active_numbers' type='showwarning' title='Linx' message='#raid-add-active-numbers'/>
  <message_box name='raid_add_active_numbers_2' type='showwarning' title='Linx' message='#raid-add-active-numbers-2'/>
  <message_box name='check_mount_point' type='showwarning' title='Linx' message='#check-mount-point'/>
+  <message_box name='check_special_mount' type='showwarning' title='Linx' message='#check-special-mount'/>
  <message_box name='check_ip_hostname' type='showwarning' title='Linx' message='#check-ip-hostname'/>
 <!--
                column 0              column 1
@@ -886,6 +888,12 @@ row 4 |                                                            |
    </widget>

  </top_window>
+	
+
+  <text key='#check-special-mount'>
+    <English>Special platform to set a special mount point, please refer to the left of the help documentation</English>
+    <Chinese>特殊的平台需要设置特殊挂载点，请参考左边的帮助文档</Chinese>
+  </text>   

  <text key='#check-mount-point'>
    <English>The mount point couldn't be mounted on because it has been used or it's particular. Plase read help infomation!</English>
@@ -941,7 +949,7 @@ row 4 |                                                            |
    Note: 1、some of mount point is not hanging out, E.g: /etc、/bin、/sbin、/lib.
    2、some of mount point is not mounting on reiserfs and xfs filesystem, E.g: /, /boot
    3、when "/" hanging on Raid device, "/boot" must be hang out. 
-    4、If the processor is Series of Itanium, "/ia64boot" should be hang out ,which required to turn into  format of vfat  .  
+    4、If the processor is Series of Itanium, "/tmppoint" should be hang out ,which required to turn into  format of vfat  .  
    </English>
    <Chinese>
    设置挂载点显示框中分为五列，第一列是硬盘分区，如sdaX、mdX。第二列是挂载点，是挂载硬盘分区时所在的目录。第三列是硬盘分区的文件系统类型。第四列是指是否要格式化该硬盘分区，no表示不格式化,yes表示要格式化。第五列是各硬盘分区或raid设备的大小。
@@ -949,7 +957,7 @@ row 4 |                                                            |
    注意：1、有些挂载点不能单挂出去，例如：/etc,/bin,/sbin,/lib。
    2、有些挂载点不能挂载reiserfs、xfs文件系统，例如：/,/boot。
    3、当"/"挂载在raid设备时，"/boot"挂载点必须单挂出来。
-    4、当处理器为安腾系列时，需要挂载"/ia64boot"，且格式化为vfat格式。
+    4、当处理器为安腾系列时，需要挂载"/tmppoint"，且格式化为vfat格式。
    </Chinese>
    </text>