When mounting a ro fs rw, print warning and then mount it ro. Patch

from Dave Cinege.
 -Erik


git-svn-id: svn://busybox.net/trunk/busybox@1075 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 8 insertions, 0 deletions

diff --git a/mount.c b/mount.c
index 455c33303..eefbd76fd 100644
--- a/mount.c
+++ b/mount.c
@@ -144,6 +144,10 @@ do_mount(char *specialfile, char *dir, char *filesystemtype,
                 }
 #endif
                 status = mount(specialfile, dir, filesystemtype, flags, string_flags);
+                if (errno == EROFS) {
+                        errorMsg("%s is write-protected, mounting read-only\n", specialfile);
+                        status = mount(specialfile, dir, filesystemtype, flags |= MS_RDONLY, string_flags);
+                }
         }
 
 
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 455c33303..eefbd76fd 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -144,6 +144,10 @@ do_mount(char *specialfile, char *dir, char *filesystemtype,
                 }
 #endif
                 status = mount(specialfile, dir, filesystemtype, flags, string_flags);
+                if (errno == EROFS) {
+                        errorMsg("%s is write-protected, mounting read-only\n", specialfile);
+                        status = mount(specialfile, dir, filesystemtype, flags |= MS_RDONLY, string_flags);
+                }
         }