diff options
| author | Milton Miller <miltonm@us.ibm.com> | 2016-05-26 02:52:04 +0300 |
|---|---|---|
| committer | Milton Miller <miltonm@us.ibm.com> | 2016-06-26 01:58:13 +0300 |
| commit | 49ce6a12f6757840092671cc6a72b8d0cd60d874 (patch) | |
| tree | 354a9b22763a40fbbb7871006e54ed64e39a4dcb /meta-phosphor/common | |
| parent | 30137fa2a0122bf504369d1b90ac019df5685357 (diff) | |
| download | openbmc-49ce6a12f6757840092671cc6a72b8d0cd60d874.tar.xz | |
initfs: init: add file for base options
Allow an initrd image to include options for init while still allowing
additional options to come from the kernel command line and/or u-boot
environment variables.
This will allow building a netboot image that can specify to run
from RAM while allowing the command line to initiate debug or skip
copying files from the read-write overlay file system.
Signed-off-by: Milton Miller <miltonm@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common')
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh index c37b3d53d..70af93d99 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh @@ -184,6 +184,7 @@ fsckbase=/sbin/fsck. fsck=$fsckbase$rwfst fsckopts=-a optfile=/run/initramfs/init-options +optbase=/run/initramfs/init-options-base urlfile=/run/initramfs/init-download-url update=/run/initramfs/update @@ -192,9 +193,16 @@ then cp /${optfile##*/} $optfile fi +if test -e /${optbase##*/} +then + cp /${optbase##*/} $optbase +else + touch $optbase +fi + if test ! -f $optfile then - cat /proc/cmdline > $optfile + cat /proc/cmdline $optbase > $optfile get_fw_env_var openbmcinit >> $optfile get_fw_env_var openbmconce >> $optfile fi |