From fe10d5a60ed3b568e8abf36f49e5ef54f53d928f84131eb784c35c8a12740eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.com>
Date: Sat, 7 Feb 2015 16:43:31 +0000
Subject: [PATCH] fix docker path

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=7
---
 cockpit.pam => cockpit-fedora.pam |  0
 cockpit-suse.pam                  |  7 +++++++
 cockpit.spec                      |  2 ++
 fix-docker-path.patch             | 24 ++++++++++++++++++++++++
 4 files changed, 33 insertions(+)
 rename cockpit.pam => cockpit-fedora.pam (100%)
 create mode 100644 cockpit-suse.pam
 create mode 100644 fix-docker-path.patch

diff --git a/cockpit.pam b/cockpit-fedora.pam
similarity index 100%
rename from cockpit.pam
rename to cockpit-fedora.pam
diff --git a/cockpit-suse.pam b/cockpit-suse.pam
new file mode 100644
index 0000000..a94b3f9
--- /dev/null
+++ b/cockpit-suse.pam
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth       required	pam_unix2.so	nullok
+auth       required	pam_nologin.so
+account    required	pam_unix2.so
+password   required	pam_pwcheck.so	nullok
+password   required	pam_unix2.so	nullok use_first_pass use_authtok
+session    required	pam_unix2.so	none
diff --git a/cockpit.spec b/cockpit.spec
index 8aad816..6e0be00 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -37,6 +37,7 @@ Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{v
 %endif
 %if 0%{?suse_version}
 Patch1:         add-genericname.patch
+Patch2:         fix-docker-path.patch
 Source1:        cockpit-suse.pam
 %else
 Source1:        cockpit-fedora.pam
@@ -172,6 +173,7 @@ The Cockpit Web Service listens on the network, and authenticates users.
 %endif
 %if 0%{?suse_version}
 %patch1 -p1
+%patch2 -p1
 %endif
 
 %build
diff --git a/fix-docker-path.patch b/fix-docker-path.patch
new file mode 100644
index 0000000..b5bf76c
--- /dev/null
+++ b/fix-docker-path.patch
@@ -0,0 +1,24 @@
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cockpit-0.38/pkg/shell/cockpit-docker.js ./pkg/shell/cockpit-docker.js
+--- ../orig-cockpit-0.38/pkg/shell/cockpit-docker.js	2015-01-28 13:35:16.000000000 +0100
++++ ./pkg/shell/cockpit-docker.js	2015-02-07 17:41:48.753807824 +0100
+@@ -1810,7 +1810,7 @@
+         if (watch && watch.valid)
+             watch.close();
+ 
+-        watch = cockpit.channel({ payload: "fsdir1", path: "/var/lib/docker" });
++        watch = cockpit.channel({ payload: "fsdir1", path: "/usr/bin/docker" });
+         $(watch).on("message", function(event, data) {
+             trigger_event();
+         });
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cockpit-0.38/shell.js ./shell.js
+--- ../orig-cockpit-0.38/shell.js	2015-01-28 13:35:22.000000000 +0100
++++ ./shell.js	2015-02-07 17:42:24.427286289 +0100
+@@ -16383,7 +16383,7 @@
+         if (watch && watch.valid)
+             watch.close();
+ 
+-        watch = cockpit.channel({ payload: "fsdir1", path: "/var/lib/docker" });
++        watch = cockpit.channel({ payload: "fsdir1", path: "/usr/bin/docker" });
+         $(watch).on("message", function(event, data) {
+             trigger_event();
+         });