From ee314fb4499a231c988f42315dfd877652671454 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 2 Feb 2024 16:48:27 +0100 Subject: [PATCH] templates: drop deprecated nodmraid boot option and update grml-cheatcodes.txt See git rev 922087b19d and grml-autoconfig v0.22.0, we dropped dmraid support. --- templates/GRML/grml-cheatcodes.txt | 6 +++--- templates/boot/grub/%SHORT_NAME%_options.cfg | 2 +- templates/boot/isolinux/grml.cfg | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt index d289049..3dd33bf 100644 --- a/templates/GRML/grml-cheatcodes.txt +++ b/templates/GRML/grml-cheatcodes.txt @@ -209,9 +209,9 @@ Hardware related settings: grml swap Activate present/detected swap partitions grml noswraid Disable scanning for software raid arrays (creates /etc/mdadm/mdadm.conf) grml swraid Enable automatic assembling of software raid arrays -grml nodmraid Do not enable present dmraid devices. -grml dmraid=on Automatically enable any present dmraid devices. -grml dmraid=off Actively try to stop any present dmraid devices. +grml nodmraid Do not enable present dmraid devices (deprecated as of releases in 2024) +grml dmraid=on Automatically enable any present dmraid devices (deprecated as of releases in 2024) +grml dmraid=off Actively try to stop any present dmraid devices (deprecated as of releases in 2024) grml nolvm Disable scanning for Logical Volumes (LVM) grml lvm Automatically activate Logival Volumes (LVM) during boot grml read-only Make sure all harddisk devices (/dev/hd* /dev/sd*) are forced to read-only mode diff --git a/templates/boot/grub/%SHORT_NAME%_options.cfg b/templates/boot/grub/%SHORT_NAME%_options.cfg index 3e9a1a3..0168459 100644 --- a/templates/boot/grub/%SHORT_NAME%_options.cfg +++ b/templates/boot/grub/%SHORT_NAME%_options.cfg @@ -34,7 +34,7 @@ menuentry "Load whole medium to RAM" { menuentry "Forensic Mode" { set gfxpayload=keep echo 'Loading kernel...' - linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} read-only nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect + linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} read-only nofstab noraid nolvm noautoconfig noswap raid=noautodetect echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg index 3dc1347..b940f01 100644 --- a/templates/boot/isolinux/grml.cfg +++ b/templates/boot/isolinux/grml.cfg @@ -62,7 +62,7 @@ label grmlmedium2ram label forensic menu label F^orensic Mode kernel /boot/%SHORT_NAME%/vmlinuz - append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off nomce net.ifnames=0 vga=791 nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect read-only + append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off nomce net.ifnames=0 vga=791 nofstab noraid nolvm noautoconfig noswap raid=noautodetect read-only text help Boot Grml in forensic mode. This -- 2.1.4