Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Rename cmdline UUID= to PARTUUID= 

This makes more sense and behaves more like existing software.
This commit is contained in:
Bananymous 2024-11-21 20:38:50 +02:00
parent 15c55b8c7d
commit 1de6de975a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/kernel/FS/VirtualFileSystem.cpp
View File

@ -59,14 +59,14 @@ namespace Kernel
BAN::StringView entry; BAN::StringView entry;
RootType type; RootType type;
if (root_path.size() >= 5 && root_path.substring(0, 5) == "UUID="_sv) if (root_path.starts_with("PARTUUID="_sv))
{ {
entry = root_path.substring(5); entry = root_path.substring(9);
if (entry.size() != 36) if (entry.size() != 36)
panic("Invalid UUID '{}'", entry); panic("Invalid UUID '{}'", entry);
type = RootType::PartitionUUID; type = RootType::PartitionUUID;
} }
else if (root_path.size() >= 5 && root_path.substring(0, 5) == "/dev/"_sv) else if (root_path.starts_with("/dev/"_sv))
{ {
entry = root_path.substring(5); entry = root_path.substring(5);
if (entry.empty() || entry.contains('/')) if (entry.empty() || entry.contains('/'))

2
script/install-bootloader.sh
View File

@ -110,7 +110,7 @@ if [ $BANAN_BOOTLOADER = "GRUB" ]; then
root_part_uuid=${root_part_uuid:10:36} root_part_uuid=${root_part_uuid:10:36}
cp "$BANAN_TOOLCHAIN_DIR"/grub-*.cfg "$BANAN_BUILD_DIR/" cp "$BANAN_TOOLCHAIN_DIR"/grub-*.cfg "$BANAN_BUILD_DIR/"
sed -i "s/<ROOT>/UUID=$root_part_uuid/" "$BANAN_BUILD_DIR"/grub-*.cfg sed -i "s/<ROOT>/PARTUUID=$root_part_uuid/" "$BANAN_BUILD_DIR"/grub-*.cfg
sed -i "s/<ROOT_FS>/$root_fs_uuid/" "$BANAN_BUILD_DIR"/grub-*.cfg sed -i "s/<ROOT_FS>/$root_fs_uuid/" "$BANAN_BUILD_DIR"/grub-*.cfg
if (($BANAN_UEFI_BOOT)); then if (($BANAN_UEFI_BOOT)); then