diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-08-20 23:54:51 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-08-20 23:54:51 +0000 |
| commit | dd8951f2026a93111f29b1d6d670e622db1951e3 (patch) | |
| tree | 795f40e92150953edb8b5db5a1dab0436f875bd7 /scripts | |
| parent | 3960c2c5b13e4e11d54a6d85c33e5675a284a794 (diff) | |
| download | anaconda-dd8951f2026a93111f29b1d6d670e622db1951e3.tar.gz anaconda-dd8951f2026a93111f29b1d6d670e622db1951e3.tar.xz anaconda-dd8951f2026a93111f29b1d6d670e622db1951e3.zip | |
merge changes from taroon branch
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mk-images.i386 | 1 | ||||
| -rw-r--r-- | scripts/mk-images.ppc | 6 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386 index 63da61ddd..4a1a08ec2 100644 --- a/scripts/mk-images.i386 +++ b/scripts/mk-images.i386 @@ -21,6 +21,7 @@ prepareBootTree() { cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz + pngtopnm $BOOTDISKDIR/syslinux-splash.png | ppmtolss16 \#000000=0 \#cdcfd5=7 \#c90000=2 \#ffffff=15 \#5b6c93=9 > $BOOTDISKDIR/splash.lss cp $BOOTDISKDIR/splash.lss $MBD_BOOTTREE/splash.lss rm -f $MBD_BOOTTREE/syslinux-splash.png diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc index 2df106ffe..adc5d3a14 100644 --- a/scripts/mk-images.ppc +++ b/scripts/mk-images.ppc @@ -35,7 +35,11 @@ makeBootImages() { cp $IMGPATH/usr/lib/yaboot/yaboot $TOPDESTPATH/ppc/chrp $IMGPATH/usr/lib/yaboot/addnote $TOPDESTPATH/ppc/chrp/yaboot - $IMGPATH/usr/bin/mkzimage $KERNELROOT/boot/vmlinuz-partial* $TOPDESTPATH/ppc/chrp/ramdisk.image.gz $TOPDESTPATH/images/boot.img + pushd $TOPDESTPATH/ppc/chrp + cp $IMGPATH/usr/share/ppc64-utils/zImage.lds $TOPDESTPATH/ppc/chrp/zImage.lds + $IMGPATH/usr/bin/mkzimage $KERNELROOT/boot/vmlinuz-partial* $TOPDESTPATH/images/boot.img $TOPDESTPATH/ppc/chrp/ramdisk.image.gz + rm -f $TOPDESTPATH/ppc/chrp/zImage.lds + popd # we also want to make a boot.iso here mkdir -p $TOPDESTPATH/isopath/ppc/chrp $TOPDESTPATH/isopath/etc diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 5b50a388f..96d78d053 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -633,6 +633,7 @@ usr/share/pixmaps/gnome-question.png usr/share/pixmaps/gnome-warning.png usr/share/pixmaps/no.xpm usr/share/pixmaps/yes.xpm +usr/share/ppc64-utils/zImage.lds usr/share/redhat-config-keyboard/* usr/share/terminfo/l/linux usr/share/terminfo/x/xterm |