projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert toram bootoption to expected behaviour.
[live-boot-grml.git]
/
components
/
9990-cmdline-old
diff --git
a/components/9990-cmdline-old
b/components/9990-cmdline-old
index
8bb8254
..
2f566bb
100755
(executable)
--- a/
components/9990-cmdline-old
+++ b/
components/9990-cmdline-old
@@
-18,6
+18,11
@@
Cmdline_old ()
BOOTIF="${_PARAMETER#BOOTIF=}"
;;
BOOTIF="${_PARAMETER#BOOTIF=}"
;;
+ bootid=*)
+ BOOTID="${_PARAMETER#bootid=}"
+ export BOOTID
+ ;;
+
dhcp)
# Force dhcp even while netbooting
# Use for debugging in case somebody works on fixing dhclient
dhcp)
# Force dhcp even while netbooting
# Use for debugging in case somebody works on fixing dhclient
@@
-28,6
+33,8
@@
Cmdline_old ()
nodhcp)
DHCP=""
export DHCP
nodhcp)
DHCP=""
export DHCP
+ NODHCP="Yes"
+ export NODHCP
;;
ethdevice=*)
;;
ethdevice=*)
@@
-79,6
+86,11
@@
Cmdline_old ()
export FROMISO
;;
export FROMISO
;;
+ ignore_bootid)
+ IGNORE_BOOTID="Yes"
+ export IGNORE_BOOTID
+ ;;
+
ignore_uuid)
IGNORE_UUID="true"
export IGNORE_UUID
ignore_uuid)
IGNORE_UUID="true"
export IGNORE_UUID
@@
-140,6
+152,11
@@
Cmdline_old ()
export NFS_COW
;;
export NFS_COW
;;
+ nodhcphostname)
+ NODHCPHOSTNAME="Yes"
+ export NODHCPHOSTNAME
+ ;;
+
nofstab)
NOFSTAB="true"
export NOFSTAB
nofstab)
NOFSTAB="true"
export NOFSTAB
@@
-266,7
+283,7
@@
Cmdline_old ()
if [ -z "${UNIONTYPE}" ]
then
if [ -z "${UNIONTYPE}" ]
then
- UNIONTYPE="
aufs
"
+ UNIONTYPE="
overlay
"
export UNIONTYPE
fi
export UNIONTYPE
fi
@@
-285,7
+302,7
@@
Cmdline_old ()
if [ ! -x /lib/cryptsetup/askpass ] || [ ! -x /sbin/cryptsetup ]
then
if [ ! -x /lib/cryptsetup/askpass ] || [ ! -x /sbin/cryptsetup ]
then
- log_warning_msg "cryptsetup i
n
unavailable"
+ log_warning_msg "cryptsetup i
s
unavailable"
PERSISTENCE_ENCRYPTION=$(echo ${PERSISTENCE_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
export PERSISTENCE_ENCRYPTION
fi
PERSISTENCE_ENCRYPTION=$(echo ${PERSISTENCE_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
export PERSISTENCE_ENCRYPTION
fi