diff --git a/cockpit.spec b/cockpit.spec index 7c46bbd..be2abea 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -36,7 +36,6 @@ Source0: cockpit-%{version}.tar.gz Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.bz2 %endif %if 0%{?suse_version} -Patch: fix-docker-path.patch Source1: cockpit-suse.pam %else Source1: cockpit-fedora.pam @@ -170,9 +169,6 @@ The Cockpit Web Service listens on the network, and authenticates users. %if 0%{?fedora} == 20 sed -i s/unconfined_service_t/unconfined_t/g src/ws/test-server.service.in %endif -%if 0%{?suse_version} -%patch -p1 -%endif %build %if %{defined gitcommit} diff --git a/fix-docker-path.patch b/fix-docker-path.patch deleted file mode 100644 index fa10c71..0000000 --- a/fix-docker-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -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(); - }); -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.min.js ./shell.min.js ---- ../orig-cockpit-0.38/shell.min.js 2015-01-28 13:35:22.000000000 +0100 -+++ ./shell.min.js 2015-02-07 18:29:46.885202429 +0100 -@@ -5,4 +5,4 @@ - var u=this._other_devices[0].childNodes;var f=null;var p,h;for(var g=0;gc){f=p;break}}this._other_devices[0].insertBefore(l[0],f);this._other_devices.closest(".panel").show();d(e("#storage-spinner-"+r));y(e("#storage-spinner-"+r),i)},_addMount:function(i){var a=i.lookup("com.redhat.Cockpit.Storage.Block");if(a.IdUsage!="filesystem"||a.HintIgnore)return;var o=s(i.objectPath.substr(i.objectPath.lastIndexOf("/")+1));var r=o;var c=null;var l=e('');if(a.MountedAt&&a.MountedAt.length>0){c=n.BarRow();for(var d=0;d",{Sort:r}).click(function(){I(a)}).append(e("").text(a.IdLabel||a.Device),e("").text(a.MountedAt||"-"),e("").append(c),l);var f=this._mounts[0].childNodes;var p=null;var h,g;for(var _=0;_r){p=h;break}}this._mounts[0].insertBefore(u[0],p)}};function M(){this._init()}n.pages.push(new M);function R(e){var i;if(e.Type=="pool")i=_("Pool for Thin Logical Volumes");else if(e.ThinPool!="/")i=_("Thin Logical Volume");else if(e.Origin!="/")i=_("Logical Volume (Snapshot)");else i=_("Logical Volume");return t.format('$type "$name"',{type:i,name:n.esc(e.Name)})}function P(i,o,r){var s,c;if(i.IdUsage=="filesystem"){s=e("").text(t.format(C_("storage-id-desc","$0 File System"),i.IdType))}else if(i.IdUsage=="raid"){if(i.IdType=="linux_raid_member"){s=e("").text(C_("storage-id-desc","Linux MD-RAID Component"))}else if(i.IdType=="LVM2_member"){s=e("").text(C_("storage-id-desc","LVM2 Physical Volume"))}else{s=e("").text(C_("storage-id-desc","RAID Member"))}if(i.PvGroup!="/"){var l=i._client.get(i.PvGroup,"com.redhat.Cockpit.Storage.VolumeGroup");s.append(" of ",e("").text(l.Name).click(function(){t.location.go("storage-detail",{type:"vg",id:l.Name})}))}else if(i.MDRaidMember!="/"){var d=i.MDRaidMember.substr(i.MDRaidMember.lastIndexOf("/")+1);var u=i._client.get(i.MDRaidMember,"com.redhat.Cockpit.Storage.MDRaid");s.append(" of ",e("").text(z(u)).click(function(){t.location.go("storage-detail",{type:"mdraid",id:d})}))}}else if(i.IdUsage=="crypto"){if(i.IdType=="crypto_LUKS"){s=e("").text(C_("storage-id-desc","LUKS Encrypted"))}else{s=e("").text(C_("storage-id-desc","Encrypted"))}}else if(i.IdUsage=="other"){if(i.IdType=="swap"){s=e("").text(C_("storage-id-desc","Swap Space"))}else{s=e("").text(C_("storage-id-desc","Other Data"))}}else{s=e("").text(C_("storage-id-desc","Unrecognized Data"))}if(i.PartitionNumber>0){s=e("").append(t.format(_("$size $partition"),{size:a(i.Size),partition:o})," (",s,")")}if(i.LogicalVolume!="/"){c=i._client.lookup(i.LogicalVolume,"com.redhat.Cockpit.Storage.LogicalVolume");s=e("").append(t.format(_("$size $partition"),{size:a(i.Size),partition:R(c)})," (",s,")")}s.append(e("
"),n.esc(i.Device));if(i.IdUsage=="filesystem"){s.append(", ");if(i.MountedAt.length>0)s.append(t.format(_("mounted on $0"),n.esc(i.MountedAt[0])));else s.append(_("not mounted"))}else if(i.IdUsage=="crypto"){s.append(", ");if(r)s.append(_("unlocked"));else s.append(_("locked"))}return s}function A(e){if(e.PartitionNumber>0)return"Partition";else if(e.LogicalVolume!="/"){var t=e._client.lookup(e.LogicalVolume,"com.redhat.Cockpit.Storage.LogicalVolume");return R(t)}else if(e.Drive!="/"){var i=e._client.lookup(e.Drive,"com.redhat.Cockpit.Storage.Drive");return i?n.esc(i.Name):e.Device}else return"Block Device"}function I(e){var n,i,a,o;while(true){if(e.PartitionTable&&e.PartitionTable!="/")e=e._client.get(e.PartitionTable,"com.redhat.Cockpit.Storage.Block");else if(e.CryptoBackingDevice&&e.CryptoBackingDevice!="/")e=e._client.get(e.CryptoBackingDevice,"com.redhat.Cockpit.Storage.Block");else break}if(e.Drive!="/"){n=e.Drive.substr(e.Drive.lastIndexOf("/")+1);t.location.go("storage-detail",{type:"drive",id:n})}else if(e.MDRaid!="/"){n=e.MDRaid.substr(e.MDRaid.lastIndexOf("/")+1);t.location.go("storage-detail",{type:"mdraid",id:n})}else if(e.LogicalVolume!="/"){i=e._client.get(e.LogicalVolume,"com.redhat.Cockpit.Storage.LogicalVolume");if(i.VolumeGroup!="/"){a=i._client.get(i.VolumeGroup,"com.redhat.Cockpit.Storage.VolumeGroup");t.location.go("storage-detail",{type:"vg",id:a.Name})}}else{o=e.getObject().objectPath;n=o.substr(o.lastIndexOf("/")+1);t.location.go("storage-detail",{type:"block",id:n})}}function T(n){var i=false;var a=false;var o=null;while(true){if(n.PartitionTable&&n.PartitionTable!="/"){n=n._client.get(n.PartitionTable,"com.redhat.Cockpit.Storage.Block");i=true}else if(n.CryptoBackingDevice&&n.CryptoBackingDevice!="/"){n=n._client.get(n.CryptoBackingDevice,"com.redhat.Cockpit.Storage.Block");a=true}else break}if(n.Drive!="/"){var r=n._client.get(n.Drive,"com.redhat.Cockpit.Storage.Drive");o=e("
").text(r.Name||n.Device).click(function(){var e=n.Drive.substr(n.Drive.lastIndexOf("/")+1);t.location.go("storage-detail",{type:"drive",id:e})})}else if(n.MDRaid!="/"){var s=n._client.get(n.MDRaid,"com.redhat.Cockpit.Storage.MDRaid");o=e("").append(_("RAID Device")," ",e("").text(z(s)).click(function(){var e=n.MDRaid.substr(n.MDRaid.lastIndexOf("/")+1);t.location.go("storage-detail",{type:"mdraid",id:e})}))}else if(n.LogicalVolume!="/"){var c=n._client.get(n.LogicalVolume,"com.redhat.Cockpit.Storage.LogicalVolume");if(c.VolumeGroup!="/"){var l=c._client.get(c.VolumeGroup,"com.redhat.Cockpit.Storage.VolumeGroup");o=e("").append(R(c)," of ",e("").text(l.Name).click(function(){t.location.go("storage-detail",{type:"vg",id:l.Name})}))}else{o=e("").text(R(c))}}else{o=e("").text(n.Device).click(function(){var e=n.getObject().objectPath;var i=e.substr(e.lastIndexOf("/")+1);t.location.go("storage-detail",{type:"block",id:i})})}var d=o;if(i)d=e("").append(_("Partition of "),d);if(a)d=e("").append(d,_(", encrypted"));return d}function O(e){var t=e.getObject().objectPath;var n=e._client.getObjectsFrom("/com/redhat/Cockpit/Storage/block_devices/");for(var i=0;i0&&!i(c)&&!c.PartitionTableType&&!n(c)&&!(t&&t(c)))a.push(c)}return a}U.prototype={_init:function(){this.id="storage-detail";this.section_id="storage";this.watched_objects=[]},getTitle:function(){return C_("page-title","Storage")},get_page_title:function(){var e;if(this._drive){if(this._drive.Vendor&&this._drive.Vendor.length>0)e=this._drive.Vendor+" "+this._drive.Model;else e=this._drive.Model}else if(this._mdraid){e=z(this._mdraid)}else if(this._vg){e=this._vg.Name}else e=this._block.Device;return e||"?"},show:function(){},watch_object:function(t){if(t){this.watched_objects.push(t);e(t).on("notify.storage-details",e.proxy(this,"_update"))}},unwatch_all_objects:function(){for(var t=0;t0?o(i.Size):C_("storage","No Media Inserted");e("#block_detail_capacity").html(t)},_updateContent:function(i){var o=this;var r=0;function s(e){return function(t){o.block_action(e,t)}}function c(e,t,i){var a;var r=[{title:_("Mount"),action:"mount"},{title:_("Unmount"),action:"unmount"},{title:_("Filesystem Options"),action:"fsys-options"}];var s=[{title:_("Lock"),action:"lock"},{title:_("Unlock"),action:"unlock"},{title:_("Encryption Options"),action:"crypto-options"}];var c=[{title:_("Resize"),action:"resize"},{title:_("Rename"),action:"rename"}];var l=[{title:_("Create Snapshot"),action:"create-snapshot"},{title:_("Activate"),action:"activate"},{title:_("Deactivate"),action:"deactivate"}];var d=[{title:_("Create Thin Volume"),action:"create-thin-volume"}];var u=[{title:_("Format"),action:"format"}];var f=[{title:_("Delete"),action:"delete"}];var p=e.IdUsage=="filesystem";var h=e.MountedAt&&e.MountedAt.length!==0;var g=e.IdUsage=="crypto";var m=e._iface_name=="com.redhat.Cockpit.Storage.LogicalVolume"||e.LogicalVolume!="/";var v=e.Type=="pool";var b=e._iface_name=="com.redhat.Cockpit.Storage.Block"||e.Active;var k=e._iface_name=="com.redhat.Cockpit.Storage.Block"&&!e.ReadOnly;var y=null;var w=[];if(p){w=w.concat(r);y=h?"unmount":"mount"}else if(g){w=w.concat(s);y=t?"unlock":"lock"}if(k){w=w.concat(u);if(!y)y="format"}if(m){w=w.concat(c);if(v){w=w.concat(d);y="create-thin-volume"}else{w=w.concat(l);if(!y)y=b?"deactivate":"activate"}}if(i||m){w=w.concat(f);if(!y)y="delete"}if(w.length>0){a=n.action_btn(function(t){o.block_action(e,t)},w);n.action_btn_select(a,y);n.action_btn_enable(a,"mount",!h);n.action_btn_enable(a,"unmount",h);n.action_btn_enable(a,"lock",!t);n.action_btn_enable(a,"unlock",t);n.action_btn_enable(a,"activate",!b);n.action_btn_enable(a,"deactivate",b)}return a}function l(t,n){return e("