diff options
| author | Erik Troan <ewt@redhat.com> | 2000-05-11 18:25:18 +0000 |
|---|---|---|
| committer | Erik Troan <ewt@redhat.com> | 2000-05-11 18:25:18 +0000 |
| commit | 7fe4d98169dd745d31fa9f5ef087266e783efdd2 (patch) | |
| tree | 7c37c93a58994b62de6037208a0d44a5967c63df | |
| parent | bfbf68b282ce0a3758f6c8fbc95f047399f70012 (diff) | |
| download | anaconda-7fe4d98169dd745d31fa9f5ef087266e783efdd2.tar.gz anaconda-7fe4d98169dd745d31fa9f5ef087266e783efdd2.tar.xz anaconda-7fe4d98169dd745d31fa9f5ef087266e783efdd2.zip | |
add device to cdrom url
| -rw-r--r-- | loader/loader.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/loader/loader.c b/loader/loader.c index 49020e2fc..3263cc71f 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -787,6 +787,7 @@ static char * setupCdrom(struct installMethod * method, int i; int rc; int hasCdrom = 0; + char * buf; do { for (i = 0; i < kd->numKnown; i++) { @@ -801,8 +802,11 @@ static char * setupCdrom(struct installMethod * method, if (!needRedHatCD || !access("/mnt/source/RedHat/base/stage2.img", R_OK)) { if (!mountLoopback("/mnt/source/RedHat/base/stage2.img", - "/mnt/runtime", "loop0")) - return "cdrom://mnt/source/."; + "/mnt/runtime", "loop0")) { + buf = malloc(200); + sprintf(buf, "cdrom://%s/mnt/source", kd->known[i].name); + return buf; + } } umount("/mnt/source"); } @@ -823,12 +827,9 @@ static char * setupCdrom(struct installMethod * method, } } while (1); - /* FIXME: For GUI installs to other host (with display=) - we need to set up networking. */ - if (getenv("DISPLAY")) - flags |= LOADER_FLAGS_TEXT; - - return "cdrom://mnt/source/."; + abort(); + + return NULL; } static char * mountCdromImage(struct installMethod * method, @@ -1200,7 +1201,7 @@ static char * doMountImage(char * location, /* This is a check for NFS or CD-ROM rooted installs */ if (!access("/mnt/source/RedHat/instimage/usr/bin/anaconda", X_OK)) - return "cdrom://mnt/source/."; + return "cdrom://unknown/mnt/source/."; #if defined (INCLUDE_LOCAL) || defined (__sparc__) || defined (__alpha__) # if defined (__sparc__) || defined (__alpha__) |