[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 5104a1d35fdef70cb2b6e7068857369b69479d0e

Steffen Moeller steffen_moeller at gmx.de
Fri Mar 5 21:30:38 UTC 2010


The following commit has been merged in the master branch:
commit 0c8820f5508a9cd05339d6de257dec0ccbd8da7a
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Fri Mar 5 22:28:58 2010 +0100

    Added intern_ prefixes to local variables

diff --git a/install.sh b/install.sh
index 245e98b..e7d38c6 100755
--- a/install.sh
+++ b/install.sh
@@ -1640,6 +1640,8 @@ action_unmount () {
 	fi
 	echo "I: microSD card partitions unmounted"
 
+	intern_fstablines='E: the intern_fstablines remained unset'
+	intern_line_or_lines='E: the intern_fstablines remained unset'
 	if [ -z "$intern_instdir_already_present" -o "no" = "$intern_instdir_already_present" ]; then
 		if ! rmdir "$INST_DIR"; then
 			echo "W: Could not remove directory '$INST_DIR'."
@@ -1647,12 +1649,12 @@ action_unmount () {
 		fi
 		
 		if [ "$SINGLE_PART" = "true" ]; then
-			FSTABLINES="${SD_DEVICE}p1  $INST_DIR  auto  defaults,async  0  0"
-			LINE_OR_LINES="line"
+			intern_fstablines="${SD_DEVICE}p1  $INST_DIR  auto  defaults,async  0  0"
+			intern_line_or_lines="line"
 		else
-			FSTABLINES="${SD_DEVICE}p1  $INST_DIR/boot  auto  defaults,async  0  0
+			intern_fstablines="${SD_DEVICE}p1  $INST_DIR/boot  auto  defaults,async  0  0
 ${SD_DEVICE}p2  $INST_DIR  auto  defaults,async  0  0"
-			LINE_OR_LINES="lines"
+			intern_line_or_lines="lines"
 		fi
 		
 		cat <<EOINSTRUCTIONS
@@ -1663,9 +1665,9 @@ the directory '$INST_DIR' (if necessary) with
 
 if [ ! -d $INST_DIR ]; then mkdir "$INST_DIR"; fi
 
-and add the $LINE_OR_LINES
+and add the $intern_line_or_lines
 
-$FSTABLINES
+$intern_fstablines
 
 to the file /etc/fstab, so it will be mounted with subsequent
 boots into the current system.

-- 
Various non-packaged files



More information about the pkg-fso-commits mailing list