From 67be21fe01437e9ce2fa3d31facfd316c5dc05dc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 30 Dec 2003 20:56:29 +0000 Subject: [PATCH] Substitute into yaboot.msg the same as is done for isolinux.txt. (and also sync yaboot.msg with d-i again) --- data/sarge/yaboot/boot.msg | 3 +++ debian/changelog | 1 + tools/boot/sarge/boot-powerpc | 6 +++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/data/sarge/yaboot/boot.msg b/data/sarge/yaboot/boot.msg index 0f67dd04..63ac1113 100644 --- a/data/sarge/yaboot/boot.msg +++ b/data/sarge/yaboot/boot.msg @@ -1,5 +1,8 @@ Welcome to Debian GNU/Linux ${DEBIAN_VERSION}! +This is a Debian installation ${MEDIA_TYPE}, +built on ${BUILD_DATE}. + In addition to the default 'install' option, there is 'install-safe' which you should try if the system fails to boot at all (the typical diff --git a/debian/changelog b/debian/changelog index 27e52488..f6bc607b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ debian-cd (2.2.17) UNRELEASED; urgency=low - Switch from netcfg-static/dhcp to just netcfg. - Split udeb_includes for businesscard and netinst; netinst does not need choose-mirror, while businesscard does. + - Substitute into yaboot.msg the same as is done for isolinux.txt. -- Raphael Hertzog Wed, 20 Aug 2003 20:17:06 +0200 diff --git a/tools/boot/sarge/boot-powerpc b/tools/boot/sarge/boot-powerpc index 07d1fa29..cdf07e9d 100755 --- a/tools/boot/sarge/boot-powerpc +++ b/tools/boot/sarge/boot-powerpc @@ -56,8 +56,12 @@ fi # generate/download images for "powermac" # (missing: bootvars1.3b.sit.hqx, BootX_1.2.2.sit, boot-floppy-hfs.img) cd $INSTALLDIR/powermac +BUILD_DATE=$(date +%Y%m%d) cat $BASEDIR/data/sarge/yaboot/boot.msg \ - | sed "s/CODENAME/${CODENAME}/g" > boot.msg + | sed "s/\${MEDIA_TYPE}/CDROM/" \ + | sed "s/\$(DEBIAN_VERSION)/${CODENAME}/g" \ + | sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \ + > boot.msg cat $BASEDIR/data/sarge/yaboot/yaboot.conf \ | sed "s/CODENAME/${CODENAME}/g" > yaboot.conf cp $BASEDIR/data/yaboot/ofboot.b ofboot.b