Skip to content

Activate multipath in case of forced by the user and fix environment file typo #1875

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

Merged
teclator merged 4 commits into from
Jan 9, 2025
Merged

Activate multipath in case of forced by the user and fix environment file typo #1875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cad2827
Check if multipath is forced
teclator Jan 9, 2025
6ac4b4a
Fix variable typo in agama service
teclator Jan 9, 2025
8842802
Fix sh editorconfig
teclator Jan 9, 2025
bd44ee7
Added changelog
teclator Jan 9, 2025
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
2 changes: 1 addition & 1 deletion .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
root = true

# 2 space indentation
[{*.sh}]
[*.sh]
indent_style = space
indent_size = 2
2 changes: 1 addition & 1 deletion rust/share/agama-web-server.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ After=network-online.target agama.service agama-hostname.service
BindsTo=agama.service

[Service]
EnvironmentFile=-"/etc/agama.d/cmdline.conf"
EnvironmentFile=-/etc/agama.d/cmdline.conf
Environment="AGAMA_LOG=debug,zbus=info"
Type=notify
ExecStart=/usr/bin/agama-web-server serve --address :::80 --address2 :::443
Expand Down
2 changes: 2 additions & 0 deletions service/lib/agama/storage/callbacks/activate_multipath.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
# find current contact information at www.suse.com.

require "agama/question"
require "y2storage"

module Agama
module Storage
Expand All @@ -42,6 +43,7 @@ def initialize(questions_client, logger)
# @param looks_like_real_multipath [Boolean] see {Callbacks::Activate#multipath}.
# @return [Boolean]
def call(looks_like_real_multipath)
return true if Y2Storage::StorageEnv.instance.forced_multipath?
return false unless looks_like_real_multipath

questions_client.ask(question) do |question_client|
Expand Down
6 changes: 6 additions & 0 deletions service/package/rubygem-agama-yast.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 9 12:21:40 UTC 2025 - Knut Anderssen <kanderssen@suse.com>

- Activate multipath in case it is forced by the user
(gh#agama-project/agama#1875).

-------------------------------------------------------------------
Wed Jan 8 14:05:53 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion service/share/agama.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ After=network-online.target
[Service]
Type=forking
ExecStart=/usr/bin/agamactl --daemon
EnviromentFile=-/etc/agama.d/cmdline.conf
EnvironmentFile=-/etc/agama.d/cmdline.conf
PIDFile=/run/agama/bus.pid
User=root
TimeoutStopSec=5
Expand Down