projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removing noautologin parameter from live script, this functionallity was moved to...
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
2e40b45
..
412094a
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-51,14
+51,11
@@
Arguments ()
case "${ARGUMENT}" in
skipconfig)
NOACCESSIBILITY="Yes"
case "${ARGUMENT}" in
skipconfig)
NOACCESSIBILITY="Yes"
- NOAUTOLOGIN="Yes"
- NOCONSOLEKEYBOARD="Yes"
NOFASTBOOT="Yes"
NOFSTAB="Yes"
NONETWORKING="Yes"
NOFASTBOOT="Yes"
NOFSTAB="Yes"
NONETWORKING="Yes"
- NOXAUTOCONFIG="Yes"
- export NOACCESSIBILITY NO
AUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NONETWORKING NOXAUTOCONFI
G
+ export NOACCESSIBILITY NO
FASTBOOT NOFSTAB NONETWORKIN
G
;;
access=*)
;;
access=*)
@@
-218,11
+215,6
@@
Arguments ()
export NOACCESSIBILITY
;;
export NOACCESSIBILITY
;;
- noautologin)
- NOAUTOLOGIN="Yes"
- export NOAUTOLOGIN
- ;;
-
nofastboot)
NOFASTBOOT="Yes"
export NOFASTBOOT
nofastboot)
NOFASTBOOT="Yes"
export NOFASTBOOT
@@
-243,11
+235,6
@@
Arguments ()
export SWAPON
;;
export SWAPON
;;
- noxautoconfig)
- NOXAUTOCONFIG="Yes"
- export NOXAUTOCONFIG
- ;;
-
persistent)
PERSISTENT="Yes"
export PERSISTENT
persistent)
PERSISTENT="Yes"
export PERSISTENT
@@
-351,21
+338,6
@@
Arguments ()
UNIONTYPE="${ARGUMENT#union=}"
export UNIONTYPE
;;
UNIONTYPE="${ARGUMENT#union=}"
export UNIONTYPE
;;
-
- xdebconf)
- XDEBCONF="Yes"
- export XDEBCONF
- ;;
-
- xdriver=*)
- XDRIVER="${ARGUMENT#xdriver=}"
- export XDRIVER
- ;;
-
- xvideomode=*)
- XVIDEOMODE="${ARGUMENT#xvideomode=}"
- export XVIDEOMODE
- ;;
esac
done
esac
done
@@
-757,6
+729,8
@@
do_iscsi()
do
if check_dev "null" "/dev/$dev"
then
do
if check_dev "null" "/dev/$dev"
then
+ NETBOOT="iscsi"
+ export NETBOOT
return 0;
fi
done
return 0;
fi
done
@@
-764,8
+738,6
@@
do_iscsi()
else
panic "Failed to locate iSCSI host in /sys"
fi
else
panic "Failed to locate iSCSI host in /sys"
fi
- NETBOOT="iscsi"
- export NETBOOT
}
do_httpmount ()
}
do_httpmount ()