[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 732447b9b3a188ac4f50b4902efaa854c2fba176

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3589 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  732447b9b3a188ac4f50b4902efaa854c2fba176 (commit)
       via  d02a7f9d050e97714e151bb93c8f67448b743d5e (commit)
      from  fdde104f2d7a333b79fe61eeeb77582efe10cb58 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 732447b9b3a188ac4f50b4902efaa854c2fba176
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Feb 8 22:37:09 2012 +0100

    installer: Enhance mountsource.sh script.
    
    Searches for installation images on all partitions on external
    media.
    
    References bug #10020.

commit d02a7f9d050e97714e151bb93c8f67448b743d5e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Feb 8 22:35:30 2012 +0100

    vim: Create configuration files for better usage.
    
    This commits also ships all syntax highlighting information
    and among others in /usr/share/vim.
    
    References bug #10021.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/vim                        |    4 ++--
 .../{oldcore/44 => core/57}/filelists/vim          |    0
 src/install+setup/install/mountsource.sh           |   10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)
 copy config/rootfiles/{oldcore/44 => core/57}/filelists/vim (100%)

Difference in files:
diff --git a/config/rootfiles/common/vim b/config/rootfiles/common/vim
index 65667bc..6f5ee80 100644
--- a/config/rootfiles/common/vim
+++ b/config/rootfiles/common/vim
@@ -1,4 +1,4 @@
-#etc/vimrc
+etc/vimrc
 #usr/bin/ex
 #usr/bin/rview
 #usr/bin/rvim
@@ -17,7 +17,7 @@ usr/bin/vim
 #usr/share/man/man1/vimdiff.1
 #usr/share/man/man1/vimtutor.1
 #usr/share/man/man1/xxd.1
-#usr/share/vim
+usr/share/vim
 #usr/share/vim/vim72
 #usr/share/vim/vim72/autoload
 #usr/share/vim/vim72/autoload/README.txt
diff --git a/config/rootfiles/core/57/filelists/vim b/config/rootfiles/core/57/filelists/vim
new file mode 120000
index 0000000..9861317
--- /dev/null
+++ b/config/rootfiles/core/57/filelists/vim
@@ -0,0 +1 @@
+../../../common/vim
\ No newline at end of file
diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh
index bb7a7e2..6813758 100644
--- a/src/install+setup/install/mountsource.sh
+++ b/src/install+setup/install/mountsource.sh
@@ -36,15 +36,17 @@ done
 
 # scan HD device part1 (usb sticks, etc.)
 for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort | uniq); do
-		mount /dev/${DEVICE}1 /cdrom 2> /dev/null
+	for DEVICEP in $(ls /dev/${DEVICE}? | sed "s/\/dev\///");do
+		mount /dev/${DEVICEP} /cdrom 2> /dev/null
 		if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then
-			echo -n ${DEVICE}1 > /tmp/source_device
-			echo "Found tarball on ${DEVICE}1"
+			echo -n ${DEVICEP} > /tmp/source_device
+			echo "Found tarball on ${DEVICEP}"
 			exit 0
 		else
-			echo "Found no tarballs on ${DEVICE}1 - SKIP"
+			echo "Found no tarballs on ${DEVICEP} - SKIP"
 		fi
 		umount /cdrom 2> /dev/null
+	done
 done
 
 # scan HD device unpart (usb sticks, etc.)


hooks/post-receive
--
IPFire 2.x development tree