diff --git a/interface/ri_cmd.py b/interface/ri_cmd.py
index ad8f8c1..100e11a 100644
--- 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()
diff --git a/interface/ri_data.py b/interface/ri_data.py
index 3dd05d9..ac7e88c 100644
--- 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
diff --git a/interface/ri_tk_cmd.py b/interface/ri_tk_cmd.py
index 2d28226..11a1f5e 100644
--- 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' '''
diff --git a/operation/copy_kernels.sh b/operation/copy_kernels.sh
index 6eabca7..4669776 100755
--- 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"
diff --git a/operation/install_bootloader.sh b/operation/install_bootloader.sh
index ca501c3..c894aba 100755
--- 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
;;
*)
diff --git a/operation/mount_partition.sh b/operation/mount_partition.sh
index e99df43..e27b980 100755
--- 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
}
diff --git a/xml/interface.xml b/xml/interface.xml
index a4e5534..421b156 100644
--- a/xml/interface.xml
+++ b/xml/interface.xml
@@ -466,6 +466,7 @@ row 4 | |
+
@@ -796,6 +797,7 @@ row 4 | |
+