diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-02 13:46:51 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-02 13:46:51 +0000 |
| commit | 888ce1469c4414cb743e22123776b3796a03cd88 (patch) | |
| tree | e85b36377db995ea3d52d8dd34c8e16bb99e36d4 | |
| parent | a77fe688cd9c8c4efb8b9c363a7078e7a563f0bb (diff) | |
| download | drakx-888ce1469c4414cb743e22123776b3796a03cd88.tar drakx-888ce1469c4414cb743e22123776b3796a03cd88.tar.gz drakx-888ce1469c4414cb743e22123776b3796a03cd88.tar.bz2 drakx-888ce1469c4414cb743e22123776b3796a03cd88.tar.xz drakx-888ce1469c4414cb743e22123776b3796a03cd88.zip | |
use IMAGE_LOCATION_DIR where it should be
| -rw-r--r-- | mdk-stage1/disk.c | 4 | ||||
| -rw-r--r-- | mdk-stage1/network.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c index b99fd2849..c45d38412 100644 --- a/mdk-stage1/disk.c +++ b/mdk-stage1/disk.c @@ -193,7 +193,7 @@ static enum return_type try_with_device(char *dev_name) static char ** answers_location = NULL; char location_full[500]; - char * disk_own_mount = SLASH_LOCATION "/tmp/hdimage"; + char * disk_own_mount = IMAGE_LOCATION_DIR "hdimage"; char * parts[50]; char * parts_comments[50]; @@ -219,7 +219,7 @@ static enum return_type try_with_device(char *dev_name) return results; } - /* in testing mode, assume the partition is already mounted on SLASH_LOCATION "/tmp/hdimage" */ + /* in testing mode, assume the partition is already mounted on IMAGE_LOCATION_DIR "hdimage" */ if (!IS_TESTING && try_mount(choice, disk_own_mount)) { stg1_error_message("I can't find a valid filesystem (tried: ext2, vfat, ntfs, reiserfs)."); return try_with_device(dev_name); diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c index f17b7c438..5ce055c8a 100644 --- a/mdk-stage1/network.c +++ b/mdk-stage1/network.c @@ -850,7 +850,7 @@ enum return_type nfs_prepare(void) char * questions[] = { "NFS server name", DISTRIB_NAME " directory", NULL }; char * questions_auto[] = { "server", "directory", NULL }; static char ** answers = NULL; - char * nfs_own_mount = SLASH_LOCATION "/tmp/nfsimage"; + char * nfs_own_mount = IMAGE_LOCATION_DIR "nfsimage"; char * nfsmount_location; enum return_type results = intf_select_and_up(NULL, NULL); |