[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH 01/12] The --initrdsize parameter to makeinitrd is unused. Kill it.



This should probably go in regardless of the whole patchset.

On 08/02/2010 04:10 PM, Chris Lumens wrote:
> ---
>  scripts/mk-images       |    9 ---------
>  scripts/mk-images.alpha |    2 --
>  scripts/mk-images.ia64  |    2 --
>  scripts/mk-images.ppc   |    2 --
>  scripts/mk-images.s390  |    1 -
>  scripts/mk-images.sparc |    2 --
>  scripts/mk-images.x86   |    1 -
>  7 files changed, 0 insertions(+), 19 deletions(-)
> 
> diff --git a/scripts/mk-images b/scripts/mk-images
> index 5fd3aa6..e41e2c0 100755
> --- a/scripts/mk-images
> +++ b/scripts/mk-images
> @@ -504,7 +504,6 @@ EOF
>  
>  makeinitrd() {
>      EXTRAINITRDPATH=""
> -    INITRDSIZE=""
>      KEEP=""
>      PADSIZE=""
>      LOADERBIN=""
> @@ -520,10 +519,6 @@ makeinitrd() {
>              KEEP=yes
>              shift
>              continue
> -        elif [ $1 = "--initrdsize" ]; then
> -            INITRDSIZE=$2
> -            shift; shift
> -            continue
>          elif [ $1 = "--loaderbin" ]; then
>              LOADERBIN=$2
>              shift; shift
> @@ -543,10 +538,6 @@ makeinitrd() {
>      if [ -z "$INITRDMODULES" ]; then
>          echo "warning: no loader modules specified!" >&2
>      fi
> -    if [ -z "$INITRDSIZE" ]; then
> -        echo "I don't know how big to make the initrd image!" >&2
> -        exit 1
> -    fi
>  
>      MBD_DIR=$TMPDIR/makebootdisk.dir.$$
>      MBD_FSIMAGE=$TMPDIR/makebootdisk.initrdimage.$$
> diff --git a/scripts/mk-images.alpha b/scripts/mk-images.alpha
> index fb2ad60..aa8d779 100644
> --- a/scripts/mk-images.alpha
> +++ b/scripts/mk-images.alpha
> @@ -94,14 +94,12 @@ EOF
>      cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/kernels/vmlinux.gz
>  
>      makeinitrd --initrdto $TOPDESTPATH/images/ramdisk.img \
> -	--initrdsize 8192 \
>  	--loaderbin loader \
>  	--modules "$NETMODULES $SCSIMODULES"
>  
>      echo "List of init modules: $INITRDMODS"
>  
>      makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \
> -	--initrdsize 8192 \
>  	--loaderbin loader \
>  	--modules "$INITRDMODS"
>  
> diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
> index b6bb68c..27d501e 100644
> --- a/scripts/mk-images.ia64
> +++ b/scripts/mk-images.ia64
> @@ -128,14 +128,12 @@ makeBootImages() {
>      makebootdisk --kernelto $TOPDESTPATH/kernels/vmlinuz  \
>  	--imagename boot.img \
>  	--initrdflags '--initrdto $TOPDESTPATH/images/ramdisk.img \
> -		     	    --initrdsize 12288 \
>  			    --loaderbin loader \
>  			    --modules "$INITRDMODS sgiioc4" '
>  
>  
>      mkdir -p $TOPDESTPATH/images/pxeboot
>      makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \
> -	--initrdsize 12288 \
>  	--loaderbin loader \
>  	--modules "$INITRDMODS sgiioc4"
>      [ $? = 0 ] || exit 1
> diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc
> index 21de9e3..ffdaf69 100644
> --- a/scripts/mk-images.ppc
> +++ b/scripts/mk-images.ppc
> @@ -25,7 +25,6 @@ makeBootImages() {
>  	mkdir -p $TOPDESTPATH/ppc/ppc64
>  	echo "Building $KERNELARCH initrd"
>  	makeinitrd --initrdto $TOPDESTPATH/ppc/ppc64/ramdisk.image.gz \
> -	    --initrdsize 8192 \
>  	    --loaderbin loader \
>  	    --modules "$INITRDMODS spufs viocd gpio_mdio"
>  
> @@ -72,7 +71,6 @@ __EOT__
>  
>          echo "Building ppc initrd"
>          makeinitrd --initrdto $TOPDESTPATH/ppc/ppc32/ramdisk.image.gz \
> -            --initrdsize 8192 \
>              --loaderbin loader \
>              --modules "$INITRDMODS"
>  
> diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
> index bd863df..47c14a3 100644
> --- a/scripts/mk-images.s390
> +++ b/scripts/mk-images.s390
> @@ -34,7 +34,6 @@ getAllS390ModuleNames() {
>  
>  makeBootImages() {
>  	makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \
> -	    --initrdsize 20000 \
>  	    --loaderbin loader \
>  	    --modules "$INITRDMODS $(getAllS390ModuleNames)"
>  	$ADDRSIZE $INITRD_ADDRESS $TOPDESTPATH/images/initrd.img $TOPDESTPATH/images/initrd.addrsize
> diff --git a/scripts/mk-images.sparc b/scripts/mk-images.sparc
> index e3d7714..1e5fe2d 100644
> --- a/scripts/mk-images.sparc
> +++ b/scripts/mk-images.sparc
> @@ -120,7 +120,6 @@ makeBootImages() {
>      export AMITFTP=0
>  
>      makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \
> -	--initrdsize 8192 \
>  	--loaderbin loader \
>  	--modules "$INITRDMODS $SPARCMODS"
>      [ $? = 0 ] || exit 1
> @@ -129,7 +128,6 @@ makeBootImages() {
>      export AMITFTP=1
>  
>      makeinitrd --initrdto $TOPDESTPATH/images/tftpinitrd.img \
> -	--initrdsize 8192 \
>  	--loaderbin loader \
>  	--modules "$TFTPINITRDMODS $SPARCMODS"
>      [ $? = 0 ] || exit 1
> diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86
> index 7ff41ad..dc13d5f 100644
> --- a/scripts/mk-images.x86
> +++ b/scripts/mk-images.x86
> @@ -86,7 +86,6 @@ makeBootImages() {
>  
>    echo "Building $initrd"
>    makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/$initrd \
> -	--initrdsize 8192 \
>  	--loaderbin loader \
>  	--modules "$INITRDMODS"
>    [ $? = 0 ] || exit 1


-- 
        Peter

THE MAGIC WORDS ARE SQUEAMISH OSSIFRAGE

01234567890123456789012345678901234567890123456789012345678901234567890123456789


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]