[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 5104a1d35fdef70cb2b6e7068857369b69479d0e
Steffen
moeller at inb.uni-luebeck.de
Fri Mar 5 21:30:37 UTC 2010
The following commit has been merged in the master branch:
commit ace696ee3e0b29a44a3d270237972c4a761b6c87
Author: Steffen <moeller at inb.uni-luebeck.de>
Date: Fri Mar 5 12:04:00 2010 +0100
Increased consistency between status messages
Following a suggestion of Steven De Herdt to clearly indicate
the starts and ends of actions by an "I:..." line. Untested.
diff --git a/install.sh b/install.sh
index ad48131..f4430cb 100755
--- a/install.sh
+++ b/install.sh
@@ -595,7 +595,8 @@ __END__
#
action_testing () {
- echo "Testing system setup"
+
+ echo "I: Testing system setup"
intern_packages_required="wget ping fdisk mount umount mkfs.$SD_PART1_FS mkswap gunzip dd sed rdate ar basename dirname"
if [ "mkfs.$SD_PART2_FS" != "mkfs.$SD_PART1_FS" ]; then
@@ -691,7 +692,7 @@ action_testing () {
exit 1
fi
- echo "I: System setup looks good"
+ echo "I: Testing system setup - done - looks good"
}
#
@@ -709,6 +710,9 @@ action_time () {
#
action_partition () {
+
+ echo "I: Partitioning SD"
+
card_data_warning partition
umount_all
@@ -826,7 +830,8 @@ EOSWAPCONF
sleep 3
intern_sleep_seconds=$(( $intern_sleep_seconds + 3 ))
done
- echo " * Partition table created"
+
+ echo "I: Partitioning SD - done - Partition table created"
}
#
@@ -834,7 +839,7 @@ EOSWAPCONF
#
action_format () {
- echo
+ echo "I: Formatting SD"
card_data_warning format
umount_all
@@ -853,7 +858,7 @@ action_format () {
mkswap ${SD_DEVICE}p${nextpart}
fi
- echo "I: microSD card ready"
+ echo "I: Formatting SD - done - microSD card ready"
}
#
@@ -861,7 +866,9 @@ action_format () {
#
action_mount () {
- echo "Mounting the newly created system"
+
+ echo "I: Mounting the newly created system"
+
if [ ! -d "$INST_DIR" ]; then
mkdir -p "$INST_DIR";
intern_instdir_already_present=""
@@ -883,8 +890,8 @@ action_mount () {
mount -t auto ${SD_DEVICE}p1 "$INST_DIR/boot"
fi
fi
- echo "I: microSD card partitions mounted"
+ echo "I: Mounting the newly created system - done - microSD card partitions mounted"
}
@@ -893,7 +900,7 @@ action_mount () {
#
action_debian () {
- echo "Install a basic Debian system"
+ echo "I: Install a basic Debian system"
intern_bootstrapper_package=
if [ "cdebootstrap" = "$BOOTSTRAPPER" ]; then
@@ -964,7 +971,7 @@ action_debian () {
# (direct or indirect) dependencies. The DEBIAN_EXTRA_PACKAGES are consequently
# installed in the action_apt
- echo "I: Basic Debian system installed - please also install apt"
+ echo "I: Install a basic Debian system - done - Basic Debian system installed - please also install apt"
}
@@ -973,7 +980,7 @@ action_debian () {
#
action_apt () {
- echo "Configuring APT"
+ echo "I: Configuring APT"
if ! ensure_proc_is_mounted; then
echo " /proc is needed for APT configuration - please investigate."
@@ -1031,7 +1038,7 @@ __END__
echo " * Cleaning APT cache"
chroot "$INST_DIR" apt-get clean
- echo "I: APT configured"
+ echo "I: Configuring APT - done - APT configured"
}
@@ -1040,7 +1047,7 @@ __END__
#
action_fso () {
- echo "Installing freesmartphone.org software"
+ echo "I: Installing freesmartphone.org software"
ensure_proc_is_mounted
@@ -1064,7 +1071,7 @@ __END_CHROOT__
echo "skipped (\$ZHONE=$ZHONE)"
fi
- echo "I: freesmartphone.org software installed"
+ echo "I: Installing freesmartphone.org software - done"
}
@@ -1093,7 +1100,7 @@ action_tasks () {
TASKS="$intern_tasks_defined"
fi
- echo "Performing selected tasks: $TASKS"
+ echo "I: Performing selected tasks: $TASKS"
ensure_proc_is_mounted
@@ -1127,6 +1134,8 @@ action_tasks () {
;;
esac
done
+
+ echo "I: Performing selected tasks - done"
}
@@ -1135,7 +1144,7 @@ action_tasks () {
#
action_configuration () {
- echo "Configuring system files for ${FSO_DEVICE}"
+ echo "I: Configuring system files for ${FSO_DEVICE}"
root_password_warning
@@ -1372,7 +1381,7 @@ EOPANELPLUGIN
chroot "$INST_DIR" apt-get $APT_OPTIONS install $DISPLAY_MANAGER
fi
- echo "I: System configured"
+ echo "I: Configuring system files for ${FSO_DEVICE} - done - System configured"
}
@@ -1381,7 +1390,7 @@ EOPANELPLUGIN
#
action_kernel () {
- echo "Installing kernel package"
+ echo "I: Installing kernel package"
if [ "$FSO_DEVICE" != gta02 ]; then
cat <<EOF
@@ -1482,6 +1491,8 @@ __END_CHROOT__
fi
fi
fi
+
+ echo "I: Installing kernel package - done"
}
@@ -1490,7 +1501,7 @@ __END_CHROOT__
#
action_uboot () {
- echo "Modifying U-Boot bootloader menu"
+ echo "I: Modifying U-Boot bootloader menu"
if [ "$SD_PART1_FS" = "vfat" ]; then
echo "W: When using $SD_PART1_FS as filesystem for the first microSD card"
@@ -1571,7 +1582,7 @@ __END_CHROOT__
echo " * Unmounting /dev"
umount "$INST_DIR/dev"
- echo "I: U-Boot environment modified"
+ echo "I: Modifying U-Boot bootloader menu - done"
}
@@ -1581,7 +1592,7 @@ __END_CHROOT__
action_cleanup () {
- echo "Cleaning the environment"
+ echo "I: Cleaning the environment"
echo " * Remove additional packages"
chroot "$INST_DIR" apt-get --yes --purge remove cdebootstrap-helper-rc.d xserver-xorg-input-synaptics
@@ -1589,7 +1600,7 @@ action_cleanup () {
echo " * Cleaning APT cache"
chroot "$INST_DIR" apt-get clean
- echo "I: the environment is now clean!"
+ echo "I: Cleaning the environment - done - the environment is now clean!"
}
@@ -1599,7 +1610,7 @@ action_cleanup () {
action_unmount () {
- echo "Unmounting"
+ echo "I: Unmounting - start"
if mount | grep -q "$INST_DIR/proc"; then
echo -n " * Unmounting proc from install directory"
@@ -1647,6 +1658,7 @@ boots into the current system.
EOINSTRUCTIONS
fi
+ echo "I: Unmounting - done"
return 0
}
@@ -1739,18 +1751,19 @@ do
exit 1
fi
action_all
+ echo
echo "I: Done with all stages"
fi
;;
"testing"|"time"|"partition"|"format"|"mount"|"debian"|"apt"|"fso"|"configuration"|"kernel"|"unmount"|"uboot"|"tasks"|"cleanup")
if [ -z "$showHelp" ]; then
- echo "Running stage $i"
+ if [ -n "$VERBOSE" ]; echo "I: Invoking stage $i"; fi
if [ "$FSO_DEVICE" != gta01 -a "$FSO_DEVICE" != gta02 ]; then
echo "E: unsupported FSO_DEVICE '$FSO_DEVICE'"
exit 1
fi
action_$i
- echo "I: Done with stage $i"
+ if [ -n "$VERBOSE" ]; echo "I: Done with stage $i"; fi
fi
;;
*)
--
Various non-packaged files
More information about the pkg-fso-commits
mailing list