Support PVE3 and PVE4
This commit is contained in:
parent
98d8395873
commit
22fd5a0087
3
Makefile
3
Makefile
|
@ -9,7 +9,8 @@ install:
|
|||
@mkdir -p $(DESTDIR)/usr/share/pve-no-subscription
|
||||
@install -m 644 apt-hook $(DESTDIR)/etc/apt/apt.conf.d/99-pve-no-subscription
|
||||
@install -m 755 no-subscription-warning.sh $(DESTDIR)/usr/share/pve-no-subscription
|
||||
@install -m 644 no-subscription-warning.patch $(DESTDIR)/usr/share/pve-no-subscription
|
||||
@install -m 644 no-subscription-warning-ext4.patch $(DESTDIR)/usr/share/pve-no-subscription
|
||||
@install -m 644 no-subscription-warning-ext6.patch $(DESTDIR)/usr/share/pve-no-subscription
|
||||
@install -m 644 pve-no-subscription.list $(DESTDIR)/etc/apt/sources.list.d
|
||||
|
||||
package-clean:
|
||||
|
|
7
debian/changelog
vendored
7
debian/changelog
vendored
|
@ -1,3 +1,10 @@
|
|||
pve-no-subscription (1.1) UNRELEASED; urgency=low
|
||||
|
||||
* Added patch for ext4 and ext6 version of pvemanager
|
||||
* Drop dependency on pve-manager
|
||||
|
||||
-- Andreas Steinel <A.Steinel@gmail.com> Mon, 25 Apr 2016 10:59:14 +0200
|
||||
|
||||
pve-no-subscription (1.0) UNRELEASED; urgency=low
|
||||
|
||||
* Initial Version
|
||||
|
|
2
debian/control
vendored
2
debian/control
vendored
|
@ -10,7 +10,7 @@ Vcs-Browser: https://github.com/lnxbil/pve-no-subscription
|
|||
|
||||
Package: pve-no-subscription
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends}, patch, pve-manager (>= 4.0)
|
||||
Depends: ${misc:Depends}, patch
|
||||
Description: PVE non-subscription repository and tweaks
|
||||
Debian APT repository for pve-no-subscription and subscription
|
||||
notification remover as simple debian package.
|
||||
|
|
12
no-subscription-warning-ext6.patch
Normal file
12
no-subscription-warning-ext6.patch
Normal file
|
@ -0,0 +1,12 @@
|
|||
--- /usr/share/pve-manager/ext6/pvemanagerlib.js.orig 2016-04-25 10:47:04.345151970 +0200
|
||||
+++ /usr/share/pve-manager/ext6/pvemanagerlib.js 2016-04-25 10:46:35.821675213 +0200
|
||||
@@ -507,7 +507,7 @@
|
||||
success: function(response, opts) {
|
||||
var data = response.result.data;
|
||||
|
||||
+ if (false) {
|
||||
- if (data.status !== 'Active') {
|
||||
Ext.Msg.show({
|
||||
title: gettext('No valid subscription'),
|
||||
icon: Ext.Msg.WARNING,
|
||||
|
|
@ -1,8 +1,21 @@
|
|||
#!/bin/sh
|
||||
|
||||
if [ $( grep -c "if (data.status !== 'Active') {" /usr/share/pve-manager/ext4/pvemanagerlib.js ) -gt 0 ]
|
||||
if [ -e /usr/share/pve-manager/ext4/pvemanagerlib.js ]
|
||||
then
|
||||
echo "---------------[ Patching with No-Subscription-Removal-Patch ]----------------"
|
||||
cd / && patch --no-backup-if-mismatch -l -p0 < /usr/share/pve-no-subscription/no-subscription-warning.patch
|
||||
echo "------------------------------------------------------------------------------"
|
||||
if [ $( grep -c "if (data.status !== 'Active') {" /usr/share/pve-manager/ext4/pvemanagerlib.js ) -gt 0 ]
|
||||
then
|
||||
echo "---------------[ Patching with No-Subscription-Removal-Patch ]----------------"
|
||||
cd / && patch --no-backup-if-mismatch -l -p0 < /usr/share/pve-no-subscription/no-subscription-warning-ext4.patch
|
||||
echo "------------------------------------------------------------------------------"
|
||||
fi
|
||||
else
|
||||
if [ -e /usr/share/pve-manager/ext6/pvemanagerlib.js ]
|
||||
then
|
||||
if [ $( grep -c "if (data.status !== 'Active') {" /usr/share/pve-manager/ext6/pvemanagerlib.js ) -gt 0 ]
|
||||
then
|
||||
echo "---------------[ Patching with No-Subscription-Removal-Patch ]----------------"
|
||||
cd / && patch --no-backup-if-mismatch -l -p0 < /usr/share/pve-no-subscription/no-subscription-warning-ext6.patch
|
||||
echo "------------------------------------------------------------------------------"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue