]>
Commit | Line | Data |
---|---|---|
f17f51e8 MT |
1 | From 758f624a9862b214f39c9106137a61e2d6b14544 Mon Sep 17 00:00:00 2001 |
2 | From: Michael Tremer <michael.tremer@ipfire.org> | |
3 | Date: Fri, 7 Feb 2014 14:56:14 +0100 | |
4 | Subject: [PATCH] Revert "Read mounted filesystems from /proc/mounts instead of | |
5 | /etc/mtab." | |
6 | ||
7 | This reverts commit c916f644c57b638b3128d0e882c32bf50ea29631. | |
8 | ||
9 | For some reason, the output of /etc/mtab and /proc/mounts is not | |
10 | identical and the root device is missing in /proc/mounts on IPFire. | |
11 | --- | |
12 | src/fireinfo/system.py | 2 +- | |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
14 | ||
15 | diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py | |
16 | index 800032e..40ff7b0 100644 | |
17 | --- a/src/fireinfo/system.py | |
18 | +++ b/src/fireinfo/system.py | |
19 | @@ -364,7 +364,7 @@ class System(object): | |
20 | """ | |
21 | Return the dev node of the root disk. | |
22 | """ | |
23 | - with open("/proc/mounts", "r") as f: | |
24 | + with open("/etc/mtab", "r") as f: | |
25 | dev, mountpoint, fs, rest = f.readline().split(" ", 3) | |
26 | if mountpoint == "/" and not fs == "rootfs": | |
27 | # Cut off /dev | |
28 | -- | |
29 | 1.8.3.1 | |
30 |