[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7c475cd6e18ff57a065e3bcad00122dc1d948969

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3193 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  7c475cd6e18ff57a065e3bcad00122dc1d948969 (commit)
      from  5daad7f6b25683d8fb893c7f9baaf1678b40f266 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7c475cd6e18ff57a065e3bcad00122dc1d948969
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 14 17:38:16 2014 +0100

    fireinfo: Remove old patch.

-----------------------------------------------------------------------

Summary of changes:
 lfs/fireinfo                                       |  1 -
 ...-mounted-filesystems-from-proc-mounts-ins.patch | 30 ----------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch

Difference in files:
diff --git a/lfs/fireinfo b/lfs/fireinfo
index a60aa53..f71437f 100644
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -71,7 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch
 	cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
 	cd $(DIR_APP) && ./configure --prefix=/usr
 	cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch b/src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch
deleted file mode 100644
index 86e30cb..0000000
--- a/src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 758f624a9862b214f39c9106137a61e2d6b14544 Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer(a)ipfire.org>
-Date: Fri, 7 Feb 2014 14:56:14 +0100
-Subject: [PATCH] Revert "Read mounted filesystems from /proc/mounts instead of
- /etc/mtab."
-
-This reverts commit c916f644c57b638b3128d0e882c32bf50ea29631.
-
-For some reason, the output of /etc/mtab and /proc/mounts is not
-identical and the root device is missing in /proc/mounts on IPFire.
----
- src/fireinfo/system.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
-index 800032e..40ff7b0 100644
---- a/src/fireinfo/system.py
-+++ b/src/fireinfo/system.py
-@@ -364,7 +364,7 @@ class System(object):
- 		"""
- 			Return the dev node of the root disk.
- 		"""
--		with open("/proc/mounts", "r") as f:
-+		with open("/etc/mtab", "r") as f:
- 			dev, mountpoint, fs, rest = f.readline().split(" ", 3)
- 			if mountpoint == "/" and not fs == "rootfs":
- 				# Cut off /dev
--- 
-1.8.3.1
-


hooks/post-receive
--
IPFire 2.x development tree