Attachment 3207 Details for Bug 8322 – patch with fix

[patch] patch with fix

systemd-39-magos.patch (text/plain), 1.39 KB, created by Alex Loginov on 2012-12-07 13:29:58 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Loginov

Created: 2012-12-07 13:29:58 CET

Size: 1.39 KB

patch

obsolete

>diff -auprN a/src/mount-setup.c b/src/mount-setup.c
>--- a/src/mount-setup.c	2011-12-31 01:27:35.000000000 +0400
>+++ b/src/mount-setup.c	2012-12-02 12:08:12.416114883 +0400
>@@ -71,7 +71,10 @@ static const MountPoint mount_table[] =
> static const char * const ignore_paths[] = {
>         "/sys/fs/selinux",
>         "/selinux",
>-        "/proc/bus/usb"
>+        "/proc/bus/usb",
>+        "/mnt/live",
>+        "/mnt/livemedia",
>+        "/mnt/liveloop"
> };
> 
> bool mount_point_is_api(const char *path) {
>@@ -91,7 +94,7 @@ bool mount_point_ignore(const char *path
>         unsigned i;
> 
>         for (i = 0; i < ELEMENTSOF(ignore_paths); i++)
>-                if (path_equal(path, ignore_paths[i]))
>+                if (path_startswith(path, ignore_paths[i]) || path_equal(path,ignore_paths[i]))
>                         return true;
> 
>         return false;
>diff -auprN a/src/umount.c b/src/umount.c
>--- a/src/umount.c	2011-12-31 01:27:35.000000000 +0400
>+++ b/src/umount.c	2012-12-02 12:10:10.145129108 +0400
>@@ -257,6 +257,11 @@ static int loopback_list_get(MountPoint
>                         goto finish;
>                 }
> 
>+                if (mount_point_ignore(udev_list_entry_get_name(item))) { 
>+                        free(loop);
>+                        continue; 
>+                }
>+
>                 if (!(lb = new0(MountPoint, 1))) {
>                         free(loop);
>                         r = -ENOMEM;

diff -auprN a/src/mount-setup.c b/src/mount-setup.c
--- a/src/mount-setup.c	2011-12-31 01:27:35.000000000 +0400
+++ b/src/mount-setup.c	2012-12-02 12:08:12.416114883 +0400
@@ -71,7 +71,10 @@ static const MountPoint mount_table[] =
 static const char * const ignore_paths[] = {
         "/sys/fs/selinux",
         "/selinux",
-        "/proc/bus/usb"
+        "/proc/bus/usb",
+        "/mnt/live",
+        "/mnt/livemedia",
+        "/mnt/liveloop"
 };
 
 bool mount_point_is_api(const char *path) {
@@ -91,7 +94,7 @@ bool mount_point_ignore(const char *path
         unsigned i;
 
         for (i = 0; i < ELEMENTSOF(ignore_paths); i++)
-                if (path_equal(path, ignore_paths[i]))
+                if (path_startswith(path, ignore_paths[i]) || path_equal(path,ignore_paths[i]))
                         return true;
 
         return false;
diff -auprN a/src/umount.c b/src/umount.c
--- a/src/umount.c	2011-12-31 01:27:35.000000000 +0400
+++ b/src/umount.c	2012-12-02 12:10:10.145129108 +0400
@@ -257,6 +257,11 @@ static int loopback_list_get(MountPoint
                         goto finish;
                 }
 
+                if (mount_point_ignore(udev_list_entry_get_name(item))) { 
+                        free(loop);
+                        continue; 
+                }
+
                 if (!(lb = new0(MountPoint, 1))) {
                         free(loop);
                         r = -ENOMEM;

Actions: View | Diff

Attachments on bug 8322: 3207 | 3214