diff options
| author |   Sebastian Pipping <sebastian@pipping.org> | 2011-02-08 18:01:11 +0100 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2011-02-08 18:01:11 +0100 |
| commit | 8097ea8d4c74ff47be2e07efe1b3a45d8871f834 (patch) | |
| tree | 6f001796b55603c091098b460f7016e30d52fc7f | |
| parent | Fix error message (diff) | |
| parent | Extend change log (diff) | |
| download | genkernel-8097ea8d4c74ff47be2e07efe1b3a45d8871f834.tar.gz genkernel-8097ea8d4c74ff47be2e07efe1b3a45d8871f834.tar.bz2 genkernel-8097ea8d4c74ff47be2e07efe1b3a45d8871f834.zip | |
Merge branch 'bug-314575' using --no-ff
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | defaults/initrd.scripts | 8 | ||||
| -rwxr-xr-x | defaults/linuxrc | 8 |
3 files changed, 20 insertions, 2 deletions
@@ -5,6 +5,12 @@ # Distributed under the GPL v2 # $Id$ + 08 Feb 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog: + Add iBFT support for iSCSI (bug #314575) + + Special thanks: + - Stefan Behte + 7 Feb 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog: Use devtmpfs/tmpfs for /dev (bug #353024) Rescue devtmpfs /dev over to chroot (bug #353024, bug #344407) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 249b721d..f7f01ded 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -689,10 +689,16 @@ startVolumes() { } startiscsi() { + + if [ ! -n "${ISCSI_NOIBFT}" ] + then + good_msg "Activating iSCSI via iBFT" + iscsistart -b + fi if [ -n "${ISCSI_INITIATORNAME}" ] && [ -n "${ISCSI_TARGET}" ] && [ -n "${ISCSI_ADDRESS}" ] then - good_msg "Activating iSCSI" + good_msg "Activating iSCSI via cmdline" if [ "${ISCSI_TGPT}" ] then diff --git a/defaults/linuxrc b/defaults/linuxrc index f1e124b7..61efc953 100755 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -178,6 +178,9 @@ do iscsi_debug\=*) ISCSI_DEBUG=`parse_opt "${x}"` ;; + iscsi_noibft) + ISCSI_NOIBFT=1 + ;; # Crypto crypt_root\=*) CRYPT_ROOT=`parse_opt "${x}"` @@ -294,7 +297,10 @@ start_dev_mgr [ "${DO_slowusb}" ] && sleep 10 # Start iSCSI -startiscsi +if [ -e /bin/iscsistart ] +then + startiscsi +fi # Setup btrfs, see bug 303529 setup_btrfsctl |