emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the exit status of umount -a, a casualty of the TRUE/FALSE normalization.

Browse Source 
Thanks to Francois-R Boyer <boyerf@IRO.UMontreal.CA> for the report.
This commit is contained in:
Matt Kraai 2001-01-17 00:12:11 +00:00
parent 9aa23ba5a8
commit fd4c58d7c5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
umount.c
View File

@ -212,18 +212,18 @@ static int umount_all(int useMtab)
/* Never umount /proc on a umount -a */ /* Never umount /proc on a umount -a */
if (strstr(mountpt, "proc")!= NULL) if (strstr(mountpt, "proc")!= NULL)
continue; continue;
status = do_umount(mountpt, useMtab); if (!do_umount(mountpt, useMtab)) {
if (status != 0) {
/* Don't bother retrying the umount on busy devices */ /* Don't bother retrying the umount on busy devices */
if (errno == EBUSY) { if (errno == EBUSY) {
perror_msg("%s", mountpt); perror_msg("%s", mountpt);
status = FALSE;
continue; continue;
} }
status = do_umount(mountpt, useMtab); if (!do_umount(mountpt, useMtab)) {
if (status != 0) {
printf("Couldn't umount %s on %s: %s\n", printf("Couldn't umount %s on %s: %s\n",
mountpt, mtab_getinfo(mountpt, MTAB_GETDEVICE), mountpt, mtab_getinfo(mountpt, MTAB_GETDEVICE),
strerror(errno)); strerror(errno));
status = FALSE;
} }
} }
} }

8
util-linux/umount.c
View File

@ -212,18 +212,18 @@ static int umount_all(int useMtab)
/* Never umount /proc on a umount -a */ /* Never umount /proc on a umount -a */
if (strstr(mountpt, "proc")!= NULL) if (strstr(mountpt, "proc")!= NULL)
continue; continue;
status = do_umount(mountpt, useMtab); if (!do_umount(mountpt, useMtab)) {
if (status != 0) {
/* Don't bother retrying the umount on busy devices */ /* Don't bother retrying the umount on busy devices */
if (errno == EBUSY) { if (errno == EBUSY) {
perror_msg("%s", mountpt); perror_msg("%s", mountpt);
status = FALSE;
continue; continue;
} }
status = do_umount(mountpt, useMtab); if (!do_umount(mountpt, useMtab)) {
if (status != 0) {
printf("Couldn't umount %s on %s: %s\n", printf("Couldn't umount %s on %s: %s\n",
mountpt, mtab_getinfo(mountpt, MTAB_GETDEVICE), mountpt, mtab_getinfo(mountpt, MTAB_GETDEVICE),
strerror(errno)); strerror(errno));
status = FALSE;
} }
} }
} }