From: Arne Fitzenreiter Date: Sun, 6 Jan 2013 11:58:23 +0000 (+0100) Subject: installer: add parameter to skip a block device for installation. X-Git-Tag: v2.13-beta2~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d109fd2a63305c5ec3653bbb7888a2142aa744b;p=ipfire-2.x.git 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 68ad82afd7..5a6a975a20 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 f2c4b53e22..e28a0689bd 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 # +# Copyright (C) 2007-2013 IPFire Team # # # # 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"