From 12a9c874804dc2970c44b223ec1059bd57900169 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 15 Jun 2001 04:50:57 +0000 Subject: * mkpasswd.c (main): Output passwd file in binary mode so that there are no CRs in the file. * umount.cc (remove_all_user_mounts): Don't try to remove /cygdrive mounts. --- winsup/utils/umount.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'winsup/utils/umount.cc') diff --git a/winsup/utils/umount.cc b/winsup/utils/umount.cc index 3adb8511e..c19b78cdc 100644 --- a/winsup/utils/umount.cc +++ b/winsup/utils/umount.cc @@ -159,7 +159,8 @@ remove_all_user_mounts () while ((p = getmntent (m)) != NULL) { /* Remove the mount if it's a user mount. */ - if (strncmp (p->mnt_type, "user", 4) == 0) + if (strncmp (p->mnt_type, "user", 4) == 0 && + strstr (p->mnt_opts, "noumount") == NULL) { if (cygwin_umount (p->mnt_dir, 0)) error (p->mnt_dir); @@ -183,7 +184,8 @@ remove_all_system_mounts () while ((p = getmntent (m)) != NULL) { /* Remove the mount if it's a system mount. */ - if (strncmp (p->mnt_type, "system", 6) == 0) + if (strncmp (p->mnt_type, "system", 6) == 0 && + strstr (p->mnt_opts, "noumount") == NULL) { if (cygwin_umount (p->mnt_dir, MOUNT_SYSTEM)) error (p->mnt_dir); -- cgit v1.2.3