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
This commit is contained in:
@@ -44,6 +44,16 @@ prep ()
|
||||
done
|
||||
}
|
||||
|
||||
clean_mp ()
|
||||
{
|
||||
local mp
|
||||
|
||||
for mp in /dev /proc /sys
|
||||
do
|
||||
umount $mp
|
||||
done
|
||||
}
|
||||
|
||||
main ()
|
||||
{
|
||||
local base
|
||||
@@ -64,12 +74,15 @@ main ()
|
||||
fi
|
||||
done
|
||||
info "Running finish install success"
|
||||
[ ! -c "$LOG_FILE" ] && cp $LOG_FILE "$TARGET/var/log"
|
||||
[ ! -c "/var/install/install.xml" ] && cp "/var/install/install.xml" "$TARGET/var/log"
|
||||
[ ! -c "$DEV_LOG" ] && cp $DEV_LOG "$TARGET/var/log" || true
|
||||
[ ! -c "$LOG_FILE" ] && cp $LOG_FILE "$TARGET/var/log"
|
||||
[ ! -c "/var/install/install.xml" ] && cp "/var/install/install.xml" "$TARGET/var/log"
|
||||
[ ! -c "$DEV_LOG" ] && cp $DEV_LOG "$TARGET/var/log" || true
|
||||
|
||||
clean_mp
|
||||
}
|
||||
|
||||
FINISH_INSTALL_DIR="/usr/lib/new_install/operation/finish_install"
|
||||
|
||||
main "$@"
|
||||
|
||||
|
||||
|
||||
@@ -99,7 +99,7 @@ reumount ()
|
||||
else
|
||||
# delete last "/" in mountpoint
|
||||
# mountpoint in /proc/mounts don't have "/" at last
|
||||
multi_mountpoint=$(echo arg|sed "s%/$%%")
|
||||
multi_mountpoint=$(echo $arg|sed "s%/$%%")
|
||||
fi
|
||||
|
||||
# may be a device has been mounted in multi-mountpoint.
|
||||
|
||||
@@ -21,9 +21,9 @@
|
||||
|
||||
source ./functions
|
||||
|
||||
|
||||
main ()
|
||||
{
|
||||
reumount /mnt/
|
||||
while read line;do
|
||||
info "$line" stdout
|
||||
[ -z "$line" ] && continue
|
||||
@@ -38,6 +38,7 @@ main ()
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
main "$@"
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user