[pve-devel] [PATCH qemu-server] fix #3733: add 20 seconds timeout when VM backup stopped
--- PVE/QemuServer.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 9cefcc0..c43518e 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -5551,7 +5551,7 @@ sub vm_start_nolock { }; # Issues with the above 'stop' not being fully completed are extremely rare, a very low # timeout should be more than enough here... -PVE::Systemd::wait_for_unit_removed("$vmid.scope", 5); +PVE::Systemd::wait_for_unit_removed("$vmid.scope", 20); my $cpuunits = get_cpuunits($conf); -- 2.30.2 ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [ [PATCH i18n] Arabic translation update]
--- ar.po | 707 +++--- 1 file changed, 276 insertions(+), 431 deletions(-) diff --git a/ar.po b/ar.po index 6a7c16a..7ee0239 100644 --- a/ar.po +++ b/ar.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pve-manager 31813246103b2582162f422dc34d8077eaee1e01\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: Tue Apr 26 15:11:13 2022\n" -"PO-Revision-Date: 2021-11-15 14:41+0100\n" +"PO-Revision-Date: 2022-05-02 10:12+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: ar\n" @@ -21,9 +21,8 @@ msgstr "" "X-Generator: Poedit 2.4.2\n" #: proxmox-backup/www/SystemConfiguration.js:13 -#, fuzzy msgid " Network/Time" -msgstr "شبكة / الوقت" +msgstr " شبكة / الوقت" #: pve-manager/www/manager6/qemu/Options.js:95 msgid "(No boot device selected)" @@ -43,7 +42,7 @@ msgstr "5 دقائق" #: proxmox-backup/www/window/TrafficControlEdit.js:284 msgid "A comma-separated list of networks to apply the (shared) limit." -msgstr "" +msgstr "قائمة شبكات مفصولة بفواصل لتطبيق الحد (المشترك)." #: proxmox-widget-toolkit/src/window/AddYubico.js:99 msgid "A currently valid Yubico OTP value" @@ -81,9 +80,8 @@ msgstr "دعم ACPI" #: proxmox-widget-toolkit/src/window/AuthEditOpenId.js:128 #: pve-manager/www/manager6/dc/AuthEditOpenId.js:108 -#, fuzzy msgid "ACR Values" -msgstr "قيم S.M.A.R.T." +msgstr "قيم ACR" #: proxmox-widget-toolkit/src/window/ACMEPluginEdit.js:208 #: pve-manager/www/manager6/dc/ACMEPluginEdit.js:193 @@ -128,8 +126,7 @@ msgid "" "API server will be restarted to use new certificates, please reload web-" "interface!" msgstr "" -"سيتم إعادة تشغيل سيرفر API لاستخدام شهادات جديدة، يرجى إعادة تحميل واجهة " -"الويب!" +"سيتم إعادة تشغيل سيرفر API لاستخدام شهادات جديدة، يرجى إعادة تحميل واجهة الويب!" #: proxmox-backup/www/window/TokenEdit.js:15 msgid "API token" @@ -137,7 +134,7 @@ msgstr "رمز API" #: proxmox-widget-toolkit/src/node/APTRepositories.js:146 msgid "APT Repositories" -msgstr "" +msgstr "مستودعات APT" #: pve-manager/www/manager6/window/UploadToStorage.js:254 msgid "Abort" @@ -168,8 +165,7 @@ msgstr "أسم الحساب" msgid "Account attribute name" msgstr "اسم خصائص الحساب" -#: proxmox-widget-toolkit/src/panel/ACMEAccount.js:5 -#: pmg-gui/js/LDAPConfig.js:596 +#: proxmox-widget-toolkit/src/panel/ACMEAccount.js:5 pmg-gui/js/LDAPConfig.js:596 #: pve-manager/www/manager6/dc/ACMEClusterView.js:25 msgid "Accounts" msgstr "حسابات" @@ -206,9 +202,8 @@ msgstr "أجراءات" #: proxmox-widget-toolkit/src/form/NetworkSelector.js:111 #: proxmox-widget-toolkit/src/node/NetworkView.js:328 -#: proxmox-widget-toolkit/src/node/ServiceView.js:194 -#: pmg-gui/js/RuleEditor.js:45 pmg-gui/js/RuleInfo.js:249 -#: pve-manager/www/manager6/form/BridgeSelector.js:28 +#: proxmox-widget-toolkit/src/node/ServiceView.js:194 pmg-gui/js/RuleEditor.js:45 +#: pmg-gui/js/RuleInfo.js:249 pve-manager/www/manager6/form/BridgeSelector.js:28 #: pve-manager/www/manager6/storage/PBSEdit.js:217 #: pve-manager/www/manager6/storage/PBSEdit.js:220 #: pve-manager/www/manager6/storage/StatusView.js:31 @@ -321,9 +316,8 @@ msgid "Add a Yubico OTP key" msgstr "أضف مفتاح Yubico OTP" #: pve-manager/www/manager6/window/GuestDiskReassign.js:196 -#, fuzzy msgid "Add as" -msgstr "أضف Tape" +msgstr "أضفه كـ" #: proxmox-backup/www/window/CreateDirectory.js:44 #: proxmox-backup/www/window/ZFSCreate.js:32 @@ -378,7 +372,7 @@ msgstr "متقدم" #: pve-manager/www/manager6/sdn/zones/EvpnEdit.js:95 msgid "Advertise subnets" -msgstr "" +msgstr "أعلن عن الشبكات الفرعية" #: proxmox-backup/www/tape/DriveStatus.js:397 msgid "Alert Flags" @@ -397,8 +391,7 @@ msgstr "الاسم المستعار" #: proxmox-widget-toolkit/src/node/Tasks.js:336 #: proxmox-widget-toolkit/src/node/Tasks.js:344 -#: pve-manager/www/manager6/Utils.js:369 -#: pve-manager/www/manager6/dc/Backup.js:30 +#: pve-manager/www/manager6/Utils.js:369 pve-manager/www/manager6/dc/Backup.js:30 #: pve-manager/www/manager6/dc/Backup.js:155 #: pve-manager/www/manager6/dc/Backup.js:435 #: pve-manager/www/manager6/dc/BackupJobDetail.js:178 @@ -454,8 +447,7 @@ msgstr "تخصيص" msgid "Allocation Policy" msgstr "سياسة التخصيص" -#: pmg-gui/js/SpamQuarantineOptions.js:66 -#: pmg-gui/js/VirusQuarantineOptions.js:19 +#: pmg-gui/js/SpamQuarantineOptions.js:66 pmg-gui/js/VirusQuarantineOptions.js:19 msgid "Allow HREFs" msgstr "السماح بـ HREFs" @@ -492,9 +484,8 @@ msgid "Apply" msgstr "تطبيق" #: proxmox-backup/www/window/TrafficControlEdit.js:300 -#, fuzzy msgid "Apply Always" -msgstr "دائما" +msgstr "تطبيق دائما" #: proxmox-widget-toolkit/src/node/NetworkView.js:122 msgid "Apply Configuration" @@ -510,7 +501,7 @@ msgstr "تطبيق عشرات SpamAssassin مخصصة" #: proxmox-backup/www/window/TrafficControlEdit.js:281 msgid "Apply on all Networks" -msgstr "" +msgstr "تطبيق على جميع الشبكات" #: pve-manager/www/manager6/lxc/Options.js:54 msgid "Architecture" @@ -589,11 +580,10 @@ msgstr "هل أنت متأكد أن
[pve-devel] [PATCH i18n] Arabic translation update
Signed-off-by: Moayad Almalat --- ar.po | 865 +++--- 1 file changed, 337 insertions(+), 528 deletions(-) diff --git a/ar.po b/ar.po index f29e58f..acf4fa3 100644 --- a/ar.po +++ b/ar.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pve-manager 31813246103b2582162f422dc34d8077eaee1e01\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: Thu Nov 17 19:57:32 2022\n" -"PO-Revision-Date: 2022-05-02 10:12+0200\n" +"PO-Revision-Date: 2022-11-18 11:08+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: ar\n" @@ -29,13 +29,12 @@ msgid "(No boot device selected)" msgstr "(لم يتم تحديد جهاز التمهيد)" #: proxmox-widget-toolkit/src/window/FileBrowser.js:327 -#, fuzzy msgid ".tar.zst" -msgstr "تنزيل .tar.zst" +msgstr ".tar.zst" #: proxmox-widget-toolkit/src/window/FileBrowser.js:321 msgid ".zip" -msgstr "" +msgstr ".zip" #: pve-manager/www/manager6/lxc/MPEdit.js:247 msgid "/some/path" @@ -63,7 +62,7 @@ msgstr "" #: pve-manager/www/manager6/dc/AuthEditLDAP.js:285 #: pve-manager/www/manager6/dc/SyncWindow.js:127 msgid "ACL" -msgstr "" +msgstr "قائمة التحكم في الوصول" #: proxmox-backup/www/config/CertificateView.js:63 msgid "ACME Accounts" @@ -131,8 +130,7 @@ msgid "" "API server will be restarted to use new certificates, please reload web-" "interface!" msgstr "" -"سيتم إعادة تشغيل سيرفر API لاستخدام شهادات جديدة، يرجى إعادة تحميل واجهة " -"الويب!" +"سيتم إعادة تشغيل سيرفر API لاستخدام شهادات جديدة، يرجى إعادة تحميل واجهة الويب!" #: proxmox-backup/www/window/TokenEdit.js:15 msgid "API token" @@ -171,8 +169,7 @@ msgstr "أسم الحساب" msgid "Account attribute name" msgstr "اسم خصائص الحساب" -#: proxmox-widget-toolkit/src/panel/ACMEAccount.js:5 -#: pmg-gui/js/LDAPConfig.js:596 +#: proxmox-widget-toolkit/src/panel/ACMEAccount.js:5 pmg-gui/js/LDAPConfig.js:596 #: pve-manager/www/manager6/dc/ACMEClusterView.js:25 msgid "Accounts" msgstr "حسابات" @@ -209,9 +206,8 @@ msgstr "أجراءات" #: proxmox-widget-toolkit/src/form/NetworkSelector.js:111 #: proxmox-widget-toolkit/src/node/NetworkView.js:328 -#: proxmox-widget-toolkit/src/node/ServiceView.js:194 -#: pmg-gui/js/RuleEditor.js:45 pmg-gui/js/RuleInfo.js:249 -#: pve-manager/www/manager6/form/BridgeSelector.js:28 +#: proxmox-widget-toolkit/src/node/ServiceView.js:194 pmg-gui/js/RuleEditor.js:45 +#: pmg-gui/js/RuleInfo.js:249 pve-manager/www/manager6/form/BridgeSelector.js:28 #: pve-manager/www/manager6/storage/PBSEdit.js:217 #: pve-manager/www/manager6/storage/PBSEdit.js:220 #: pve-manager/www/manager6/storage/StatusView.js:31 @@ -293,9 +289,8 @@ msgid "Add EFI Disk" msgstr "إضافة قرص EFI" #: proxmox-backup/www/datastore/Content.js:1210 -#, fuzzy msgid "Add NS" -msgstr "أضفه كـ" +msgstr "أضفه NS" #: pmg-gui/js/PBSConfig.js:112 msgid "Add Remote" @@ -317,9 +312,8 @@ msgid "Add TPM" msgstr "أضف TPM" #: pve-manager/www/manager6/form/TagEdit.js:284 -#, fuzzy msgid "Add Tag" -msgstr "أضف Tape" +msgstr "إضافة علامة" #: proxmox-backup/www/tape/TapeInventory.js:187 msgid "Add Tape" @@ -413,8 +407,7 @@ msgstr "الاسم المستعار" #: proxmox-widget-toolkit/src/node/Tasks.js:336 #: proxmox-widget-toolkit/src/node/Tasks.js:344 -#: pve-manager/www/manager6/Utils.js:369 -#: pve-manager/www/manager6/dc/Backup.js:30 +#: pve-manager/www/manager6/Utils.js:369 pve-manager/www/manager6/dc/Backup.js:30 #: pve-manager/www/manager6/dc/Backup.js:155 #: pve-manager/www/manager6/dc/Backup.js:496 #: pve-manager/www/manager6/dc/BackupJobDetail.js:178 @@ -433,9 +426,8 @@ msgid "All" msgstr "جميع" #: pve-manager/www/manager6/qemu/ProcessorEdit.js:202 -#, fuzzy msgid "All Cores" -msgstr "أنوية" +msgstr "جميع الأنوية" #: pve-manager/www/manager6/qemu/PCIEdit.js:151 msgid "All Functions" @@ -475,8 +467,7 @@ msgstr "تخصيص" msgid "Allocation Policy" msgstr "سياسة التخصيص" -#: pmg-gui/js/SpamQuarantineOptions.js:66 -#: pmg-gui/js/VirusQuarantineOptions.js:19 +#: pmg-gui/js/SpamQuarantineOptions.js:66 pmg-gui/js/VirusQuarantineOptions.js:19 msgid "Allow HREFs" msgstr "السماح بـ HREFs" @@ -490,10 +481,9 @@ msgstr "السماح ترحيل القرص المحلي" msgid "Allowed characters" msgstr "الأحرف المسموح بها" -#: pve-manager/www/manager6/Utils.js:1934 -#: pve-manager/www/manager6/Utils.js:1936 +#: pve-manager/www/manager6/Utils.js:1934
[pve-devel] [PATCH manager] fix #3037: include the split_list to shell_qoute
By including and using 'split_list' from PVE::Tools we can avoid the null (\000) bytes in the shell_quote() function, in which the 'split_list' takes a single argument, to return the array format. Thanks wolfgang. Signed-off-by: Moayad Almalat --- PVE/CLI/pvesh.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PVE/CLI/pvesh.pm b/PVE/CLI/pvesh.pm index 370fdb0e..c28a1588 100755 --- a/PVE/CLI/pvesh.pm +++ b/PVE/CLI/pvesh.pm @@ -15,6 +15,7 @@ use PVE::CLIHandler; use PVE::API2Tools; use PVE::API2; use JSON; +use PVE::Tools qw(split_list); use base qw(PVE::CLIHandler); @@ -106,7 +107,7 @@ sub proxy_handler { my $args = []; foreach my $key (keys %$param) { next if $key eq 'quiet' || $key eq 'output-format'; # just to be sure - push @$args, "--$key", $param->{$key}; + push @$args, "--$key", $_ for split_list($param->{$key}); } my $remcmd = ['ssh', '-o', 'BatchMode=yes', "root\@$remip", -- 2.30.2 ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH v2 manager] fix #3037: include the split_list to shell_qoute
Based to the suggestion of Wolfgang, in regard to `split_list()`, I converted the `split_list()` to `split(/\0/, $param->{$key});` this will split the `$param->{$key}` null characters and push each element to the `$args` array along with the key value. changes since v1: * get rid of the `use PVE::Tools qw(split_list);` since not need it anymore. * replace the split_list to split(/\0/). Signed-off-by: Moayad Almalat --- PVE/CLI/pvesh.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PVE/CLI/pvesh.pm b/PVE/CLI/pvesh.pm index 370fdb0e..9acf292a 100755 --- a/PVE/CLI/pvesh.pm +++ b/PVE/CLI/pvesh.pm @@ -106,7 +106,7 @@ sub proxy_handler { my $args = []; foreach my $key (keys %$param) { next if $key eq 'quiet' || $key eq 'output-format'; # just to be sure - push @$args, "--$key", $param->{$key}; + push @$args, "--$key", $_ for split(/\0/, $param->{$key}); } my $remcmd = ['ssh', '-o', 'BatchMode=yes', "root\@$remip", -- 2.30.2 ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH i18n] update Arabic translations
Signed-off-by: Moayad Almalat --- ar.po | 661 +++--- 1 file changed, 259 insertions(+), 402 deletions(-) diff --git a/ar.po b/ar.po index a22377d..4361b4f 100644 --- a/ar.po +++ b/ar.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pve-manager 31813246103b2582162f422dc34d8077eaee1e01\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: Mon Mar 20 20:25:37 2023\n" -"PO-Revision-Date: 2022-11-18 11:08+0100\n" +"PO-Revision-Date: 2023-03-21 10:37+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: ar\n" @@ -132,8 +132,7 @@ msgid "" "API server will be restarted to use new certificates, please reload web-" "interface!" msgstr "" -"سيتم إعادة تشغيل سيرفر API لاستخدام شهادات جديدة، يرجى إعادة تحميل واجهة " -"الويب!" +"سيتم إعادة تشغيل سيرفر API لاستخدام شهادات جديدة، يرجى إعادة تحميل واجهة الويب!" #: proxmox-backup/www/window/TokenEdit.js:15 msgid "API token" @@ -172,8 +171,7 @@ msgstr "أسم الحساب" msgid "Account attribute name" msgstr "اسم خصائص الحساب" -#: proxmox-widget-toolkit/src/panel/ACMEAccount.js:5 -#: pmg-gui/js/LDAPConfig.js:596 +#: proxmox-widget-toolkit/src/panel/ACMEAccount.js:5 pmg-gui/js/LDAPConfig.js:596 #: pve-manager/www/manager6/dc/ACMEClusterView.js:25 msgid "Accounts" msgstr "حسابات" @@ -210,9 +208,8 @@ msgstr "أجراءات" #: proxmox-widget-toolkit/src/form/NetworkSelector.js:111 #: proxmox-widget-toolkit/src/node/NetworkView.js:281 -#: proxmox-widget-toolkit/src/node/ServiceView.js:194 -#: pmg-gui/js/RuleEditor.js:45 pmg-gui/js/RuleInfo.js:249 -#: pve-manager/www/manager6/form/BridgeSelector.js:28 +#: proxmox-widget-toolkit/src/node/ServiceView.js:194 pmg-gui/js/RuleEditor.js:45 +#: pmg-gui/js/RuleInfo.js:249 pve-manager/www/manager6/form/BridgeSelector.js:28 #: pve-manager/www/manager6/storage/PBSEdit.js:218 #: pve-manager/www/manager6/storage/PBSEdit.js:221 #: pve-manager/www/manager6/storage/StatusView.js:31 @@ -376,7 +373,7 @@ msgstr "عناوين" #: pve-manager/www/manager6/ceph/OSDDetails.js:164 msgid "Addresses and ports used by the OSD service" -msgstr "" +msgstr "عناوين ومنافذ تستخدمها خدمة OSD" #: pmg-gui/js/NavigationTree.js:104 proxmox-backup/www/NavigationTree.js:80 msgid "Administration" @@ -457,7 +454,7 @@ msgstr "حسنًا ، لديك مستودعات جاهزة للإنتاج مهي #: proxmox-backup/www/datastore/OptionView.js:16 msgid "All backup snapshots and their data will be permanently destroyed!" -msgstr "" +msgstr "جميع النسخ الاحتياطية وبياناتها سيتم حذفها بشكل دائم!" #: proxmox-widget-toolkit/src/panel/DiskList.js:402 msgid "All data on the device will be lost!" @@ -481,8 +478,7 @@ msgstr "تخصيص" msgid "Allocation Policy" msgstr "سياسة التخصيص" -#: pmg-gui/js/SpamQuarantineOptions.js:66 -#: pmg-gui/js/VirusQuarantineOptions.js:19 +#: pmg-gui/js/SpamQuarantineOptions.js:66 pmg-gui/js/VirusQuarantineOptions.js:19 msgid "Allow HREFs" msgstr "السماح بـ HREFs" @@ -520,11 +516,11 @@ msgstr "حدث خطأ أثناء تسجيل الرمز المميز." #: proxmox-widget-toolkit/src/window/AuthEditLDAP.js:93 msgid "Anonymous Search" -msgstr "" +msgstr "بحث مجهول" #: pve-manager/www/manager6/dc/OptionView.js:485 msgid "Applies to new edits" -msgstr "" +msgstr "ينطبق على التحريرات الجديدة" #: proxmox-widget-toolkit/src/window/LanguageEdit.js:45 #: proxmox-widget-toolkit/src/window/ThemeEdit.js:45 @@ -634,8 +630,7 @@ msgid "Assigned to LVs" msgstr "معين إلى LVs" #: pve-manager/www/manager6/dc/ClusterEdit.js:301 -msgid "" -"Assisted join: Paste encoded cluster join information and enter password." +msgid "Assisted join: Paste encoded cluster join information and enter password." msgstr "" "الانضمام المساعد: لصق معلومات الانضمام إلى الكتلة المشفرة وإدخال كلمة المرور." @@ -724,9 +719,8 @@ msgid "Automatic (Storage used by the VM, or 'local')" msgstr "تلقائي (التخزين المستخدم من قبل VM، أو \"محلي\")" #: pve-manager/www/manager6/dc/OptionView.js:107 -#, fuzzy msgid "Automatically" -msgstr "تلقائي" +msgstr "تلقائياً" #: pve-manager/www/manager6/ceph/Pool.js:314 msgid "Autoscale Mode" @@ -763,16 +757,14 @@ msgstr "متوسط وقت معالجة البريد" msgid "BCC" msgstr "BCC" -#: pmg-gui/js/mobile/mailview.js:10 -#: pve-manager/www/manager6/window/Wizard.js:170 +#: pmg-gui/js/mobile/mailview.js:10 pve-manager/www/manager6/window/Wizard.js:170 #: proxmox-backup/www/tape/windo
[pve-devel] [PATCH storage 1/1] fix #3609 add support to SMB3_11
--- PVE/Storage/CIFSPlugin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PVE/Storage/CIFSPlugin.pm b/PVE/Storage/CIFSPlugin.pm index be06cc7..d4a517d 100644 --- a/PVE/Storage/CIFSPlugin.pm +++ b/PVE/Storage/CIFSPlugin.pm @@ -120,7 +120,7 @@ sub properties { smbversion => { description => "SMB protocol version", type => 'string', - enum => ['2.0', '2.1', '3.0'], + enum => ['2.0', '2.1', '3.0', '3.11'], optional => 1, }, }; -- 2.30.2 ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH storage 0/1] fix #3609 add support to SMB3_11
Added support for the SMB version SMB3_11 When the `min protocol = SMB3_11` in the smb.conf, the CIFS mount will return with the following error: ``` CIFS VFS: cifs_mount failed w/return code = -95 ``` added an optional option to use the `vers=3.11` PVE/Storage/CIFSPlugin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH pve-docs 1/1] Close #1623: replace apt-get to apt
Signed-off-by: Moayad Almalat --- local-zfs.adoc | 4 ++-- pve-firewall.adoc| 2 +- pve-installation.adoc| 4 ++-- pve-package-repos.adoc | 2 +- pve-storage-iscsi.adoc | 2 +- qm-cloud-init.adoc | 2 +- system-software-updates.adoc | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/local-zfs.adoc b/local-zfs.adoc index fd03e89..0271510 100644 --- a/local-zfs.adoc +++ b/local-zfs.adoc @@ -333,10 +333,10 @@ Activate E-Mail Notification ZFS comes with an event daemon, which monitors events generated by the ZFS kernel module. The daemon can also send emails on ZFS events like pool errors. Newer ZFS packages ship the daemon in a separate package, -and you can install it using `apt-get`: +and you can install it using `apt`: -# apt-get install zfs-zed +# apt install zfs-zed To activate the daemon it is necessary to edit `/etc/zfs/zed.d/zed.rc` with your diff --git a/pve-firewall.adoc b/pve-firewall.adoc index 7089778..f286018 100644 --- a/pve-firewall.adoc +++ b/pve-firewall.adoc @@ -573,7 +573,7 @@ Rejected/Dropped firewall packets don't go to the IPS. Install suricata on proxmox host: -# apt-get install suricata +# apt install suricata # modprobe nfnetlink_queue diff --git a/pve-installation.adoc b/pve-installation.adoc index 0d416ac..5129c14 100644 --- a/pve-installation.adoc +++ b/pve-installation.adoc @@ -291,8 +291,8 @@ xref:sysadmin_package_repositories[After configuring the repositories] you need to run the following commands: -# apt-get update -# apt-get install proxmox-ve +# apt update +# apt install proxmox-ve Installing on top of an existing Debian installation looks easy, but it presumes diff --git a/pve-package-repos.adoc b/pve-package-repos.adoc index 4fcf147..34d1700 100644 --- a/pve-package-repos.adoc +++ b/pve-package-repos.adoc @@ -13,7 +13,7 @@ defined in the file `/etc/apt/sources.list` and in `.list` files placed in Each line defines a package repository. The preferred source must come first. Empty lines are ignored. A `#` character anywhere on a line marks the remainder of that line as a comment. The available packages from a repository are acquired -by running `apt-get update`. Updates can be installed directly using `apt-get`, +by running `apt update`. Updates can be installed directly using `apt`, or via the GUI. .File `/etc/apt/sources.list` diff --git a/pve-storage-iscsi.adoc b/pve-storage-iscsi.adoc index 93975f5..4fcfb92 100644 --- a/pve-storage-iscsi.adoc +++ b/pve-storage-iscsi.adoc @@ -19,7 +19,7 @@ http://www.open-iscsi.org/[Open-iSCSI] (`open-iscsi`) package. This is a standard Debian package, but it is not installed by default to save resources. - # apt-get install open-iscsi + # apt install open-iscsi Low-level iscsi management task can be done using the `iscsiadm` tool. diff --git a/qm-cloud-init.adoc b/qm-cloud-init.adoc index 895db9f..6744ccf 100644 --- a/qm-cloud-init.adoc +++ b/qm-cloud-init.adoc @@ -45,7 +45,7 @@ Simply install the Cloud-Init packages inside the VM that you want to prepare. On Debian/Ubuntu based systems this is as simple as: -apt-get install cloud-init +apt install cloud-init Already many distributions provide ready-to-use Cloud-Init images (provided diff --git a/system-software-updates.adoc b/system-software-updates.adoc index 013e171..f0df410 100644 --- a/system-software-updates.adoc +++ b/system-software-updates.adoc @@ -8,12 +8,12 @@ Proxmox provides updates on a regular basis for all repositories. To install updates use the web-based GUI or the following CLI commands: -# apt-get update -# apt-get dist-upgrade +# apt update +# apt dist-upgrade NOTE: The APT package management system is very flexible and provides many -features, see `man apt-get`, or <> for additional information. +features, see `man apt`, or <> for additional information. TIP: Regular updates are essential to get the latest patches and security related fixes. Major system upgrades are announced in the {forum}. -- 2.20.1 ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH pve-manger 0/1] Close #1623: replace apt-get to apt
Signed-off-by: Moayad Almalat --- PVE/API2/APT.pm| 6 +++--- PVE/API2/Nodes.pm | 6 +++--- PVE/CLI/pveceph.pm | 4 ++-- bin/pveupgrade | 10 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm index 2db620aa..01688ed1 100644 --- a/PVE/API2/APT.pm +++ b/PVE/API2/APT.pm @@ -275,7 +275,7 @@ __PACKAGE__->register_method({ name => 'update_database', path => 'update', method => 'POST', -description => "This is used to resynchronize the package index files from their sources (apt-get update).", +description => "This is used to resynchronize the package index files from their sources (apt update).", permissions => { check => ['perm', '/nodes/{node}', [ 'Sys.Modify' ]], }, @@ -322,9 +322,9 @@ __PACKAGE__->register_method({ my $aptcfn = "/etc/apt/apt.conf.d/76pveproxy"; PVE::Tools::file_set_contents($aptcfn, $aptconf); - my $cmd = ['apt-get', 'update']; + my $cmd = ['apt', 'update']; - print "starting apt-get update\n" if !$param->{quiet}; + print "starting apt update\n" if !$param->{quiet}; if ($param->{quiet}) { PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => sub {}); diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm index 1b133352..75757230 100644 --- a/PVE/API2/Nodes.pm +++ b/PVE/API2/Nodes.pm @@ -884,7 +884,7 @@ __PACKAGE__->register_method ({ node => get_standard_option('pve-node'), upgrade => { type => 'boolean', - description => "Deprecated, use the 'cmd' property instead! Run 'apt-get dist-upgrade' instead of normal shell.", + description => "Deprecated, use the 'cmd' property instead! Run 'apt dist-upgrade' instead of normal shell.", optional => 1, default => 0, }, @@ -1024,7 +1024,7 @@ __PACKAGE__->register_method ({ node => get_standard_option('pve-node'), upgrade => { type => 'boolean', - description => "Deprecated, use the 'cmd' property instead! Run 'apt-get dist-upgrade' instead of normal shell.", + description => "Deprecated, use the 'cmd' property instead! Run 'apt dist-upgrade' instead of normal shell.", optional => 1, default => 0, }, @@ -1160,7 +1160,7 @@ __PACKAGE__->register_method ({ proxy => get_standard_option('spice-proxy', { optional => 1 }), upgrade => { type => 'boolean', - description => "Deprecated, use the 'cmd' property instead! Run 'apt-get dist-upgrade' instead of normal shell.", + description => "Deprecated, use the 'cmd' property instead! Run 'apt dist-upgrade' instead of normal shell.", optional => 1, default => 0, }, diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm index af14cbc0..e2c89be2 100755 --- a/PVE/CLI/pveceph.pm +++ b/PVE/CLI/pveceph.pm @@ -157,9 +157,9 @@ __PACKAGE__->register_method ({ local $ENV{DEBIAN_FRONTEND} = 'noninteractive'; print "update available package list\n"; - eval { run_command(['apt-get', '-q', 'update'], outfunc => sub {}, errfunc => sub { print STDERR "$_[0]\n" }) }; + eval { run_command(['apt', '-q', 'update'], outfunc => sub {}, errfunc => sub { print STDERR "$_[0]\n" }) }; - my @apt_install = qw(apt-get --no-install-recommends -o Dpkg::Options::=--force-confnew install --); + my @apt_install = qw(apt --no-install-recommends -o Dpkg::Options::=--force-confnew install --); my @ceph_packages = qw( ceph ceph-common diff --git a/bin/pveupgrade b/bin/pveupgrade index 0ce01824..cd20fa75 100755 --- a/bin/pveupgrade +++ b/bin/pveupgrade @@ -42,13 +42,13 @@ if (!$st || (time() - $st->mtime) > (3*24*3600)) { } else { -my $cmdstr = 'apt-get dist-upgrade'; +my $cmdstr = 'apt dist-upgrade'; -print "Starting system upgrade: apt-get dist-upgrade\n"; +print "Starting system upgrade: apt dist-upgrade\n"; my $oldlist = PVE::API2::APT->list_updates({ node => $nodename}); -system(&
[pve-devel] [docs: ] [PATCH pve-docs] add properties to execute in api-viewer
Signed-off-by: Moayad Almalat * when clicked on "execute" in api-view the page not handling. * In browser console printed this error: 'TypeError: Cannot read property 'properties' of undefined' * https://forum.proxmox.com/threads/api-browse-execute-returns-error.78257/ --- api-viewer/apidata.js | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/api-viewer/apidata.js b/api-viewer/apidata.js index a438090..048509f 100644 --- a/api-viewer/apidata.js +++ b/api-viewer/apidata.js @@ -37324,8 +37324,11 @@ var pveapi = [ "protected" : 1, "proxyto" : "node", "returns" : { - "type" : "array" -} + "items" : { + "properties" : {}, + "type" : "array" + } +}, } }, "leaf" : 1, -- 2.20.1 ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH pve-manager 1/1] close #3114: ui: snapshots: switch Edit and Remove Button & add warning logo
Signed-off-by: Moayad Almalat --- www/manager6/tree/SnapshotTree.js | 23 --- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/www/manager6/tree/SnapshotTree.js b/www/manager6/tree/SnapshotTree.js index 7b5ac3ed..1b33e729 100644 --- a/www/manager6/tree/SnapshotTree.js +++ b/www/manager6/tree/SnapshotTree.js @@ -264,10 +264,22 @@ Ext.define('PVE.guest.SnapshotTree', { }, handler: 'rollback', }, + { + xtype: 'proxmoxButton', + text: gettext('Edit'), + bind: { + text: '{buttonText}', + disabled: '{!isSnapshot}', + }, + disabled: true, + edit: true, + handler: 'editSnapshot', + }, { xtype: 'proxmoxButton', text: gettext('Remove'), disabled: true, + dangerous: true, bind: { disabled: '{!canRemove}', }, @@ -281,17 +293,6 @@ Ext.define('PVE.guest.SnapshotTree', { }, handler: 'remove', }, - { - xtype: 'proxmoxButton', - text: gettext('Edit'), - bind: { - text: '{buttonText}', - disabled: '{!isSnapshot}', - }, - disabled: true, - edit: true, - handler: 'editSnapshot', - }, { xtype: 'label', text: gettext("The current guest configuration does not support taking new snapshots"), -- 2.20.1 ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH pve-manager]: api2:/cluster return intiger format for VMID
When call /cluster/nextid over API, it returns ID as a string format like {"data":"100"}. in the API pve-viewer, the result type is an integer format. Signed-off-by: Moayad Almalat --- PVE/API2/Cluster.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PVE/API2/Cluster.pm b/PVE/API2/Cluster.pm index bf0e3b4d..ab07b491 100644 --- a/PVE/API2/Cluster.pm +++ b/PVE/API2/Cluster.pm @@ -727,7 +727,7 @@ __PACKAGE__->register_method({ } for (my $i = 100; $i < 1; $i++) { - return $i if !defined($idlist->{$i}); + return int($i) if !defined($idlist->{$i}); } die "unable to get any free VMID\n"; -- 2.20.1 ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
Re: [pve-devel] OpenZFS 2.0
This thread will inform you :) https://forum.proxmox.com/threads/openzfs-2-0.79948/ > On 12/02/2020 1:45 PM Graeme Seaton wrote: > > > Hi, > > Notice that OpenZFS 2.0 has been officially released at: > https://github.com/openzfs/zfs/releases/tag/zfs-2.0.0 > > Is integration into PVE on the roadmap? (I'm a sucker for new toys ;-) ) > > Regards, > > Graeme > > > ___ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel best regards, Moayad Almalat ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH pve-docs]: update link qemu documentation
Signed-off-by: Moayad Almalat --- qm.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qm.adoc b/qm.adoc index 333b2e6..1108908 100644 --- a/qm.adoc +++ b/qm.adoc @@ -203,7 +203,7 @@ either the *raw disk image format* or the *QEMU image format*. format does not support thin provisioning or snapshots by itself, requiring cooperation from the storage layer for these tasks. It may, however, be up to 10% faster than the *QEMU image format*. footnote:[See this benchmark for details - http://events.linuxfoundation.org/sites/events/files/slides/CloudOpen2013_Khoa_Huynh_v3.pdf] + https://web.archive.org/web/20171027194629/https://events.linuxfoundation.org/sites/events/files/slides/CloudOpen2013_Khoa_Huynh_v3.pdf] * the *VMware image format* only makes sense if you intend to import/export the disk image to other hypervisors. -- 2.20.1 ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
Re: [pve-devel] [PATCH pve-docs]: update link qemu documentation
Hi Alwin, > Hi Moayad, > > February 10, 2021 8:16 AM, "Moayad Almalat" wrote: > > > Signed-off-by: Moayad Almalat > > --- > > qm.adoc | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/qm.adoc b/qm.adoc > > index 333b2e6..1108908 100644 > > --- a/qm.adoc > > +++ b/qm.adoc > > @@ -203,7 +203,7 @@ either the *raw disk image format* or the *QEMU image > > format*. > > format does not support thin provisioning or snapshots by itself, requiring > > cooperation from the storage layer for these tasks. It may, however, be up > > to > > 10% faster than the *QEMU image format*. footnote:[See this benchmark for > > details > > - > > http://events.linuxfoundation.org/sites/events/files/slides/CloudOpen2013_Khoa_Huynh_v3.pdf] > > + > > https://web.archive.org/web/20171027194629/https://events.linuxfoundation.org/sites/events/files/sli > > es/CloudOpen2013_Khoa_Huynh_v3.pdf] > > * the *VMware image format* only makes sense if you intend to import/export > > the > > disk image to other hypervisors. > > It seems that the PDF still exists on the linuxfoundation site. > https://events.static.linuxfound.org/sites/events/files/slides/CloudOpen2013_Khoa_Huynh_v3.pdf > > -- > Cheers, > Alwin Yeah, you are right but in other subdomain thanks for hint :), I'll edit it. best regards, Moayad Almalat ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH v2 pve-docs]: update link qemu documentation non web.archive
Signed-off-by: Moayad Almalat --- qm.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qm.adoc b/qm.adoc index 333b2e6..0ff9f1f 100644 --- a/qm.adoc +++ b/qm.adoc @@ -203,7 +203,7 @@ either the *raw disk image format* or the *QEMU image format*. format does not support thin provisioning or snapshots by itself, requiring cooperation from the storage layer for these tasks. It may, however, be up to 10% faster than the *QEMU image format*. footnote:[See this benchmark for details - http://events.linuxfoundation.org/sites/events/files/slides/CloudOpen2013_Khoa_Huynh_v3.pdf] + https://events.static.linuxfound.org/sites/events/files/slides/CloudOpen2013_Khoa_Huynh_v3.pdf] * the *VMware image format* only makes sense if you intend to import/export the disk image to other hypervisors. -- 2.20.1 ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH proxmox-widget-toolkit] ui: mac-prefix-validation
Allow four-octet MAC prefixes in Web UI validation update the MAC prefix validation in the Web UI to support four-octet prefixes. Signed-off-by: Moayad Almalat --- src/Toolkit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Toolkit.js b/src/Toolkit.js index 8a0138d..42dbfaa 100644 --- a/src/Toolkit.js +++ b/src/Toolkit.js @@ -70,7 +70,7 @@ Ext.apply(Ext.form.field.VTypes, { MacAddressText: gettext('Example') + ': 01:23:45:67:89:ab', MacPrefix: function(v) { - return (/^[a-f0-9][02468ace](?::[a-f0-9]{2}){0,2}:?$/i).test(v); + return (/^[a-f0-9][02468ace](?::[a-f0-9]{2}){0,3}:?$/i).test(v); }, MacPrefixMask: /[a-fA-F0-9:]/, MacPrefixText: gettext('Example') + ': 02:8f - ' + gettext('only unicast addresses are allowed'), -- 2.39.5 ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH 0/2] Allow four-octet MAC perfixes
This patch series enables support for four-octet MAC prefixes in Web UI Changes are made in both forntend `proxmox-widget-toolkit` and backend `pve-cluster` Thank you @Shannon for your hint in my first attempt :) Signed-off-by: Moayad Almalat --- src/PVE/DataCenterConfig.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PVE/DataCenterConfig.pm b/src/PVE/DataCenterConfig.pm index abd0bbf..98e5599 100644 --- a/src/PVE/DataCenterConfig.pm +++ b/src/PVE/DataCenterConfig.pm @@ -199,7 +199,7 @@ PVE::JSONSchema::register_format('mac-prefix', \&pve_verify_mac_prefix); sub pve_verify_mac_prefix { my ($mac_prefix, $noerr) = @_; -if ($mac_prefix !~ m/^[a-f0-9][02468ace](?::[a-f0-9]{2}){0,2}:?$/i) { +if ($mac_prefix !~ m/^[a-f0-9][02468ace](?::[a-f0-9]{2}){0,2}(?::[a-f0-9]{0,2})?:?$/i) { return undef if $noerr; die "value is not a valid unicast MAC address prefix\n"; } -- 2.39.5 ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH] fix: allow four-octet MAC prefixes in Web UI validation
Signed-off-by: Moayad Almalat --- src/Toolkit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Toolkit.js b/src/Toolkit.js index 8a0138d..2006dc8 100644 --- a/src/Toolkit.js +++ b/src/Toolkit.js @@ -70,7 +70,7 @@ Ext.apply(Ext.form.field.VTypes, { MacAddressText: gettext('Example') + ': 01:23:45:67:89:ab', MacPrefix: function(v) { - return (/^[a-f0-9][02468ace](?::[a-f0-9]{2}){0,2}:?$/i).test(v); + return (/^[a-f0-9][02468ace](?::[a-f0-9]{2}){0,2}(?::[a-f0-9]{0,2})?:?$/i).test(v); }, MacPrefixMask: /[a-fA-F0-9:]/, MacPrefixText: gettext('Example') + ': 02:8f - ' + gettext('only unicast addresses are allowed'), -- 2.39.5 ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel