manuel
/
gentoo-install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed missing uuid resolve in dracut cmdline generation

This commit is contained in:
oddlama 2020-04-25 20:17:24 +02:00
parent cd078400b8
commit 2c7c804105
No known key found for this signature in database
GPG Key ID: 88EA325D51D53908
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/internal_config.sh
View File

@ -158,8 +158,9 @@ create_raid() {
verify_existing_unique_ids ids verify_existing_unique_ids ids
local new_id="${arguments[new_id]}" local new_id="${arguments[new_id]}"
create_resolve_entry "$new_id" mdadm "${DISK_ID_TO_UUID[$new_id]}" local uuid="${DISK_ID_TO_UUID[$new_id]}"
DISK_DRACUT_CMDLINE+=("rd.md.uuid=$(uuid_to_mduuid "$new_id")") create_resolve_entry "$new_id" mdadm "$uuid"
DISK_DRACUT_CMDLINE+=("rd.md.uuid=$(uuid_to_mduuid "$uuid")")
DISK_ACTIONS+=("action=create_raid" "$@" ";") DISK_ACTIONS+=("action=create_raid" "$@" ";")
} }
@ -179,8 +180,9 @@ create_luks() {
local id="${arguments[id]}" local id="${arguments[id]}"
local new_id="${arguments[new_id]}" local new_id="${arguments[new_id]}"
local name="${arguments[name]}" local name="${arguments[name]}"
local uuid="${DISK_ID_TO_UUID[$new_id]}"
create_resolve_entry "$new_id" luks "$name" create_resolve_entry "$new_id" luks "$name"
DISK_DRACUT_CMDLINE+=("rd.luks.uuid=$id") DISK_DRACUT_CMDLINE+=("rd.luks.uuid=$uuid")
DISK_ACTIONS+=("action=create_luks" "$@" ";") DISK_ACTIONS+=("action=create_luks" "$@" ";")
} }

2
scripts/main.sh
View File

@ -198,7 +198,7 @@ install_kernel_bios() {
try syslinux --directory syslinux --install "$biosdev" try syslinux --directory syslinux --install "$biosdev"
# Create syslinux.cfg # Create syslinux.cfg
echo -n "$(generate_syslinux_cfg)" > /boot/bios/syslinux/syslinux.cfg \ echo "$(generate_syslinux_cfg)" > /boot/bios/syslinux/syslinux.cfg \
|| die "Could save generated syslinux.cfg" || die "Could save generated syslinux.cfg"
# Install syslinux MBR record # Install syslinux MBR record