summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2007-09-17 15:42:38 +0000
committerJeremy Katz <katzj@redhat.com>2007-09-17 15:42:38 +0000
commit9ce13e063d437b8c0d3dda90fbfcd55990ee7329 (patch)
tree11dcb265f62e587518fa00ce8707bb44efc94170
parentaab7cc01b606cce620b5cdc087e6dd8a05a634c9 (diff)
downloadanaconda-9ce13e063d437b8c0d3dda90fbfcd55990ee7329.tar.gz
anaconda-9ce13e063d437b8c0d3dda90fbfcd55990ee7329.tar.xz
anaconda-9ce13e063d437b8c0d3dda90fbfcd55990ee7329.zip
2007-09-17 Jeremy Katz <katzj@redhat.com>
* scripts/mk-images: Fix treeinfo path to stage2 (Will Woods)
-rw-r--r--ChangeLog4
-rwxr-xr-xscripts/mk-images6
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 386c3a12a..a28599535 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-17 Jeremy Katz <katzj@redhat.com>
+
+ * scripts/mk-images: Fix treeinfo path to stage2 (Will Woods)
+
2007-09-14 Bill Nottingham <notting@redhat.com>
* pixmaps/border_bottom_left.png: Remove unused graphic.
diff --git a/scripts/mk-images b/scripts/mk-images
index e1276b23a..3ffbd6e5a 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -721,7 +721,8 @@ makeinstimage () {
size=$(ls -l $INSTIMGPATH/${imagename}2.img | awk '{print $5}')
size=$(expr $size / 1024)
echo "Wrote $INSTIMGPATH/${imagename}2.img (${size}k)..."
- echo "instimage = $INSTIMGPATH/${imagename}2.img" >> $TOPDESTPATH/.treeinfo
+ relpath=${INSTIMGPATH#$TOPDESTPATH/}
+ echo "instimage = ${relpath}/${imagename}2.img" >> $TOPDESTPATH/.treeinfo
rm -rf $tmp
}
@@ -767,7 +768,8 @@ makemainimage () {
chmod 644 $INSTIMGPATH/${imagename}.img
echo "Wrote $INSTIMGPATH/${imagename}.img (${SIZE}k)"
- echo "mainimage = $INSTIMGPATH/${imagename}.img" >> $TOPDESTPATH/.treeinfo
+ relpath=${INSTIMGPATH#$TOPDESTPATH/}
+ echo "mainimage = ${relpath}/${imagename}.img" >> $TOPDESTPATH/.treeinfo
rm $mmi_tmpimage
}