[PATCH 05/12] The --loaderbin parameter to makeinitrd is unused. Kill it.

[Chris Lumens <clumens@xxxxxxxxxx>]

---
 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 92d8d04..7092b30 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -418,7 +418,6 @@ makeinitrd() {
     EXTRAINITRDPATH=""
     KEEP=""
     PADSIZE=""
-    LOADERBIN=""
     INITRDMODULES=""
     while [ x$(echo $1 | cut -c1-2) = x"--" ]; do
         if [ $1 = "--initrdto" ]; then
@@ -429,10 +428,6 @@ makeinitrd() {
             KEEP=yes
             shift
             continue
-        elif [ $1 = "--loaderbin" ]; then
-            LOADERBIN=$2
-            shift; shift
-            continue
         elif [ $1 = "--modules" ]; then
             INITRDMODULES=$2
             shift; shift
@@ -441,10 +436,6 @@ makeinitrd() {
         echo "Unknown option passed to makeinitrd"
         exit 1
     done
-    if [ -z "$LOADERBIN" ]; then
-        echo "no loader binary specified!" >&2
-        exit 1
-    fi
     if [ -z "$INITRDMODULES" ]; then
         echo "warning: no loader modules specified!" >&2
     fi
diff --git a/scripts/mk-images.alpha b/scripts/mk-images.alpha
index aa8d779..1a79058 100644
--- a/scripts/mk-images.alpha
+++ b/scripts/mk-images.alpha
@@ -94,13 +94,11 @@ EOF
     cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/kernels/vmlinux.gz
 
     makeinitrd --initrdto $TOPDESTPATH/images/ramdisk.img \
-	--loaderbin loader \
 	--modules "$NETMODULES $SCSIMODULES"
 
     echo "List of init modules: $INITRDMODS"
 
     makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \
-	--loaderbin loader \
 	--modules "$INITRDMODS"
 
 #    makebootdisk --bootdisksize 4096 --kernelto $TOPDESTPATH/kernels/vmlinux.gz \
diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
index 27d501e..46587e6 100644
--- a/scripts/mk-images.ia64
+++ b/scripts/mk-images.ia64
@@ -128,13 +128,11 @@ makeBootImages() {
     makebootdisk --kernelto $TOPDESTPATH/kernels/vmlinuz  \
 	--imagename boot.img \
 	--initrdflags '--initrdto $TOPDESTPATH/images/ramdisk.img \
-			    --loaderbin loader \
 			    --modules "$INITRDMODS sgiioc4" '
 
 
     mkdir -p $TOPDESTPATH/images/pxeboot
     makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \
-	--loaderbin loader \
 	--modules "$INITRDMODS sgiioc4"
     [ $? = 0 ] || exit 1
     mv $TOPDESTPATH/kernels/vmlinuz $TOPDESTPATH/images/pxeboot/vmlinuz
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc
index ffdaf69..81838b3 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 \
-	    --loaderbin loader \
 	    --modules "$INITRDMODS spufs viocd gpio_mdio"
 
 	cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/ppc64/vmlinuz
@@ -71,7 +70,6 @@ __EOT__
 
         echo "Building ppc initrd"
         makeinitrd --initrdto $TOPDESTPATH/ppc/ppc32/ramdisk.image.gz \
-            --loaderbin loader \
             --modules "$INITRDMODS"
 
         cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/ppc32/vmlinuz
diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
index 47c14a3..cb6c53c 100644
--- a/scripts/mk-images.s390
+++ b/scripts/mk-images.s390
@@ -34,7 +34,6 @@ getAllS390ModuleNames() {
 
 makeBootImages() {
 	makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \
-	    --loaderbin loader \
 	    --modules "$INITRDMODS $(getAllS390ModuleNames)"
 	$ADDRSIZE $INITRD_ADDRESS $TOPDESTPATH/images/initrd.img $TOPDESTPATH/images/initrd.addrsize
 	cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/kernel.img
diff --git a/scripts/mk-images.sparc b/scripts/mk-images.sparc
index 1e5fe2d..7faf9e4 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 \
-	--loaderbin loader \
 	--modules "$INITRDMODS $SPARCMODS"
     [ $? = 0 ] || exit 1
     echo "Building special tftpinitrd.img"
@@ -128,7 +127,6 @@ makeBootImages() {
     export AMITFTP=1
 
     makeinitrd --initrdto $TOPDESTPATH/images/tftpinitrd.img \
-	--loaderbin loader \
 	--modules "$TFTPINITRDMODS $SPARCMODS"
     [ $? = 0 ] || exit 1
     if [ -f $IMGPATH/usr/share/anaconda/boot/second.b ]; then
diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86
index dc13d5f..8bc8d3f 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 \
-	--loaderbin loader \
 	--modules "$INITRDMODS"
   [ $? = 0 ] || exit 1
 
-- 
1.7.1.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list