Skip to content

Mkinitrd removal master #111

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
jreidinger merged 12 commits into from
Mar 7, 2024
Merged

Mkinitrd removal master #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
77e8cf1
Bump version to 4.6.0
jreidinger Sep 1, 2023
f7f7813
onpanic: add support for multipathed zfcp-attached SCSI disks
steffen-maier Mar 9, 2023
e9f264b
Version and changelog
steffen-maier Dec 12, 2023
68c51e2
Fix version bumping it to 4.6.5
dgdavid Dec 13, 2023
1a20b8f
Merge pull request #108 from steffen-maier/zdev
dgdavid Dec 14, 2023
ed82117
replace mkinitrd with dracut
jreidinger Mar 6, 2024
196cb64
changes
jreidinger Mar 6, 2024
f7a9860
Merge pull request #109 from yast/mkinitrd_removal_sp5
jreidinger Mar 6, 2024
69fe852
Merge remote-tracking branch 'origin/SLE-15-SP5' into mkinitrd_remova…
jreidinger Mar 6, 2024
fce6d05
Merge pull request #110 from yast/mkinitrd_removal_sp6
jreidinger Mar 6, 2024
43d8603
Merge remote-tracking branch 'origin/SLE-15-SP6' into mkinitrd_remova…
jreidinger Mar 6, 2024
fbe9a8a
Merge remote-tracking branch 'origin/master' into mkinitrd_removal_ma…
jreidinger Mar 7, 2024
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: 12 additions & 0 deletions package/yast2-s390.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Mar 6 09:00:01 UTC 2024 - Josef Reidinger <jreidinger@suse.com>

- Replace 'mkinitrd' with dracut (bsc#1220995)
- 5.0.1

-------------------------------------------------------------------
Tue Dec 12 14:35:37 UTC 2023 - Steffen Maier <maier@linux.ibm.com>

- onpanic: add support for multipathed zfcp-attached SCSI disks
(bsc#1020336, also related to bsc#1216257).

-------------------------------------------------------------------
Wed Aug 30 20:16:10 UTC 2023 - Josef Reidinger <jreidinger@suse.cz>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-s390.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-s390
Version: 5.0.0
Version: 5.0.1
Release: 0
Group: System/YaST
License: GPL-2.0-only
Expand Down
6 changes: 3 additions & 3 deletions src/lib/y2s390/dialogs/mkinitrd.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
module Y2S390
module Dialogs
class Mkinitrd < ::UI::Dialog
CMD = "/sbin/mkinitrd".freeze
CMD = ["/usr/bin/dracut", "--force"].freeze

def dialog_content
textdomain "s390"
Label(_("Running mkinitrd."))
Label(_("Running dracut."))
end

def self.run
Expand All @@ -16,7 +16,7 @@ def self.run

def run
create_dialog
Yast::Execute.on_target(CMD)
Yast::Execute.on_target(*CMD)
close_dialog
end
end
Expand Down
4 changes: 2 additions & 2 deletions src/modules/OnPanic.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def ConvertMkdumpToConf(dev_line)
Ops.get(entry, 0),
"^/dev/dasd[[:lower:]]+$"
)
is_zfcp = Builtins.regexpmatch(Ops.get(entry, 0), "^/dev/sd[[:lower:]]+$")
is_zfcp = Builtins.regexpmatch(Ops.get(entry, 0), "^/dev/(sd[[:lower:]]+|mapper/.*)$")

if is_dasd
dev = Builtins.add(dev, "DUMP_TYPE", "ccw")
Expand Down Expand Up @@ -135,7 +135,7 @@ def ConvertConfToMkdump(dev)
Ops.get(line, 2) == Ops.get(dev, "DEVICE")) ||
# check for fitting zfcp
(type == "fcp" &&
Builtins.regexpmatch(Ops.get(line, 0), "^/dev/sd[[:lower:]]+") &&
Builtins.regexpmatch(Ops.get(line, 0), "^/dev/(sd[[:lower:]]+|mapper/)") &&
Ops.get(line, 2) == Ops.get(dev, "DEVICE") &&
Ops.get(line, 3) == Ops.get(dev, "WWPN") &&
Ops.get(line, 4) == Ops.get(dev, "LUN")) # check for fitting dasd
Expand Down
2 changes: 1 addition & 1 deletion src/modules/ZFCPController.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def Write
# popup label
UI.OpenDialog(Label(_("Running mkinitrd.")))

command = "/sbin/mkinitrd"
command = "/usr/bin/dracut --force"
Builtins.y2milestone("Running command %1", command)
ret = SCR.Execute(path(".target.bash"), command)
Builtins.y2milestone("Exit code: %1", ret)
Expand Down