diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-12-01 18:58:40 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-12-01 18:58:40 +0000 |
| commit | af3400bda0f54ad7baab6312c986b33945719547 (patch) | |
| tree | 137166c5605d3ae01430b53e3071461efa65488a | |
| parent | 13ed95eef4935b1e7020e1ddc3254b8afa0e1811 (diff) | |
| download | anaconda-af3400bda0f54ad7baab6312c986b33945719547.tar.gz anaconda-af3400bda0f54ad7baab6312c986b33945719547.tar.xz anaconda-af3400bda0f54ad7baab6312c986b33945719547.zip | |
2005-12-01 Jeremy Katz <katzj@redhat.com>
* loader2/loader.c (main): Load squashfs.
* loader2/method.c (mountLoopback): Try to mount squashfs too.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | loader2/loader.c | 4 | ||||
| -rw-r--r-- | loader2/method.c | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2005-12-01 Jeremy Katz <katzj@redhat.com> + + * loader2/loader.c (main): Load squashfs. + + * loader2/method.c (mountLoopback): Try to mount squashfs too. + 2005-12-01 David Cantrell <dcantrell@redhat.com> * loader2/cdinstall.c: Reworded the media check prompt dialog as diff --git a/loader2/loader.c b/loader2/loader.c index 0fc407387..b8dae9adc 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -1268,10 +1268,10 @@ int main(int argc, char ** argv) { setenv("TERM", "vt100", 1); #if defined(__powerpc__) /* hack for pcspkr breaking ppc right now */ - mlLoadModuleSet("cramfs:vfat:nfs:loop:isofs:floppy:edd", + mlLoadModuleSet("cramfs:vfat:nfs:loop:isofs:floppy:edd:squashfs", modLoaded, modDeps, modInfo, flags); #else - mlLoadModuleSet("cramfs:vfat:nfs:loop:isofs:floppy:edd:pcspkr", + mlLoadModuleSet("cramfs:vfat:nfs:loop:isofs:floppy:edd:pcspkr:squashfs", modLoaded, modDeps, modInfo, flags); #endif diff --git a/loader2/method.c b/loader2/method.c index 879f98dab..09645eb12 100644 --- a/loader2/method.c +++ b/loader2/method.c @@ -125,6 +125,7 @@ int mountLoopback(char * fsystem, char * mntpoint, char * device) { * filesystems for the specific type of image being mounted */ if (doPwMount(filename, mntpoint, "iso9660", IMOUNT_RDONLY, NULL)) { if (doPwMount(filename, mntpoint, "ext2", IMOUNT_RDONLY, NULL)) { + if (doPwMount(filename, mntpoint, "squashfs", IMOUNT_RDONLY, NULL)) { if (doPwMount(filename, mntpoint, "cramfs", IMOUNT_RDONLY, NULL)) { if (doPwMount(filename, mntpoint, "vfat", IMOUNT_RDONLY, NULL)) { logMessage(ERROR, "failed to mount loop: %s", strerror(errno)); @@ -134,6 +135,7 @@ int mountLoopback(char * fsystem, char * mntpoint, char * device) { return LOADER_ERROR; } } + } } } |