Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove deprecated method boot option #5886

Merged
merged 1 commit into from
Sep 19, 2024
Merged

Remove deprecated method boot option #5886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions docs/boot-options.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,13 +822,6 @@ Deprecated Options
These options should still be accepted by the installer, but they are
deprecated and may be removed soon.

.. method:

method
^^^^^^

This is an alias for `inst.repo`_.

.. dns:

dns
Expand Down Expand Up @@ -902,6 +895,11 @@ blacklist, nofirewire

You can add the firewire module to a denylist with ``modprobe.blacklist=firewire_ohci``.

method:
^^^^^^

Use `inst.repo`_ instead.

serial
^^^^^^

Expand Down
2 changes: 1 addition & 1 deletion dracut/parse-anaconda-options.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ check_removed_arg askmethod "Use an appropriate 'inst.repo=' argument instead."
check_removed_arg asknetwork "Use an appropriate 'ip=' argument instead."

# repo
check_depr_arg "method=" "repo=%s"
check_removed_arg "inst.method" "Use an appropriate 'inst.repo=' argument instead."

# mpath
check_removed_arg "inst.nompath"
Expand Down
3 changes: 0 additions & 3 deletions pyanaconda/argument_parsing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,9 +460,6 @@ def __call__(self, parser, namespace, values, _option_string=None):
help="This option is deprecated.")
ap.add_argument("--multilib", dest="multiLib", action="store_true", default=False,
help=help_parser.help_text("multilib"))

ap.add_argument("-m", "--method", dest="method", default=None, metavar="METHOD",
help=help_parser.help_text("method"))
ap.add_argument("--repo", dest="method", default=None, metavar="REPO_URL",
help=help_parser.help_text("repo"))
ap.add_argument("--stage2", dest="stage2", default=None, metavar="STAGE2_URL",
Expand Down
8 changes: 4 additions & 4 deletions pyanaconda/payload/dnf/payload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ def set_from_opts(self, opts):
def _set_default_source(self, opts):
"""Set the default source.

Set the source based on opts.method if it isn't already set
- opts.method is currently set by command line/boot options.
Set the source based on opts.repo if it isn't already set
- opts.repo is currently set by command line/boot options.

Otherwise, use the source provided at a specific mount point
by Dracut if there is any.
Expand All @@ -89,9 +89,9 @@ def _set_default_source(self, opts):
if self.proxy.Sources:
log.debug("The DNF source is already set.")

elif opts.method:
elif opts.repo:
log.debug("Use the DNF source from opts.")
source_proxy = self._create_source_from_url(opts.method)
Comment on lines -92 to -94
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I wonder about this. We should run payload kickstart tests to test different payloads are correctly created.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also found it weird.

source_proxy = self._create_source_from_url(opts.repo)
set_source(self.proxy, source_proxy)

elif verify_valid_repository(DRACUT_REPO_DIR):
Expand Down