lkml.org 
[lkml]   [2011]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [Patch] make installkernel configurable from command line (was Re: how to avoid that install.sh goes mad, if I am not root?)
    =?utf-8?Q?Am=C3=A9rico?= Wang writes:
    > On Fri, Jan 21, 2011 at 11:08:10PM +0100, Harald Dunkel wrote:
    > >-----BEGIN PGP SIGNED MESSAGE-----
    > >Hash: SHA1
    > >
    > >On 01/21/11 13:49, WANG Cong wrote:
    > >> On Thu, 20 Jan 2011 22:47:56 +0100, Mikael Pettersson wrote:
    > >>>
    > >>> First, at least on x86, the kernel will look for the 'installkernel'
    > >>> executable first in your own ~/bin/, so if you have that then it will
    > >>> override /sbin/installkernel.
    > >>>
    > >>
    > >> That still doesn't look like a good solution.
    > >>
    > >
    > >Same for me.
    > >
    > >Obviously running /sbin/installkernel is not reasonable for
    > >UID != 0 (or if $FAKEROOTKEY is set), so I would suggest to
    > >skip /sbin/installkernel and the default Lilo setup in
    > >install.sh for this case.
    > >
    >
    > Will the patch below work for you?
    >
    > With this patch, you should be able to specify your own installkernel
    > by "make INSTALLKERNEL=/your/installkernel install".
    >
    > Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
    >
    > ---
    > diff --git a/Makefile b/Makefile
    > index 1f47495..44abded 100644
    > --- a/Makefile
    > +++ b/Makefile
    > @@ -327,7 +327,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
    > OBJDUMP = $(CROSS_COMPILE)objdump
    > AWK = awk
    > GENKSYMS = scripts/genksyms/genksyms
    > -INSTALLKERNEL := installkernel
    > +INSTALLKERNEL ?= /sbin/installkernel
    > DEPMOD = /sbin/depmod
    > KALLSYMS = scripts/kallsyms
    > PERL = perl
    > diff --git a/arch/x86/boot/install.sh b/arch/x86/boot/install.sh
    > index d13ec1c..c41f2b8 100644
    > --- a/arch/x86/boot/install.sh
    > +++ b/arch/x86/boot/install.sh
    > @@ -33,8 +33,7 @@ verify "$3"
    >
    > # User may have a custom install script
    >
    > -if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
    > -if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
    > +if [ -x "${INSTALLKERNEL}" ]; then exec "${INSTALLKERNEL}" "$@"; fi

    NAK -- this breaks existing setups which rely on /root/bin/installkernel
    being picked up automatically.

    Can you handle 'make INSTALLKERNEL=...' without breaking that please?


    \
     
     \ /
      Last update: 2011-01-24 12:45    [W:0.048 / U:152.888 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site