diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | anaconda.spec | 6 | ||||
| -rw-r--r-- | loader2/hdinstall.c | 4 | ||||
| -rw-r--r-- | loader2/method.c | 2 | ||||
| -rw-r--r-- | loader2/urlinstall.c | 2 | ||||
| -rwxr-xr-x | scripts/mk-images | 4 |
6 files changed, 24 insertions, 7 deletions
@@ -2,6 +2,19 @@ * anaconda.spec: Bump version. + * loader2/urlinstall.c (loadUrlImages): minstg2.img instead of + netstg2.img + * loader2/hdinstall.c (mountHDImages): minstg2.img instead of + hdstg2.img + * loader2/method.c (validIsoImages): Look for stage2.img instead + of hdstg2.img + + * scripts/mk-images: mkcramfs is now mkfs.cramfs + +2005-10-20 Jeremy Katz <katzj@redhat.com> + + * anaconda.spec: Bump version. + * scripts/mk-images (padfile): Remove dead function. (makemainmodules): Likewise. (makebootdisk): Likewise. diff --git a/anaconda.spec b/anaconda.spec index c136fcbd5..7a8741cf6 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.89.0 +Version: 10.89.1 Release: 1 License: GPL Summary: Graphical system installer @@ -72,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Thu Oct 20 2005 Jeremy Katz <katzj@redhat.com> - 10.89.1-1 +- fix for mkcramfs -> mkfs.cramfs +- Use minstg2.img instead of netstg2.img/hdstg2.img in the loader + * Thu Oct 20 2005 Jeremy Katz <katzj@redhat.com> - 10.89.0-1 - Fix SELinux policy loading (clumens) - Fix translation import for kickstart (laroche) diff --git a/loader2/hdinstall.c b/loader2/hdinstall.c index e887b8efb..3777add4f 100644 --- a/loader2/hdinstall.c +++ b/loader2/hdinstall.c @@ -48,7 +48,7 @@ static int loadHDImages(char * prefix, char * dir, int flags, char * device, char * mntpoint) { int fd, rc, idx; char *path, *target, *dest; - char *stg2list[] = {"stage2.img", "hdstg2.img", NULL}; + char *stg2list[] = {"stage2.img", "minstg2.img", NULL}; path = alloca(50 + strlen(prefix) + (dir ? strlen(dir) : 2)); @@ -118,7 +118,7 @@ static int mountHDImages(char * prefix, char * dir, int flags, int checkstamp) { int idx, rc; char * path, *target; - char *stg2list[] = {"stage2.img", "hdstg2.img", NULL}; + char *stg2list[] = {"stage2.img", "minstg2.img", NULL}; path = alloca(50 + strlen(prefix) + (dir ? strlen(dir) : 2)); diff --git a/loader2/method.c b/loader2/method.c index b5154b737..4d3e06cb3 100644 --- a/loader2/method.c +++ b/loader2/method.c @@ -170,7 +170,7 @@ char * validIsoImages(char * dirName, int *foundinvalid) { continue; } - snprintf(path, sizeof(path), "/tmp/loopimage/%s/base/hdstg2.img", getProductPath()); + snprintf(path, sizeof(path), "/tmp/loopimage/%s/base/stage2.img", getProductPath()); if (mountLoopback(path, "/mnt/runtime", "loop0")) { umountLoopback("/mnt/runtime", "loop0"); } else { diff --git a/loader2/urlinstall.c b/loader2/urlinstall.c index 91cfa809a..35b993d98 100644 --- a/loader2/urlinstall.c +++ b/loader2/urlinstall.c @@ -121,7 +121,7 @@ static int loadUrlImages(struct iurlinfo * ui, int flags) { /* require 128MB for use of graphical stage 2 due to size of image */ if (FL_TEXT(flags) || totalMemory() < GUI_STAGE2_RAM) { - stage2img = "netstg2.img"; + stage2img = "minstg2.img"; if (totalMemory() < GUI_STAGE2_RAM) logMessage(WARNING, "URLINSTALL falling back to non-GUI stage2 " "due to insufficient RAM"); diff --git a/scripts/mk-images b/scripts/mk-images index 6fd85c0ac..abe812a8e 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -684,7 +684,7 @@ makeinstimage () { makeproductfile $tmpdir echo "Running mkcramfs $CRAMBS $tmpdir $INSTIMGPATH/${imagename}2.img" - mkcramfs $CRAMBS $tmpdir /tmp/${imagename}2.img.$$ + mkfs.cramfs $CRAMBS $tmpdir /tmp/${imagename}2.img.$$ cp /tmp/${imagename}2.img.$$ $INSTIMGPATH/${imagename}2.img size=$(ls -l $INSTIMGPATH/${imagename}2.img | awk '{print $5}') size=$(expr $size / 1024) @@ -720,7 +720,7 @@ makemainimage () { elif [ $type = "cramfs" ]; then makeproductfile $IMGPATH echo "Running mkcramfs $CRAMBS $IMGPATH $mmi_tmpimage" - mkcramfs $CRAMBS $IMGPATH $mmi_tmpimage + mkfs.cramfs $CRAMBS $IMGPATH $mmi_tmpimage SIZE=$(expr `cat $mmi_tmpimage | wc -c` / 1024) fi |