projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Double quote to prevent globbing and word splitting
[live-boot-grml.git]
/
components
/
9990-cmdline-old
diff --git
a/components/9990-cmdline-old
b/components/9990-cmdline-old
index
8bb8254
..
03e8fc6
100755
(executable)
--- a/
components/9990-cmdline-old
+++ b/
components/9990-cmdline-old
@@
-17,7
+17,12
@@
Cmdline_old ()
BOOTIF=*)
BOOTIF="${_PARAMETER#BOOTIF=}"
;;
BOOTIF=*)
BOOTIF="${_PARAMETER#BOOTIF=}"
;;
-
+ dns=*)
+ DNS=${_PARAMETER#dns=}
+ DNSSERVERS=$(echo ${DNS} | sed 's/,/ /g')
+ export DNSSERVERS
+ unset DNS
+ ;;
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="true"
+ export NODHCP
;;
ethdevice=*)
;;
ethdevice=*)
@@
-154,6
+161,11
@@
Cmdline_old ()
ramdisk_size="${_PARAMETER#ramdisk-size=}"
;;
ramdisk_size="${_PARAMETER#ramdisk-size=}"
;;
+ overlay-size=*)
+ OVERLAY_SIZE="${_PARAMETER#overlay-size=}"
+ export OVERLAY_SIZE
+ ;;
+
persistence)
PERSISTENCE="true"
export PERSISTENCE
persistence)
PERSISTENCE="true"
export PERSISTENCE
@@
-266,7
+278,7
@@
Cmdline_old ()
if [ -z "${UNIONTYPE}" ]
then
if [ -z "${UNIONTYPE}" ]
then
- UNIONTYPE="
aufs
"
+ UNIONTYPE="
overlay
"
export UNIONTYPE
fi
export UNIONTYPE
fi
@@
-285,7
+297,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