clean up /proc/cmdline with dracut and allow dracut to boot with secure mode to fix #1261
This commit is contained in:
committed by
Jonathon Anderson
parent
2b82c2074a
commit
d62743ee11
@@ -8,6 +8,8 @@ do
|
||||
if [ -n "${archive}" ]
|
||||
then
|
||||
info "Loading ${archive}"
|
||||
(curl --silent -L "${archive}" | gzip -d | cpio -im --directory="${NEWROOT}") || die "Unable to load ${archive}"
|
||||
#Load only runtime overlays from a static privledge port
|
||||
[[ "$archive" == *"runtime"* ]] && localport="--local-port 986" || localport=""
|
||||
(curl --silent $localport -L "${archive}" | gzip -d | cpio -im --directory="${NEWROOT}") || die "Unable to load ${archive}"
|
||||
fi
|
||||
done
|
||||
|
||||
@@ -14,7 +14,7 @@ depends() {
|
||||
}
|
||||
|
||||
install() {
|
||||
inst_multiple cpio curl
|
||||
inst_multiple cpio curl dmidecode
|
||||
inst_hook cmdline 30 "$moddir/parse-wwinit.sh"
|
||||
inst_hook pre-mount 30 "$moddir/load-wwinit.sh"
|
||||
}
|
||||
|
||||
@@ -6,10 +6,12 @@
|
||||
if [ "${root}" = "wwinit" ]
|
||||
then
|
||||
info "root=${root}"
|
||||
export wwinit_container=$(getarg wwinit.container=); info "wwinit.container=${wwinit_container}"
|
||||
export wwinit_system=$(getarg wwinit.system=); info "wwinit.system=${wwinit_system}"
|
||||
export wwinit_runtime=$(getarg wwinit.runtime=); info "wwinit.runtime=${wwinit_runtime}"
|
||||
export wwinit_kmods=$(getarg wwinit.kmods=); info "wwinit.kmods=${wwinit_kmods}"
|
||||
export wwinit_uri="http://$(getarg wwinit.uri)/provision/$(getarg wwid)?assetkey=$(dmidecode -s chassis-asset-tag)&uuid=$(dmidecode -s system-uuid)&stage="
|
||||
export wwinit_container="${wwinit_uri}container&compress=gz"; info "wwinit.container=${wwinit_container}"
|
||||
export wwinit_system="${wwinit_uri}system&compress=gz"; info "wwinit.system=${wwinit_system}"
|
||||
export wwinit_runtime="${wwinit_uri}runtime&compress=gz"; info "wwinit.runtime=${wwinit_runtime}"
|
||||
wwinit_kmods_passed=$(getarg wwinit.kmods=)
|
||||
[ -n "$wwinit_kmods_passed" ] && export wwinit_kmods="${wwinit_uri}kmods&compress=gz"; info "wwinit.kmods=${wwinit_kmods}"
|
||||
|
||||
wwinit_tmpfs_size=$(getarg wwinit.tmpfs.size=)
|
||||
if [ -n "$wwinit_tmpfs_size" ]
|
||||
|
||||
Reference in New Issue
Block a user