the diffs so far:
Index: choose_medium.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/choose_medium.c,v
retrieving revision 1.123
diff -u -r1.123 choose_medium.c
--- choose_medium.c 2001/12/27 15:25:52 1.123
+++ choose_medium.c 2001/12/28 01:10:25
@@ -11,7 +11,7 @@
#include "../libfdisk/fdisk.h" /* for fdisk_partitions #### Move this code to another
file??? */
#define MAX_IDE_FLOPPIES 4
-#define CM_MOUNTPOINT_DIR "/instmnt/"
+#define CM_MOUNTPOINT_DIR "/instmnt"
#ifdef _TESTING_
#define is_network_configured() 1
#define configure_network() 1
@@ -253,6 +253,8 @@
/* we've boot off a CD-ROM, live style */
strcpy(buffer2, "");
} else {
+ i++; /* if we have to manualy choose a dir, give us a warning
+ when we are wrong, even if it is our first time through */
status = enterDirBox(_("Choose Directory"),
text, prefix, preventry, buffer2, PATH_MAX);
if (status == DLG_CANCEL)
@@ -263,7 +265,8 @@
free(preventry);
preventry = strdup(buffer2);
- snprintf(buffer, sizeof(buffer), "%s%s", prefix, buffer2);
+ snprintf(buffer, sizeof(buffer), "%s%s%s", prefix,
+ buffer2[0]=='/'?"":"/", buffer2);
if (NAME_ISDIR(buffer, &statbuf))
break;
else {
@@ -527,7 +530,7 @@
break;
case ARC_manually:
snprintf(prtbuf, sizeof(prtbuf),
- _("Please enter the name of the directory that contains the
Archive files.\nThe installation medium is mounted below %s/ ."),
+ _("Please enter the name of the directory that contains the
+Archive files."),
mountpoint);
;
status = enterDirBox (_("Enter the Archive directory"), prtbuf,
mountpoint, "", buffer, PATH_MAX);
@@ -959,11 +962,8 @@
CM_MOUNTPOINT_DIR);
status = choose_archive_dir(prtbuf, CM_MOUNTPOINT_DIR);
- if (status && status != DLG_CANCEL)
- {
- if (! system("cat /proc/mounts | grep -q " CM_MOUNTPOINT_DIR))
- umount(CM_MOUNTPOINT_DIR);
- }
+ if (! system("cat /proc/mounts | grep -q " CM_MOUNTPOINT_DIR))
+ umount(CM_MOUNTPOINT_DIR);
return status;
}
@@ -1321,9 +1321,9 @@
case MED_mounted:
if (disqtype == problem_report )
status = choose_archive_dir(
- _("Please choose the directory where you would like to save the
problem report."), CM_MOUNTPOINT_DIR);
+ _("Please choose the directory where you would like to save the
+problem report."), TARGET_PREFIX);
else
- status = choose_archive_dir( _("Please choose the directory where the Debian
archive resides."), CM_MOUNTPOINT_DIR);
+ status = choose_archive_dir( _("Please choose the directory where the Debian
+archive resides."), TARGET_PREFIX);
if (status == DLG_CANCEL)
return DLG_CANCEL;
break;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
