From b6522506b7b7fcd92340f66efa8d91285f5aec47 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 23 Mar 2010 12:18:40 -0400 Subject: [PATCH] Don't use a hardcoded version in recreate-iso.sh --- buildscripts/recreate-iso.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/buildscripts/recreate-iso.sh b/buildscripts/recreate-iso.sh index 063e18d..1f297b2 100755 --- a/buildscripts/recreate-iso.sh +++ b/buildscripts/recreate-iso.sh @@ -4,9 +4,7 @@ ##################################### PROG="${0}" -VERSION="1.5.0" EXTRAVER="" -VOLNAME="sysrcd-1.5.0" ISODIR=/worksrc/isofiles MOUNTDIR=/mnt/cdrom WORKDIR=/worksrc/catalyst/isotemp @@ -14,6 +12,8 @@ DESTDIR=/home/sysresccdiso REPOSRC=/worksrc/sysresccd-src REPOBIN=/worksrc/sysresccd-bin MYDATE=$(date +%Y%m%d-%Hh%M) +VERSION=$(cat ${REPOSRC}/overlay-squashfs-${ARCH}/root/version) +VOLNAME="sysrcd-${VERSION}" usage() { @@ -101,8 +101,7 @@ rsync -ax ${REPOBIN}/kernels-${ARCH}/ ${WORKDIR}/isolinux/ --exclude='*.igz' cp ${REPOSRC}/overlay-squashfs-${ARCH}/root/version ${WORKDIR} # ========= integrate the version number in f1boot.msg ========================= -TXTVERSION=$(cat ${REPOSRC}/overlay-squashfs-${ARCH}/root/version) -sed -i -e "s/VERSION/${TXTVERSION}${EXTRAVER}/" ${WORKDIR}/isolinux/f1boot.msg +sed -i -e "s/VERSION/${VERSION}${EXTRAVER}/" ${WORKDIR}/isolinux/f1boot.msg # ========= merge (rescuecd.igz+rescue64.igz+altker32.igz) --> rescuecd.igz ==== curdir="${WORKDIR}/isolinux" -- 2.26.2