SHA256
1
0
forked from cockpit/cockpit
Klaus Kämpf 2015-02-07 16:43:31 +00:00 committed by Git OBS Bridge
parent bf382d76a5
commit fe10d5a60e
4 changed files with 33 additions and 0 deletions

7
cockpit-suse.pam Normal file
View File

@ -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

View File

@ -37,6 +37,7 @@ Source0: https://github.com/cockpit-project/cockpit/releases/download/%{v
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
Patch1: add-genericname.patch Patch1: add-genericname.patch
Patch2: fix-docker-path.patch
Source1: cockpit-suse.pam Source1: cockpit-suse.pam
%else %else
Source1: cockpit-fedora.pam Source1: cockpit-fedora.pam
@ -172,6 +173,7 @@ The Cockpit Web Service listens on the network, and authenticates users.
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
%patch1 -p1 %patch1 -p1
%patch2 -p1
%endif %endif
%build %build

24
fix-docker-path.patch Normal file
View File

@ -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();
});