hurd: Use part: qualifier
PATCH 1/1 hurd: Use part: qualifier
When using userland drivers such as rumpdisk, we'd rather make ext2fs use parted-based libstore partitioning support. That can be used for kernelland drivers as well, so we can just make grub always use the part: qualifier to switch ext2fs to it.
grub_util_find_hurd_root_device then has to understand this syntax and translate it into the /dev/ entry name.
util/grub.d/10_hurd.in +3 -1
@@ -128,9 +128,11 @@ EOF else opts= fi + device=device:${GRUB_DEVICE#/dev/} + device=$(echo "$device" | sed -e 's/^device:\(.*[0-9]\+\)s\([0-9]\+\)$/part:\2:device:\1'/) sed "s/^/$submenu_indentation/" << EOF echo '$(echo "$message" | grub_quote)' - multiboot ${kernel} root=device:${GRUB_DEVICE#/dev/} $opts ${GRUB_CMDLINE_GNUMACH} + multiboot ${kernel} root=$device $opts ${GRUB_CMDLINE_GNUMACH} EOF if [ x$type != xrecovery ] ; then
grub-core/osdep/hurd/getroot.c +14 -5
@@ -109,6 +109,16 @@ grub_util_find_hurd_root_device (const cgrub_util_error (_ ("translator `%s' for path `%s' is given only options, " "cannot find device part" ), argz, path); +int part =-1 ; +if (strncmp (name,"part:" ,sizeof ("part:" ) -1 ) ==0 ) + { +char *next =strchr (name +sizeof ("part:" ) -1 ,':' ); +if (next) + { + part =atoi (name +sizeof ("part:" ) -1 ); + name = next +1 ; + } + }if (strncmp (name,"device:" ,sizeof ("device:" ) -1 ) ==0 ) {char *dev_name = name +sizeof ("device:" ) -1 ;
@@ -123,11 +133,10 @@ grub_util_find_hurd_root_device (const c } { -size_t size =sizeof ("/dev/" ) -1 +strlen (dev_name) +1 ; -char *next; - ret =malloc (size); - next =stpncpy (ret,"/dev/" , size); -stpncpy (next, dev_name, size - (next - ret)); +if (part >=0 ) + ret =xasprintf ("/dev/%ss%u" , dev_name, part); +else + ret =xasprintf ("/dev/%s" , dev_name); } }else if (!strncmp (name,"file:" ,sizeof ("file:" ) -1 ))
Quoted 9 lines · Samuel Thibault
When using userland drivers such as rumpdisk, we'd rather make ext2fs use parted-based libstore partitioning support. That can be used for kernelland drivers as well, so we can just make grub always use the part: qualifier to switch ext2fs to it.
grub_util_find_hurd_root_devicethen has to understand this syntax and translate it into the/dev/entry name.Signed-off-by Samuel Thibault <[email protected]>
Daniel
Quoted 6 lines · Daniel Kiper
Quoted 5 lines · Samuel Thibault
When using userland drivers such as rumpdisk, we'd rather make ext2fs use parted-based libstore partitioning support. That can be used for kernelland drivers as well, so we can just make grub always use the part: qualifier to switch ext2fs to it.
Quoted 6 lines
Quoted 4 lines
grub_util_find_hurd_root_devicethen has to understand this syntax and translate it into the/dev/entry name.Signed-off-by Samuel Thibault <[email protected]>Reviewed-by Daniel Kiper <[email protected]>
Sadly this patch does not apply. I suppose it conflicts with "hurd:
Support device entries with @/dev/disk: qualifier" patch which I pushed into master. If you want me to get this patch please rebase it on the latest master and post on the grub-devel again.
Daniel
Daniel Kiper, le mer. 25 mai 2022 14:56:38 +0200, a ecrit:
Quoted 10 lines · Daniel Kiper
Quoted 9 lines · Samuel Thibault
Quoted 8 lines
When using userland drivers such as rumpdisk, we'd rather make ext2fs use parted-based libstore partitioning support. That can be used for kernelland drivers as well, so we can just make grub always use the part: qualifier to switch ext2fs to it.
grub_util_find_hurd_root_devicethen has to understand this syntax and translate it into the/dev/entry name.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Samuel Thibault <[email protected]>Reviewed-by Daniel Kiper <[email protected]>Sadly this patch does not apply. I suppose it conflicts with "hurd:
Support device entries with @/dev/disk: qualifier" patch which I pushed into master.
Indeed, the "part:" patch was based on an earlier version of that patch. I have now sent an updated patch.
Samuel