First, change --initrdto to --dest. That seems more clear to me. Second,
have makeinitrd operate on $IMGPATH instead of $MBD_DIR. That no longer
exists.
---
scripts/mk-images | 24 ++++++++++++------------
scripts/mk-images.alpha | 2 +-
scripts/mk-images.ia64 | 4 ++--
scripts/mk-images.ppc | 4 ++--
scripts/mk-images.s390 | 2 +-
scripts/mk-images.sparc | 4 ++--
scripts/mk-images.x86 | 2 +-
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/scripts/mk-images b/scripts/mk-images
index 7092b30..778af31 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -415,13 +415,13 @@ instbin() {
}
makeinitrd() {
- EXTRAINITRDPATH=""
- KEEP=""
- PADSIZE=""
INITRDMODULES=""
+ KEEP=""
+ OUTFILE=""
+
while [ x$(echo $1 | cut -c1-2) = x"--" ]; do
- if [ $1 = "--initrdto" ]; then
- EXTRAINITRDPATH=$2
+ if [ $1 = "--dest" ]; then
+ OUTFILE=$2
shift; shift
continue
elif [ $1 = "--keep" ]; then
@@ -436,31 +436,31 @@ makeinitrd() {
echo "Unknown option passed to makeinitrd"
exit 1
done
+
if [ -z "$INITRDMODULES" ]; then
echo "warning: no loader modules specified!" >&2
fi
- MBD_DIR=$TMPDIR/makebootdisk.dir.$$
MBD_FSIMAGE=$TMPDIR/makebootdisk.initrdimage.$$
MBD_BOOTTREE=$TMPDIR/makebootdisk.tree.$$
if [ -n "$INITRDMODULES" ]; then
MODSET=`expandModuleSet "$INITRDMODULES"`
- makemoduletree $MBD_DIR "$MODSET"
+ makemoduletree $IMGPATH "$MODSET"
fi
- makeproductfile $MBD_DIR
+ makeproductfile $IMGPATH
rm -f $MBD_FSIMAGE
- (cd $MBD_DIR; find . |cpio --quiet -c -o) |gzip -9 > $MBD_FSIMAGE
+ (cd $IMGPATH; find . |cpio --quiet -c -o) |gzip -9 > $MBD_FSIMAGE
size=$(du $MBD_FSIMAGE | awk '{ print $1 }')
echo "Wrote $MBD_FSIMAGE (${size}k compressed)"
- if [ -n "$EXTRAINITRDPATH" ]; then
- mkdir -p `dirname $EXTRAINITRDPATH`
- cp -a $MBD_FSIMAGE $EXTRAINITRDPATH
+ if [ -n "$OUTFILE" ]; then
+ mkdir -p `dirname $OUTFILE`
+ cp -a $MBD_FSIMAGE $OUTFILE
fi
if [ -z "$KEEP" ]; then
diff --git a/scripts/mk-images.alpha b/scripts/mk-images.alpha
index 1a79058..c35bbeb 100644
--- a/scripts/mk-images.alpha
+++ b/scripts/mk-images.alpha
@@ -98,7 +98,7 @@ EOF
echo "List of init modules: $INITRDMODS"
- makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \
+ makeinitrd --dest $TOPDESTPATH/images/initrd.img \
--modules "$INITRDMODS"
# makebootdisk --bootdisksize 4096 --kernelto $TOPDESTPATH/kernels/vmlinux.gz \
diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
index 46587e6..b24a216 100644
--- a/scripts/mk-images.ia64
+++ b/scripts/mk-images.ia64
@@ -127,12 +127,12 @@ makeBootImages() {
echo "making boot.img for EFI bootloader"
makebootdisk --kernelto $TOPDESTPATH/kernels/vmlinuz \
--imagename boot.img \
- --initrdflags '--initrdto $TOPDESTPATH/images/ramdisk.img \
+ --initrdflags '--dest $TOPDESTPATH/images/ramdisk.img \
--modules "$INITRDMODS sgiioc4" '
mkdir -p $TOPDESTPATH/images/pxeboot
- makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \
+ makeinitrd --dest $TOPDESTPATH/images/pxeboot/initrd.img \
--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 81838b3..a2820c4 100644
--- a/scripts/mk-images.ppc
+++ b/scripts/mk-images.ppc
@@ -24,7 +24,7 @@ makeBootImages() {
if [ "$KERNELARCH" = "ppc64" ]; then
mkdir -p $TOPDESTPATH/ppc/ppc64
echo "Building $KERNELARCH initrd"
- makeinitrd --initrdto $TOPDESTPATH/ppc/ppc64/ramdisk.image.gz \
+ makeinitrd --dest $TOPDESTPATH/ppc/ppc64/ramdisk.image.gz \
--modules "$INITRDMODS spufs viocd gpio_mdio"
cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/ppc64/vmlinuz
@@ -69,7 +69,7 @@ __EOT__
mkdir -p $TOPDESTPATH/ppc/mac
echo "Building ppc initrd"
- makeinitrd --initrdto $TOPDESTPATH/ppc/ppc32/ramdisk.image.gz \
+ makeinitrd --dest $TOPDESTPATH/ppc/ppc32/ramdisk.image.gz \
--modules "$INITRDMODS"
cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/ppc32/vmlinuz
diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
index cb6c53c..50cd717 100644
--- a/scripts/mk-images.s390
+++ b/scripts/mk-images.s390
@@ -33,7 +33,7 @@ getAllS390ModuleNames() {
}
makeBootImages() {
- makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \
+ makeinitrd --dest $TOPDESTPATH/images/initrd.img \
--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 7faf9e4..8047aba 100644
--- a/scripts/mk-images.sparc
+++ b/scripts/mk-images.sparc
@@ -119,14 +119,14 @@ makeBootImages() {
export AMITFTP=0
- makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \
+ makeinitrd --dest $TOPDESTPATH/images/initrd.img \
--modules "$INITRDMODS $SPARCMODS"
[ $? = 0 ] || exit 1
echo "Building special tftpinitrd.img"
export AMITFTP=1
- makeinitrd --initrdto $TOPDESTPATH/images/tftpinitrd.img \
+ makeinitrd --dest $TOPDESTPATH/images/tftpinitrd.img \
--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 8bc8d3f..d18bf52 100644
--- a/scripts/mk-images.x86
+++ b/scripts/mk-images.x86
@@ -85,7 +85,7 @@ makeBootImages() {
fi
echo "Building $initrd"
- makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/$initrd \
+ makeinitrd --dest $TOPDESTPATH/images/pxeboot/$initrd \
--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
