From db1d9d53ade025f938809ff6456614ed831847e3 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Jan 13 2021 16:10:46 +0000 Subject: Prepare for a new update Reverting patches so we can apply the latest update and changes can be seen in the spec file and sources. --- diff --git a/contrib/Makefile b/contrib/Makefile index e873f27..0b0eeeb 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -6,12 +6,12 @@ install: all $(INSTALL) -d $(SYSTEMDDIR) $(INSTALL) -m 0644 kpatch.service $(SYSTEMDDIR) sed -i 's~PREFIX~$(PREFIX)~' $(SYSTEMDDIR)/kpatch.service -# $(INSTALL) -d $(UPSTARTDIR) -# $(INSTALL) -m 0644 kpatch.conf $(UPSTARTDIR) -# sed -i 's~PREFIX~$(PREFIX)~' $(UPSTARTDIR)/kpatch.conf + $(INSTALL) -d $(UPSTARTDIR) + $(INSTALL) -m 0644 kpatch.conf $(UPSTARTDIR) + sed -i 's~PREFIX~$(PREFIX)~' $(UPSTARTDIR)/kpatch.conf uninstall: $(RM) $(SYSTEMDDIR)/kpatch.service -# $(RM) $(UPSTARTDIR)/kpatch.conf + $(RM) $(UPSTARTDIR)/kpatch.conf clean: diff --git a/kpatch-dnf-0.2/COPYING b/kpatch-dnf-0.2/COPYING deleted file mode 100644 index d159169..0000000 --- a/kpatch-dnf-0.2/COPYING +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/kpatch-dnf-0.2/Makefile b/kpatch-dnf-0.2/Makefile deleted file mode 100644 index 77c8eb5..0000000 --- a/kpatch-dnf-0.2/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -PREFIX ?= /usr/local - -MANDIR = $(addprefix $(DESTDIR),$(PREFIX)/share/man/man8) -CONFDIR = $(addprefix $(DESTDIR),/etc/dnf/plugins) - -ifeq (, $(PYTHONSITES)) -PYTHON = $(shell command -v python3) -ifeq (, $(PYTHON)) -$(error "No python3 installation found.") -endif - -PY_MAJOR = $(basename $(lastword $(shell $(PYTHON) --version))) -PYTHON_PREFIX = $(dir $(subst /bin/,/bin,$(dir $(PYTHON)))) - -PYTHONSITES = $(addsuffix lib/python$(PY_MAJOR)/site-packages,$(PYTHON_PREFIX)) -endif - -DNFPLUGINDIR = $(addprefix $(DESTDIR),$(PYTHONSITES)/dnf-plugins) - -TARGETS = kpatch.py conf/kpatch.conf man/dnf.kpatch.8.gz - -all: $(TARGETS) - -install: $(TARGETS) - install -d $(MANDIR) - install -m 644 man/dnf.kpatch.8.gz $(MANDIR) - install -d $(CONFDIR) - install -m 644 conf/kpatch.conf $(CONFDIR) - install -d $(DNFPLUGINDIR) - install -m 644 kpatch.py $(DNFPLUGINDIR) - -%.gz: % - gzip --keep $^ diff --git a/kpatch-dnf-0.2/README.md b/kpatch-dnf-0.2/README.md deleted file mode 100644 index ac404a3..0000000 --- a/kpatch-dnf-0.2/README.md +++ /dev/null @@ -1 +0,0 @@ -# kpatch-dnf \ No newline at end of file diff --git a/kpatch-dnf-0.2/conf/kpatch.conf b/kpatch-dnf-0.2/conf/kpatch.conf deleted file mode 100644 index a4cd008..0000000 --- a/kpatch-dnf-0.2/conf/kpatch.conf +++ /dev/null @@ -1,2 +0,0 @@ -[main] -autoupdate=False diff --git a/kpatch-dnf-0.2/kpatch.py b/kpatch-dnf-0.2/kpatch.py deleted file mode 100644 index 963bc0c..0000000 --- a/kpatch-dnf-0.2/kpatch.py +++ /dev/null @@ -1,186 +0,0 @@ -# kpatch patch module packages management plugin for dnf -# -# Copyright (C) 2020 Julien Thierry -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA, -# 02110-1301, USA. - - -from __future__ import absolute_import -from __future__ import unicode_literals - -import configparser -import os.path -import re - -from dnfpluginscore import _, logger - -import dnf.callback -import dnf.cli -import dnf.exceptions -import dnf.transaction - -KPATCH_PLUGIN_NAME = "kpatch" -KPATCH_UPDATE_OPT = "autoupdate" - -KERNEL_PKG_NAME = "kernel-core" - -# Dnf offers to lookup and read the plugin config file but doesn't provide -# a way to update that file nor to get the name... -def _get_plugin_cfg_file(base_conf): - files = ['%s/%s.conf' % (path, KPATCH_PLUGIN_NAME) for path in base_conf.pluginconfpath] - for file in files: - if os.path.isfile(file): - return file - return None - - -def _kpp_name_from_kernel_pkg(kernel_pkg): - kernel_release = re.match(r"(.*)\.el.*", kernel_pkg.release).group(1) - kpp_kernel_release = kernel_release.replace(".", "_") - kpp_kernel_version = kernel_pkg.version.replace(".", "_") - return "kpatch-patch-{}-{}".format(kpp_kernel_version, kpp_kernel_release) - - -def _install_kpp_pkg(dnf_base, kernel_pkg): - kpp_pkg_name = _kpp_name_from_kernel_pkg(kernel_pkg) - kpp_pkgs_query = dnf_base.sack.query().filter(name=kpp_pkg_name, - arch=kernel_pkg.arch) - kpp_sltr = dnf.selector.Selector(dnf_base.sack) - kpp_sltr.set(pkg=kpp_pkgs_query.latest()) - dnf_base.goal.install(select=kpp_sltr, optional=not dnf_base.conf.strict) - - -class KpatchCmd(dnf.cli.Command): - - aliases = ('kpatch',) - summary = _('Toggles automatic installation of kpatch-patch packages') - - - def __init__(self, cli): - super(KpatchCmd, self).__init__(cli) - - - @staticmethod - def set_argparser(parser): - parser.add_argument('action', metavar="auto|manual") - - - def configure(self): - demands = self.cli.demands - demands.resolving = True - demands.root_user = True - demands.sack_activation = True - demands.available_repos = True - - - def _install_missing_kpp_pkgs(self): - installed_kernels = self.base.sack.query().installed().filter(name=KERNEL_PKG_NAME) - - for kernel_pkg in installed_kernels: - _install_kpp_pkg(self.base, kernel_pkg) - - - def _update_plugin_cfg(self, value): - cfg_file = _get_plugin_cfg_file(self.base.conf) - if cfg_file is None: - logger.warning("Couldn't find configuration file") - return - try: - parser = configparser.ConfigParser() - parser.read(cfg_file) - except Exception as e: - raise dnf.exceptions.Error(_("Parsing file failed: {}").format(str(e))) - - if not parser.has_section('main'): - parser.add_section('main') - parser.set('main', KPATCH_UPDATE_OPT, str(value)) - - try: - with open(cfg_file, 'w') as cfg_stream: - parser.write(cfg_stream) - except Exception as e: - raise dnf.exceptions.Error(_("Failed to update conf file: {}").format(str(e))) - - - def run(self): - action = self.opts.action - - if action == "auto": - self._install_missing_kpp_pkgs() - self._update_plugin_cfg(True) - elif action == "manual": - self._update_plugin_cfg(False) - else: - raise dnf.exceptions.Error(_("Invalid argument: {}").format(action)) - - - -class KpatchPlugin(dnf.Plugin): - - name = KPATCH_PLUGIN_NAME - - - def __init__(self, base, cli): - super(KpatchPlugin, self).__init__(base, cli) - self._commiting = False - self._autoupdate = False - if cli is not None: - cli.register_command(KpatchCmd) - - - def config(self): - parser = self.read_config(self.base.conf) - try: - self._autoupdate = (parser.has_section('main') - and parser.has_option('main', KPATCH_UPDATE_OPT) - and parser.getboolean('main', KPATCH_UPDATE_OPT)) - except Exception as e: - logger.warning(_("Parsing file failed: {}").format(str(e))) - - - def _commit_changes(self): - self._commiting = True - # Get dnf's dependency manager to resolve missing deps for added pkgs - self.base.resolve(self.cli.demands.allow_erasing) - self._commiting = False - - - def resolved(self): - # Calling self.base.resolve() will run this callback again - if not self._autoupdate or self._commiting: - return - - need_kpp_for = [] - explicit_kpp_install = [] - for tr_item in self.base.transaction: - # It might not be safe to check tr_item.pkg.name as there might be - # some dnf internal transaction items not linked to any pacakge. - # Check first whether the action is a pacakge related action - if tr_item.action in dnf.transaction.FORWARD_ACTIONS: - if tr_item.pkg.name == KERNEL_PKG_NAME: - need_kpp_for.append(tr_item.pkg) - elif tr_item.pkg.name.startswith("kpatch-patch-"): - explicit_kpp_install.append(tr_item.pkg.name) - - # If the user already requested a kpatch-patch package, don't override it - # nor conflict with it - need_kpp_for = [pkg for pkg in need_kpp_for - if _kpp_name_from_kernel_pkg(pkg) not in explicit_kpp_install] - for kernel_pkg in need_kpp_for: - _install_kpp_pkg(self.base, kernel_pkg) - - if need_kpp_for: - self._commit_changes() diff --git a/kpatch-dnf-0.2/man/dnf.kpatch.8 b/kpatch-dnf-0.2/man/dnf.kpatch.8 deleted file mode 100644 index 3c56c91..0000000 --- a/kpatch-dnf-0.2/man/dnf.kpatch.8 +++ /dev/null @@ -1,50 +0,0 @@ -.TH "DNF-KPATCH" 8 -.SH NAME -dnf\-kpatch \- kpatch patch module installation plugin - -.SH SYNOPSIS -.SY dnf -.B kpatch -.I install\-mode - -.SH DESCRIPTION -\fBdnf\-kpatch\fR is a \fBdnf\fR(8) plugin providing automated installation of -kpatch\-patch packages. When enabled, installation of new kernel packages via -\fBdnf\fR(8) will trigger installation of the latest kpatch-patch package -targeting the same kernel version. - -.SH OPTIONS -.TP -.B install\-mode -.RS -.TP 8 -.B auto -Installs missing kpatch\-patch packages for installed kernels and enables -automatic kpatch\-patch installation for future kernel installations. -.TP -.B manual -Disables automatic installation of kpatch-patch packages. -.RE - -.SH SEE ALSO -.BR dnf (8), -.BR kpatch (1) - -.SH BUGS -No known bugs. - -.SH REPORTING BUGS -To report a bug, raise an issue on -.UR https://github.com/dynup/kpatch\-dnf/issues -kpatch\-dnf project page -.UE . - -.SH AUTHOR -.UR mailto:jthierry@redhat.com -Julien Thierry -.UE - -.SH COPYRIGHT -Copyright (\[co]) 2020 Julien Thierry - -2020, Red Hat, Licensed under GPLv2+ diff --git a/kpatch/kpatch b/kpatch/kpatch index 4dc9fde..bca8f41 100755 --- a/kpatch/kpatch +++ b/kpatch/kpatch @@ -28,7 +28,6 @@ SCRIPTDIR="$(readlink -f "$(dirname "$(type -p "$0")")")" VERSION="0.9.2" POST_ENABLE_WAIT=15 # seconds POST_SIGNAL_WAIT=60 # seconds -MODULE_REF_WAIT=15 # seconds # How many times to try loading the patch if activeness safety check fails. MAX_LOAD_ATTEMPTS=5 @@ -50,8 +49,8 @@ usage () { echo >&2 usage_cmd "load --all" "load all installed patch modules into the running kernel" usage_cmd "load " "load patch module into the running kernel" - usage_cmd "unload --all (UNSUPPORTED)" "unload all patch modules from the running kernel" - usage_cmd "unload (UNSUPPORTED)" "unload patch module from the running kernel" + usage_cmd "unload --all" "unload all patch modules from the running kernel" + usage_cmd "unload " "unload patch module from the running kernel" echo >&2 usage_cmd "info " "show information about a patch module" echo >&2 @@ -72,16 +71,6 @@ die() { exit 1 } -confirm_prompt() { - local prompt="$1" - local answer - while true; do - read -rp "$prompt [Y/N] " answer - [[ $answer == 'Y' || $answer == 'y' ]] && return 0 - [[ $answer == 'N' || $answer == 'n' ]] && return 1 - done -} - __find_module () { MODULE="$1" [[ -f "$MODULE" ]] && return @@ -136,10 +125,6 @@ find_core_module() { return 1 } -kpatch_core_loaded() { - grep -q -e "T kpatch_register" /proc/kallsyms -} - core_loaded () { grep -q -e "T klp_enable_patch" -e "T kpatch_register" /proc/kallsyms } @@ -280,31 +265,6 @@ wait_for_patch_transition() { return 1 } -module_ref_count() { - local modname="$1" - [[ $(cat "/sys/module/$modname/refcnt" 2>/dev/null) != "0" ]] -} - -wait_for_zero_module_ref_count() { - local modname="$1" - local i=0 - - # We can't rely on a zero refcount with kpatch.ko as it - # implements KPATCH_FORCE_UNSAFE with an additional reference on - # kpatch-patch modules to avoid potential crashes. - kpatch_core_loaded && return 0 - - module_ref_count "$modname" || return 0 - - echo "waiting (up to $MODULE_REF_WAIT seconds) for module refcount..." - for (( i=0; i /dev/null || return 0 + rmmod "$1" 2> /dev/null || return 0 } unload_module () { @@ -453,19 +407,6 @@ unset MODULE init_sysfs_var [[ "$#" -lt 1 ]] && usage - -# RHEL-specific support options -case "$1" in -"force") - # For scripting purposes, support "kpatch force unload". - # Shift out the "force" to avoid the user-prompt check below. - shift - ;; -"unload") - confirm_prompt "WARNING: Red Hat doesn't support unloading of kpatches, continue anyway?" || exit 1 - ;; -esac - case "$1" in "load") [[ "$#" -ne 2 ]] && usage diff --git a/man/kpatch.1 b/man/kpatch.1 index 765628a..a30bdb7 100644 --- a/man/kpatch.1 +++ b/man/kpatch.1 @@ -23,10 +23,10 @@ load --all load load patch module into the running kernel -unload --all (UNSUPPORTED) +unload --all unload all patch modules from the running kernel -unload (UNSUPPORTED) +unload unload patch module from the running kernel info