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.

diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg
index 68ad82afd721b9eea16af87732e3e6ebece44e14..5a6a975a205c6df275a36ddbfbb9ac522d9af80e 100644 (file)
--- 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 f2c4b53e221ae011b15a25d6af4444d32238d095..e28a0689bd1c5a98e3bd8c81a1478bedb2fa17d0 100644 (file)
--- 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@ipfire.org>                     #
+# Copyright (C) 2007-2013  IPFire Team  <info@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"