Skip to content

Simple Rescue System #2403

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
kobliha merged 5 commits into from
May 26, 2025
Merged

Simple Rescue System #2403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76042d0
Simple Rescue System
kobliha May 26, 2025
5d5acb6
Changes file entry
kobliha May 26, 2025
5bd1fb5
Moving RESCUE_SYSTEM_BOOT_SETTINGS to the correct place
kobliha May 26, 2025
e2718eb
Fixed the rescue system settings
lslezak May 26, 2025
27f8704
Enable the live password service also in the rescue target
lslezak May 26, 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
7 changes: 7 additions & 0 deletions live/config-cdroot/fix_bootconfig.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,13 @@ menuentry "Check Installation Medium" --class os --unrestricted {
echo Loading initrd...
initrd (\$root)/boot/aarch64/loader/initrd
}
menuentry "Rescue System" --class os --unrestricted {
set gfxpayload=keep
echo Loading kernel...
linux (\$root)/boot/aarch64/loader/linux \${extra_cmdline} \${isoboot} $RESCUE_SYSTEM_BOOT_SETTINGS
echo Loading initrd...
initrd (\$root)/boot/aarch64/loader/initrd
}
menuentry "Boot from Hard Disk" --class opensuse --class gnu-linux --class gnu --class os {
exit
}
Expand Down
7 changes: 7 additions & 0 deletions live/config-cdroot/fix_bootconfig.ppc64le
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,13 @@ menuentry "Check Installation Medium" --class os --unrestricted {
initrd /boot/ppc64le/initrd
}

menuentry "Rescue System" --class os --unrestricted {
echo 'Loading kernel...'
linux /boot/ppc64le/linux $RESCUE_SYSTEM_BOOT_SETTINGS
echo 'Loading initrd...'
initrd /boot/ppc64le/initrd
}

menuentry 'local' {
exit
}
Expand Down
7 changes: 7 additions & 0 deletions live/config-cdroot/fix_bootconfig.x86_64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,13 @@ menuentry "Check Installation Medium" --class os --unrestricted {
echo Loading initrd...
initrd (\$root)/boot/x86_64/loader/initrd
}
menuentry "Rescue System" --class os --unrestricted {
set gfxpayload=keep
echo Loading kernel...
linux (\$root)/boot/x86_64/loader/linux \${extra_cmdline} \${isoboot} $RESCUE_SYSTEM_BOOT_SETTINGS
echo Loading initrd...
initrd (\$root)/boot/x86_64/loader/initrd
}
menuentry "Boot from Hard Disk" --class opensuse --class gnu-linux --class gnu --class os {
if search --no-floppy --file /efi/boot/fallback.efi --set ; then
for os in opensuse sles leap suse; do
Expand Down
1 change: 1 addition & 0 deletions live/live-root/etc/systemd/system/live-password.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ TimeoutStartSec=infinity

[Install]
WantedBy=multi-user.target
WantedBy=rescue.target
6 changes: 6 additions & 0 deletions live/src/agama-installer.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon May 26 14:22:03 UTC 2025 - Lukas Ocilka <locilka@suse.com>

- Added a simple Rescue System by reusing the Installation Live
Image and disabling the Agama services

-------------------------------------------------------------------
Wed May 21 12:42:34 UTC 2025 - Knut Anderssen <kanderssen@suse.com>

Expand Down
10 changes: 10 additions & 0 deletions live/src/fix_bootconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@ profile=$(echo "$kiwi_profiles" | tr "_" "-")
# keep in sync with ISO Volume ID set in the config.sh script
volid="Install-\$profile-$arch"

# the simple rescue system reuses the installation live media
# but boots to the text-mode only and disables the Agama server
export RESCUE_SYSTEM_BOOT_SETTINGS="systemd.unit=multi-user.target \
systemd.mask=agama.service systemd.mask=agama-dbus-monitor.service \
systemd.mask=agama-ssh-issue.service systemd.mask=agama-avahi-issue.service \
systemd.mask=agama-welcome-issue.service systemd.mask=agama-url-issue.service \
systemd.mask=agama-certificate-issue.service \
systemd.mask=agama-certificate-issue.path \
systemd.mask=agama-certificate-wait.service"

[ -x $bootfix ] && $bootfix $dst
rm -f $dst/fix_bootconfig.* $dst/.profile

Expand Down