Use the original basename for the splash image file

This commit is contained in:
Pierre Pronchery 2015-05-29 17:01:53 +02:00
parent eb0ace1308
commit 5ad11f64b1

View File

@ -65,9 +65,10 @@ _image_image_boot()
#/boot.cfg #/boot.cfg
BOOT_SPLASH="vesa 800x600x16;boot /netbsd" BOOT_SPLASH="vesa 800x600x16;boot /netbsd"
if [ -n "$IMAGE_SPLASH" ]; then if [ -n "$IMAGE_SPLASH" ]; then
filename="${IMAGE_SPLASH##*/}"
$DEBUG $SUDO $INSTALL -m 0644 "$IMAGE_SPLASH" \ $DEBUG $SUDO $INSTALL -m 0644 "$IMAGE_SPLASH" \
"$DESTDIR/netbsd.jpeg" || return 2 "$DESTDIR/$filename" || return 2
BOOT_SPLASH="vesa 800x600x16;splash /netbsd.jpeg;boot /netbsd -z" BOOT_SPLASH="vesa 800x600x16;splash /$filename;boot /netbsd -z"
fi fi
$SUDO sh -c "cat > $DESTDIR/boot.cfg" << EOF $SUDO sh -c "cat > $DESTDIR/boot.cfg" << EOF
clear=1 clear=1
@ -216,9 +217,10 @@ _image_iso_post()
|| return 2 || return 2
BOOT_SPLASH="vesa 800x600x16;boot /netbsd.gz" BOOT_SPLASH="vesa 800x600x16;boot /netbsd.gz"
if [ -n "$IMAGE_SPLASH" ]; then if [ -n "$IMAGE_SPLASH" ]; then
filename="${IMAGE_SPLASH##*/}"
$DEBUG $SUDO $INSTALL -m 0644 "$IMAGE_SPLASH" \ $DEBUG $SUDO $INSTALL -m 0644 "$IMAGE_SPLASH" \
"$DESTDIR/netbsd.jpeg" || return 2 "$DESTDIR/$filename" || return 2
BOOT_SPLASH="vesa 800x600x16;splash /netbsd.jpeg;boot /netbsd.gz -z" BOOT_SPLASH="vesa 800x600x16;splash /$filename;boot /netbsd.gz -z"
fi fi
$SUDO sh -c "cat > $DESTDIR/boot.cfg" << EOF $SUDO sh -c "cat > $DESTDIR/boot.cfg" << EOF
clear=1 clear=1