projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master'
[live-boot-grml.git]
/
components
/
9990-cmdline-old
diff --git
a/components/9990-cmdline-old
b/components/9990-cmdline-old
index
8bb8254
..
f04c0ff
100755
(executable)
--- a/
components/9990-cmdline-old
+++ b/
components/9990-cmdline-old
@@
-17,6
+17,17
@@
Cmdline_old ()
BOOTIF=*)
BOOTIF="${_PARAMETER#BOOTIF=}"
;;
BOOTIF=*)
BOOTIF="${_PARAMETER#BOOTIF=}"
;;
+ dns=*)
+ DNS=${_PARAMETER#dns=}
+ DNSSERVERS=$(echo ${DNS} | sed 's/,/ /g')
+ export DNSSERVERS
+ unset DNS
+ ;;
+
+ bootid=*)
+ BOOTID="${_PARAMETER#bootid=}"
+ export BOOTID
+ ;;
dhcp)
# Force dhcp even while netbooting
dhcp)
# Force dhcp even while netbooting
@@
-28,12
+39,13
@@
Cmdline_old ()
nodhcp)
DHCP=""
export DHCP
nodhcp)
DHCP=""
export DHCP
+ NODHCP="Yes"
+ export NODHCP
;;
ethdevice=*)
;;
ethdevice=*)
- DEVICE="${_PARAMETER#ethdevice=}"
- ETHDEVICE="${DEVICE}"
- export DEVICE ETHDEVICE
+ ETHDEVICE="${_PARAMETER#ethdevice=}"
+ export ETHDEVICE
;;
ethdevice-timeout=*)
;;
ethdevice-timeout=*)
@@
-79,19
+91,20
@@
Cmdline_old ()
export FROMISO
;;
export FROMISO
;;
+ ignore_bootid)
+ IGNORE_BOOTID="Yes"
+ export IGNORE_BOOTID
+ ;;
+
ignore_uuid)
IGNORE_UUID="true"
export IGNORE_UUID
;;
ip=*)
ignore_uuid)
IGNORE_UUID="true"
export IGNORE_UUID
;;
ip=*)
- STATICIP="${_PARAMETER#ip=}"
-
- if [ -z "${STATICIP}" ]
- then
- STATICIP="frommedia"
- fi
-
+ # copy complete ip=args into staticip, and
+ # keep multiple uses.
+ STATICIP="${STATICIP} ${_PARAMETER}"
export STATICIP
;;
export STATICIP
;;
@@
-140,6
+153,11
@@
Cmdline_old ()
export NFS_COW
;;
export NFS_COW
;;
+ nodhcphostname)
+ NODHCPHOSTNAME="Yes"
+ export NODHCPHOSTNAME
+ ;;
+
nofstab)
NOFSTAB="true"
export NOFSTAB
nofstab)
NOFSTAB="true"
export NOFSTAB
@@
-241,6
+259,11
@@
Cmdline_old ()
UNIONTYPE="${_PARAMETER#union=}"
export UNIONTYPE
;;
UNIONTYPE="${_PARAMETER#union=}"
export UNIONTYPE
;;
+
+ vlan=*)
+ VLANS="${VLANS} ${_PARAMETER#vlan=}"
+ export VLANS
+ ;;
esac
done
esac
done
@@
-266,7
+289,7
@@
Cmdline_old ()
if [ -z "${UNIONTYPE}" ]
then
if [ -z "${UNIONTYPE}" ]
then
- UNIONTYPE="
aufs
"
+ UNIONTYPE="
overlay
"
export UNIONTYPE
fi
export UNIONTYPE
fi
@@
-285,7
+308,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