From: Carlos Alberto Lopez Perez Date: Sat, 2 Mar 2013 21:50:43 +0000 (+0100) Subject: Remove 0001-Revert-Remove-etc-hostid-missing-warning.patch patch X-Git-Tag: debian/0.7.9-2~113 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b4ff452406ef0ee676f8cabba2838470d9312d54;p=mirror_spl-debian.git Remove 0001-Revert-Remove-etc-hostid-missing-warning.patch patch * The previous commit (cfeaec5) ensured that /etc/hostid will exist on the system after the package is installed. * Therefore remove this patch that warns about the non existence of such file. --- diff --git a/debian/patches/0001-Revert-Remove-etc-hostid-missing-warning.patch b/debian/patches/0001-Revert-Remove-etc-hostid-missing-warning.patch deleted file mode 100644 index 40bf56e..0000000 --- a/debian/patches/0001-Revert-Remove-etc-hostid-missing-warning.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7559daf38acc293474d3d2a13ecf746bc7507a11 Mon Sep 17 00:00:00 2001 -From: Darik Horn -Date: Tue, 11 Oct 2011 18:32:58 -0500 -Subject: [PATCH 1/2] Revert "Remove /etc/hostid missing warning" - -This reverts commit 6b3b569df30d13ed7bbbff877cffc71290a52f12. ---- - module/spl/spl-generic.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -Index: b/module/spl/spl-generic.c -=================================================================== ---- a/module/spl/spl-generic.c -+++ b/module/spl/spl-generic.c -@@ -471,8 +471,12 @@ - - file = kobj_open_file(spl_hostid_path); - -- if (file == (struct _buf *)-1) -+ if (file == (struct _buf *)-1) { -+ printk(KERN_WARNING -+ "SPL: The %s file is not found.\n", -+ spl_hostid_path); - return -1; -+ } - - result = kobj_get_filesize(file, &size); - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 74d8d0d..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-Revert-Remove-etc-hostid-missing-warning.patch