summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2005-07-01 19:37:49 +0000
committerJeremy Katz <katzj@redhat.com>2005-07-01 19:37:49 +0000
commit8061d0b286b1fd2a7db506ac50657b33cb2f9407 (patch)
tree18bafb17728e54403f137902a4193f750233a394 /scripts
parent0dc57ac6ecd1034ac30049e49e971a5a9cde7aba (diff)
downloadanaconda-8061d0b286b1fd2a7db506ac50657b33cb2f9407.tar.gz
anaconda-8061d0b286b1fd2a7db506ac50657b33cb2f9407.tar.xz
anaconda-8061d0b286b1fd2a7db506ac50657b33cb2f9407.zip
2005-07-01 Jeremy Katz <katzj@redhat.com>
* scripts/mk-images: Fixups for ia64 images from prarit (#162072) * scripts/mk-images.ia64: Likewise.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/mk-images6
-rw-r--r--scripts/mk-images.ia646
2 files changed, 5 insertions, 7 deletions
diff --git a/scripts/mk-images b/scripts/mk-images
index 06c9a5bf3..476a64ed7 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -762,6 +762,7 @@ makebootdisk() {
mkdir -p $MBD_BOOTTREE
# provided by the mk-image.$ARCH file
+ mkdir -p `dirname $MBD_FILENAME`
prepareBootImage
left=$(df $MBD_BOOTTREE | tail +2)
@@ -774,10 +775,7 @@ makebootdisk() {
cp -f $KERNELROOT/$KERNELDIR/${KERNELNAME}-* $EXTRAKERNELPATH
fi
- mkdir -p `dirname $MBD_FILENAME`
- rm -f $MBD_FILENAME
- mv -f $MBD_TMPIMAGE $MBD_FILENAME
- rm -rf $MBD_TMPIMAGE $MBD_MNTPOINT $MBD_BOOTTREE
+ rm -rf $MBD_MNTPOINT $MBD_BOOTTREE
if [ -z "$INITRDFILE" ]; then
rm -f $MBD_FSIMAGE
fi
diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
index f962ec889..7cafa2d73 100644
--- a/scripts/mk-images.ia64
+++ b/scripts/mk-images.ia64
@@ -14,9 +14,9 @@ SCSIMODULES="sd_mod sg sr_mod st scsi_mod DAC960 cciss cpqarray aic7xxx aic7xxx_
IDEMODULES="ide-mod ide-probe-mod ide-disk ide-cd sgiioc4"
prepareBootImage() {
- dd if=/dev/zero bs=1k count=$BOOTDISKSIZE of=$MBD_TMPIMAGE 2>/dev/null
- mkdosfs -C $MBD_TMPIMAGE $BOOTDISKSIZE >/dev/null
- mount -o loop -t vfat $MBD_TMPIMAGE $MBD_BOOTTREE
+ dd if=/dev/zero bs=1k count=$BOOTDISKSIZE of=$MBD_FILENAME 2>/dev/null
+ mkdosfs -C $MBD_FILENAME $BOOTDISKSIZE >/dev/null
+ mount -o loop -t vfat $MBD_FILENAME $MBD_BOOTTREE
mkdir -p $MBD_BOOTTREE/EFI/boot
cp $MBD_FSIMAGE $MBD_BOOTTREE/EFI/boot/initrd.img