From 95c70b1c5316a2820d3371de9a8626fadaf03996 Mon Sep 17 00:00:00 2001 From: hugang Date: Mon, 7 Mar 2011 15:19:23 +0800 Subject: [PATCH] modify error of operation --- operation/configure_bootloader_cnf.sh | 2 +- operation/copy_kernels.sh | 2 -- operation/install_bootloader.sh | 2 ++ operation/mount_partition.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/operation/configure_bootloader_cnf.sh b/operation/configure_bootloader_cnf.sh index 72ad3dc..b8745a6 100755 --- a/operation/configure_bootloader_cnf.sh +++ b/operation/configure_bootloader_cnf.sh @@ -224,7 +224,7 @@ GRUB_DIR="$TARGET/boot/grub" GRUBMENU="$GRUB_DIR/menu.lst" GRUBCNF="$GRUB_DIR/grub.conf.sample" DEVICEMAP="$GRUB_DIR/device.map" -ELILO_CNF="$TARGET/boot/efi/boot/elilo.conf" +ELILO_CNF="/tmp/tmppoint/efi/boot/elilo.conf" # The quotes around '$@' are essential! # in this way we can accept whitespace as parameter. diff --git a/operation/copy_kernels.sh b/operation/copy_kernels.sh index 4669776..13ef67a 100755 --- a/operation/copy_kernels.sh +++ b/operation/copy_kernels.sh @@ -69,8 +69,6 @@ main () 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 diff --git a/operation/install_bootloader.sh b/operation/install_bootloader.sh index c894aba..7422784 100755 --- a/operation/install_bootloader.sh +++ b/operation/install_bootloader.sh @@ -105,6 +105,8 @@ main () elilo) echo "install elilo"; sed -i '/tmppoint/d' $TARGET/etc/fstab + umount /tmp/tmppoint + rm -rf /tmp/tmppoint ;; *) diff --git a/operation/mount_partition.sh b/operation/mount_partition.sh index e27b980..69f682d 100755 --- a/operation/mount_partition.sh +++ b/operation/mount_partition.sh @@ -89,7 +89,7 @@ mount_partition () if [ $mount_pos = "$TARGET/tmppoint" ]; then mkdir -p "/tmp/tmppoint" - $mount_pos="/tmp/tmppoint" + mount_pos="/tmp/tmppoint" fi mount -t "$fs_type" -o $fs_mntops "$devname" "$mount_pos" 1>>"$DEV_LOG" 2>&1