All of lore.kernel.org
 help / color / mirror / Atom feed
From: OpenBMC Patches <openbmc-patches@stwcx.xyz>
To: openbmc@lists.ozlabs.org
Subject: [PATCH openbmc 11/16] initfs: init: add file for base options
Date: Thu, 30 Jun 2016 18:50:28 -0500	[thread overview]
Message-ID: <20160630235033.17091-12-openbmc-patches@stwcx.xyz> (raw)
In-Reply-To: <20160630235033.17091-1-openbmc-patches@stwcx.xyz>

From: Milton Miller <miltonm@us.ibm.com>

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>
---
 .../recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 c37b3d5..70af93d 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
-- 
2.9.0

  parent reply	other threads:[~2016-06-30 23:50 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-30 23:50 [PATCH openbmc 00/16] Update flash update to be useable at runtime for v1.0-stable OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 01/16] image_types_uboot: Don't truncate when assembling flash OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 02/16] initfs: Fix recipe, remove unnecessary class OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 03/16] initfs: shutdown: comment on update success OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 04/16] initfs: update: Don't exec sh or sulogin on error just exit 1 OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 05/16] initfs: update: Do not cause an error if no files were saved OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 06/16] initfs: update: Consistently add ERROR: and print to stderr OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 07/16] initfs: update: add option to perform checks but skip actual update OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 08/16] initfs: update: check individual mtd partitions for mounts OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 09/16] initfs: update: add check for image size vs mtd size OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 10/16] initfs: update: add --help message OpenBMC Patches
2016-06-30 23:50 ` OpenBMC Patches [this message]
2016-06-30 23:50 ` [PATCH openbmc 12/16] image-types_uboot: Package a self contained netboot image OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 13/16] initfs: update: handle no images to update OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 14/16] initfs: update: Sanitize whitelist directory entries OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 15/16] initfs: whitelist: Sanitize obmc events whitelist entry OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 16/16] initfs: Store whiltelist in a directory of files OpenBMC Patches

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160630235033.17091-12-openbmc-patches@stwcx.xyz \
    --to=openbmc-patches@stwcx.xyz \
    --cc=openbmc@lists.ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.