[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1d109fd2a63305c5ec3653bbb7888a2142aa744b

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1d109fd2a63305c5ec3653bbb7888a2142aa744b

[git]

[-- Attachment #1: Type: text/plain, Size: 3163 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  1d109fd2a63305c5ec3653bbb7888a2142aa744b (commit)
      from  d14229c0da139a3dca3bff3b95a6dafdc7a52f93 (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 1d109fd2a63305c5ec3653bbb7888a2142aa744b
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date:   Sun Jan 6 12:58:23 2013 +0100

    installer: add parameter to skip a block device for installation.
    
    A hyper-v user has reported that the ipfire installer detects a wrong drive
    as sda and always try to install on this.
    Now you can boot the installation with "ipfire skipdst=sda" to install
    this may help to install on hyper-v and other situations.
    If more than one should skipped add a parameter for every drive.

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

Summary of changes:
 config/syslinux/syslinux.cfg           | 3 +++
 src/install+setup/install/mountdest.sh | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg
index 68ad82a..5a6a975 100644
--- a/config/syslinux/syslinux.cfg
+++ b/config/syslinux/syslinux.cfg
@@ -3,6 +3,9 @@ DISPLAY boot.msg
 PROMPT 1
 DEFAULT vmlinuz
   APPEND initrd=instroot vga=791 splash=silent ro
+LABEL ipfire
+  KERNEL vmlinuz
+  APPEND initrd=instroot vga=791 splash=silent ro
 LABEL novga
   KERNEL vmlinuz
   APPEND initrd=instroot ro
diff --git a/src/install+setup/install/mountdest.sh b/src/install+setup/install/mountdest.sh
index f2c4b53..e28a068 100644
--- a/src/install+setup/install/mountdest.sh
+++ b/src/install+setup/install/mountdest.sh
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2013  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -89,6 +89,12 @@ for path in /sys/block/*; do
 		fi
 	done
 
+	# Check if user want skip by commandline
+	if [ "$(grep "skipdst=${device_}" /proc/cmdline)" ]; then
+		echo "${device_} was skipped via cmdline."
+		continue
+	fi
+
 	echo "Checking ${device_}"
 	if check_source_drive ${device_}; then
 		echo "  is source drive - skipping"


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