| Submitter | Darren Hart |
|---|---|
| Date | Sept. 15, 2011, 10:41 p.m. |
| Message ID | <cover.1316126173.git.dvhart@linux.intel.com> |
| Download | mbox |
| Permalink | /patch/11487/ |
| State | New, archived |
| Headers | show |
Pull-request
git://git.pokylinux.org/poky-contrib dvhart/initrdscriptsComments
On Thu, 2011-09-15 at 15:41 -0700, Darren Hart wrote: > I ran into a bit of a nasty issue where EXTRA_IMAGE_FEATURES set in my > local.conf was causing core-image-initramfs to pull a bunch of files into > my initrd, including bash and a 100+MB vmlinux image. The 85M initrd caused > some strange initial boot behavior, and bash in the initrd caused our init > scripts to fail as bash has a different default PATH than busybox. > > The following patches address these issues. > > Live boot tested on 32 bit x86. > > The following changes since commit bb4a5c44da23a1bb363f1f081cf1644fd7975957: > > linux-yocto: remove emenlow from meta-yocto bbappend (2.6.37 version) (2011-09-15 11:27:22 +0100) > > are available in the git repository at: > git://git.pokylinux.org/poky-contrib dvhart/initrdscripts > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/initrdscripts > > Darren Hart (2): > Set an explicit path for the initrd scripts > Prevent IMAGE_FEATURES from contaminating initrd > > .../images/core-image-minimal-initramfs.bb | 3 +++ > meta/recipes-core/initrdscripts/files/init-boot.sh | 2 ++ > .../initrdscripts/files/init-install.sh | 2 ++ > meta/recipes-core/initrdscripts/files/init-live.sh | 4 +++- > 4 files changed, 10 insertions(+), 1 deletions(-) Merged to master but I had to add PR bumps for the script PATH changes. We shouldn't really be hardcoding the paths but using the expressions ${bindir} etc and making substitutions in the scripts too but we can leave that issue for another time (they already had other hardcoded issues). Cheers, Richard
On 09/16/2011 05:32 AM, Richard Purdie wrote: > On Thu, 2011-09-15 at 15:41 -0700, Darren Hart wrote: >> I ran into a bit of a nasty issue where EXTRA_IMAGE_FEATURES set in my >> local.conf was causing core-image-initramfs to pull a bunch of files into >> my initrd, including bash and a 100+MB vmlinux image. The 85M initrd caused >> some strange initial boot behavior, and bash in the initrd caused our init >> scripts to fail as bash has a different default PATH than busybox. >> >> The following patches address these issues. >> >> Live boot tested on 32 bit x86. >> >> The following changes since commit bb4a5c44da23a1bb363f1f081cf1644fd7975957: >> >> linux-yocto: remove emenlow from meta-yocto bbappend (2.6.37 version) (2011-09-15 11:27:22 +0100) >> >> are available in the git repository at: >> git://git.pokylinux.org/poky-contrib dvhart/initrdscripts >> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/initrdscripts >> >> Darren Hart (2): >> Set an explicit path for the initrd scripts >> Prevent IMAGE_FEATURES from contaminating initrd >> >> .../images/core-image-minimal-initramfs.bb | 3 +++ >> meta/recipes-core/initrdscripts/files/init-boot.sh | 2 ++ >> .../initrdscripts/files/init-install.sh | 2 ++ >> meta/recipes-core/initrdscripts/files/init-live.sh | 4 +++- >> 4 files changed, 10 insertions(+), 1 deletions(-) > > Merged to master but I had to add PR bumps for the script PATH changes. > > We shouldn't really be hardcoding the paths but using the expressions > ${bindir} etc and making substitutions in the scripts too but we can > leave that issue for another time (they already had other hardcoded > issues). ARG... Sorry about missing the PR. As for the ${bindir}, would you prefer a patch post 1.1 ? Or would you take one for 1.1 by EOD Monday?