aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcraig <craig@haquarter.de>2009-10-03 13:23:24 +0200
committercraig <craig@haquarter.de>2009-10-03 13:23:24 +0200
commit97b4dc26e266100b4eba319712188e488712783e (patch)
treeb5aee0facf8a359f37b2044d2f2b8eba7b337412 /defaults/linuxrc
parentsimple bugfix for parsing cmdline (diff)
downloadgenkernel-97b4dc26e266100b4eba319712188e488712783e.tar.gz
genkernel-97b4dc26e266100b4eba319712188e488712783e.tar.bz2
genkernel-97b4dc26e266100b4eba319712188e488712783e.zip
Improve naming of bootflags, added support for: port, target portal, username, password, username_in, password_in, debug
Diffstat (limited to 'defaults/linuxrc')
-rwxr-xr-xdefaults/linuxrc41
1 files changed, 31 insertions, 10 deletions
diff --git a/defaults/linuxrc b/defaults/linuxrc
index d50d95a..8ff1b6d 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -149,15 +149,36 @@ do
nfsroot\=*)
NFSROOT=`parse_opt "${x}"`
;;
- # ISCSI
- iscsi_i\=*)
- ISCSI_I=`parse_opt "${x}"`
+ # iSCSI
+ iscsi_initiatorname\=*)
+ ISCSI_INITIATORNAME=`parse_opt "${x}"`
;;
- iscsi_t\=*)
- ISCSI_T=`parse_opt "${x}"`
+ iscsi_target\=*)
+ ISCSI_TARGET=`parse_opt "${x}"`
;;
- iscsi_a\=*)
- ISCSI_A=`parse_opt "${x}"`
+ iscsi_tgpt\=*)
+ ISCSI_TGPT=`parse_opt "${x}"`
+ ;;
+ iscsi_address\=*)
+ ISCSI_ADDRESS=`parse_opt "${x}"`
+ ;;
+ iscsi_port\=*)
+ ISCSI_PORT=`parse_opt "${x}"`
+ ;;
+ iscsi_username\=*)
+ ISCSI_USERNAME=`parse_opt "${x}"`
+ ;;
+ iscsi_password\=*)
+ ISCSI_PASSWORD=`parse_opt "${x}"`
+ ;;
+ iscsi_username_in\=*)
+ ISCSI_USERNAME_IN=`parse_opt "${x}"`
+ ;;
+ iscsi_password_in\=*)
+ ISCSI_PASSWORD_IN=`parse_opt "${x}"`
+ ;;
+ iscsi_debug\=*)
+ ISCSI_DEBUG=`parse_opt "${x}"`
;;
# Crypto
crypt_root\=*)
@@ -268,15 +289,15 @@ sdelay
# Start device manager
start_dev_mgr
+# Start iSCSI
+startiscsi
+
# Setup md device nodes if they dont exist
setup_md_device
# Scan volumes
startVolumes
-# Start ISCSI
-startiscsi
-
setup_keymap
# Initialize LUKS root device except for livecd's