Skip to content

Commit a385da6

Browse files
committed
dracut modules: add breakpoints with more consistent names
I've already realized I missed couple of breakpoints over time inside the initramfs and cannot remember expected cmdline params for each of them. So let's try to make it more consistent. Keeping the original cmdline arguments as some people are used to them already, but introducing new ones. New introduced breakpoints: * rd.upgrade.break=leapp-initram * breaks right after getting to leapp dracut modules * orig * rd.break=upgrade * rd.upgrade.break=upgrade * rd.upgrade.break=leapp-pre-upgrade * breaks just right before running leapp in initramfs * rd.upgrade.break=leapp-post-upgrade * running just right after leapp upgrade (dnf transaction done), before the start of post-upgrade phases * orig: * rd.break=leapp-upgrade * rd.upgrade.break=leapp-upgrade * rd.upgrade.break=leapp-finish * the last breakpoint, after logs are saved, before the upcoming reboot (leaving the upgrade environment) * orig: * rd.break=leapp-logs Note: we could possibly drop old ones already, but as this is going to be one of last changes for IPU 7 -> 8, I decided to leave such a decision for future. Also, it's possible that we will need to redesign this part of the upgrade process, so that's another reason why to just add something, but do not drop anything.
1 parent 4968bec commit a385da6

File tree

2 files changed

+15
-7
lines changed
  • repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut

2 files changed

+15
-7
lines changed

repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,11 @@ do_upgrade() {
227227
getargbool 0 enforcing || echo 0 > /sys/fs/selinux/enforce
228228
fi
229229

230+
# NOTE: For debugging purposis. It's possible it will be changed in future.
231+
getarg 'rd.upgrade.break=leapp-pre-upgrade' && {
232+
emergency_shell -n upgrade "Break right before running leapp in initramfs"
233+
}
234+
230235
# and off we go...
231236
# NOTE: in case we would need to run leapp before pivot, we would need to
232237
# specify where the root is, e.g. --root=/sysroot
@@ -237,9 +242,10 @@ do_upgrade() {
237242
# NOTE: flush the cached content to disk to ensure everything is written
238243
sync
239244

240-
#FIXME: for debugging purposes; this will be removed or redefined in future
241-
getarg 'rd.upgrade.break=leapp-upgrade' 'rd.break=leapp-upgrade' && \
242-
emergency_shell -n upgrade "Break after LEAPP upgrade stop"
245+
# NOTE: For debugging purposes. It's possible it will be changed in future.
246+
getarg 'rd.upgrade.break=leapp-post-upgrade' 'rd.upgrade.break=leapp-upgrade' 'rd.break=leapp-upgrade' && {
247+
emergency_shell -n upgrade "Break right after LEAPP upgrade, before post-upgrade leapp run"
248+
}
243249

244250
if [ "$rv" -eq 0 ]; then
245251
# run leapp to proceed phases after the upgrade with Python3
@@ -370,8 +376,10 @@ result=$?
370376
##### safe the data and remount $NEWROOT as it was previously mounted #####
371377
save_journal
372378

373-
#FIXME: for debugging purposes; this will be removed or redefined in future
374-
getarg 'rd.break=leapp-logs' && emergency_shell -n upgrade "Break after LEAPP save_journal"
379+
# NOTE: For debugging purposis. It's possible it will be changed in future.
380+
getarg 'rd.break=leapp-logs' 'rd.upgrade.break=leapp-finish' && {
381+
emergency_shell -n upgrade "Break after LEAPP save_journal (upgrade initramfs end)"
382+
}
375383

376384
# NOTE: flush the cached content to disk to ensure everything is written
377385
sync

repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/90sys-upgrade/upgrade.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
1111

1212
source_conf /etc/conf.d
1313

14-
getarg 'rd.upgrade.break=upgrade' 'rd.break=upgrade' && \
15-
emergency_shell -n upgrade "Break before upgrade"
14+
getarg 'rd.upgrade.break=upgrade' 'rd.break=upgrade' 'rd.upgrade.break=leapp-initram' && \
15+
emergency_shell -n upgrade "Break right after getting to leapp dracut modules"
1616

1717
setstate() {
1818
export UPGRADE_STATE="$*"

0 commit comments

Comments
 (0)