1. 16 Jan, 2016 1 commit
  2. 09 Jan, 2016 1 commit
  3. 19 Jun, 2015 2 commits
  4. 04 Mar, 2015 1 commit
    • Vladimir Serbinenko's avatar
      Fix canonicalize_file_name clash. · 27d1a67f
      Vladimir Serbinenko authored
      canonicalize_file_name clashed with gnulib function. Additionally
      it was declared in 2 places: emu/misc.h and util/misc.h. Added
      grub_ prefix and removed second declaration.
      27d1a67f
  5. 28 Feb, 2015 2 commits
  6. 27 Jan, 2015 1 commit
  7. 31 Mar, 2014 2 commits
    • Colin Watson's avatar
      Fix partmap, cryptodisk, and abstraction handling in grub-mkconfig. · 24024dac
      Colin Watson authored
      Commit 588744d0 caused grub-mkconfig
      no longer to be forgiving of trailing spaces on grub-probe output
      lines, which among other things means that util/grub.d/10_linux.in
      no longer detects LVM.  To fix this, make grub-probe's output
      delimiting more consistent.  As a bonus, this improves the coverage
      of the -0 option.
      
      Fixes Debian bug #735935.
      
      * grub-core/disk/cryptodisk.c
      (grub_util_cryptodisk_get_abstraction): Add a user-data argument.
      * grub-core/disk/diskfilter.c (grub_diskfilter_get_partmap):
      Likewise.
      * include/grub/cryptodisk.h (grub_util_cryptodisk_get_abstraction):
      Update prototype.
      * include/grub/diskfilter.h (grub_diskfilter_get_partmap): Likewise.
      * util/grub-install.c (push_partmap_module, push_cryptodisk_module,
      probe_mods): Adjust for extra user-data arguments.
      * util/grub-probe.c (do_print, probe_partmap, probe_cryptodisk_uuid,
      probe_abstraction): Use configured delimiter.  Update callers.
      24024dac
    • Colin Watson's avatar
      Fix grub-probe -0 option · 9b35fe81
      Colin Watson authored
      * util/grub-probe,c (options): Make -0 work again (broken by
      conversion to argp).
      (main): Simplify logic.
      9b35fe81
  8. 24 Dec, 2013 1 commit
  9. 21 Dec, 2013 2 commits
  10. 16 Nov, 2013 1 commit
  11. 15 Oct, 2013 1 commit
  12. 14 Oct, 2013 1 commit
  13. 13 Oct, 2013 1 commit
  14. 03 Oct, 2013 1 commit
  15. 23 Sep, 2013 1 commit
  16. 22 Sep, 2013 1 commit
  17. 12 Apr, 2013 1 commit
  18. 13 Jan, 2013 1 commit
  19. 11 Sep, 2012 1 commit
  20. 05 Jun, 2012 2 commits
  21. 11 May, 2012 1 commit
  22. 26 Feb, 2012 1 commit
  23. 11 Feb, 2012 1 commit
    • Vladimir 'phcoder' Serbinenko's avatar
      * grub-core/disk/diskfilter.c (grub_diskfilter_print_partmap) · 4786a90f
      Vladimir 'phcoder' Serbinenko authored
      	[GRUB_UTIL]: New function.
      	(insert_array) [GRUB_UTIL]: Store partmaps.
      	* include/grub/diskfilter.h (grub_diskfilter_pv) [GRUB_UTIL]: New member
      	partmaps.
      	(grub_diskfilter_print_partmap) [GRUB_UTIL]: New proto.
      	* util/grub-probe.c (probe_partmap): Call grub_diskfilter_print_partmap.
      	(probe_abstraction): Print diskfilter and not raid.
      	Reported by: Lennart Sorensen
      4786a90f
  24. 10 Feb, 2012 1 commit
  25. 08 Feb, 2012 2 commits
  26. 05 Feb, 2012 1 commit
    • Vladimir 'phcoder' Serbinenko's avatar
      Clarify and unify messages. · b525fd83
      Vladimir 'phcoder' Serbinenko authored
      	* grub-core/commands/hashsum.c (options): Unify messages.
      	* grub-core/commands/keystatus.c (GRUB_MOD_INIT): Don't mark a
      	literal-only message as translatable.
      	* grub-core/commands/lsacpi.c (GRUB_MOD_INIT): Likewise.
      	* grub-core/loader/ia64/efi/linux.c (GRUB_MOD_INIT): Likewise.
      	* grub-core/commands/legacycfg.c (GRUB_MOD_INIT): Add quoting around
      	commands.
      	* grub-core/commands/menuentry.c (options): Clarify that it's a keyboard
      	key, not the key used to unlock. Clarify what it's used for.
      	* grub-core/kern/emu/hostdisk.c (read_device_map): Unify error message.
      	* grub-core/loader/xnu.c (grub_xnu_load_driver): Remove erroneous colon.
      	* grub-core/script/main.c (GRUB_MOD_INIT): Clarify [n] to be [NUM].
      	* util/grub-editenv.c (options): Unify "verbose" message.
      	* util/grub-fstest.c (read_file): Unify error message.
      	(fstest): Add quotes around commands.
      	(options): Unify "verbose" message.
      	* util/grub-install.in: Add quotes around variable name.
      	* util/grub-kbdcomp.in: Unify error message.
      	* util/grub-mkfont.c (main): Likewise.
      	* util/grub-mkrescue.in: Likewise.
      	* util/grub-mklayout.c (options): Unify "verbose" message.
      	* util/grub-mkstandalone.in: Unify help and verbose messages.
      	* util/grub-mount.c (options): Unify "verbose" message.
      	* util/grub-probe.c (options): Likewise.
      	* util/grub-script-check.c (options): Likewise.
      	* util/grub-setup.c (setup): Unify no-terminator message.
      	(options): Use DEVICE and not DEV.
      	Unify "verbose" message.
      	* util/ieee1275/ofpath.c (xrealpath): Unify error message.
      b525fd83
  27. 03 Feb, 2012 5 commits
    • Vladimir 'phcoder' Serbinenko's avatar
      * Makefile.util.def (grub-mkdevicemap): Removed. · 8be63f2e
      Vladimir 'phcoder' Serbinenko authored
      	* include/grub/emu/hostdisk.h (grub_util_get_os_disk): New proto.
      	* include/grub/util/deviceiter.h: Removed.
      	* util/deviceiter.c: Likewise.
      	* util/getroot.c (grub_util_get_os_disk): New function.
      	* util/grub-install.in: Remove grub-mkdevicemap. Use -t disk as
      	replacement for EFI.
      	* util/grub-mkdevicemap.c: Removed.
      	* util/grub-probe.c (probe): Handle PRINT_DISK.
      	(argp_parser): Handle -t disk.
      8be63f2e
    • Vladimir 'phcoder' Serbinenko's avatar
      * util/grub-mkfont.c: Migrate to argp. · 8e1e4e39
      Vladimir 'phcoder' Serbinenko authored
      	* util/grub-mklayout.c: Likewise.
      	* util/grub-mkpasswd-pbkdf2.c: Likewise.
      	* util/grub-mkrelpath.c: Likewise.
      	* util/grub-probe.c: Likewise.
      	* util/grub-script-check.c: Likewise.
      8e1e4e39
    • Richard Laager's avatar
      * util/grub-mkimage.c (main): Fix format-security warning. · 69edd81a
      Richard Laager authored
      	* util/grub-mkrelpath.c (main): Likewise.
      	* util/grub-probe.c (main): Likewise.
      69edd81a
    • Richard Laager's avatar
      * util/grub-probe.c (probe): Don't crash on canonicalize_file_name · 65f08dbf
      Richard Laager authored
      	failure.
      	Put back lost PRINT_DRIVE.
      65f08dbf
    • Vladimir 'phcoder' Serbinenko's avatar
      Support install on multi-device filesystems. · cf5f7ee7
      Vladimir 'phcoder' Serbinenko authored
      	* include/grub/emu/getroot.h (grub_guess_root_device): Renamed to ...
      	(grub_guess_root_devices): ...this. Return char **. All users updated.
      	* include/grub/emu/misc.h (grub_find_root_device_from_mountinfo):
      	Removed.
      	* util/getroot.c (find_root_device_from_libzfs): Moved pool logic to ...
      	(find_root_devices_from_poolname): ... here.
      	(grub_find_root_devices_from_mountinfo): Return char **. Make static.
      	Support zfs-fuse.
      	(grub_guess_root_device): Rename to ...
      	(grub_guess_root_devices): ... this. Return char **. All users updated.
      	* util/grub-install.in: Handle multi-device filesystems.
      	* util/grub-probe.c (probe). Make device_names a char **. Add delim
      	argument. All users updated.
      	Handle multi-device filesystems.
      	Use 'delim' as separator.
      	Remove device check to allow filesystems on file.
      	(main): Support -0 argument. Handle multi-device.
      	* util/grub-setup.c (setup): Remove root argument. Handle multi-device.
      	Fix a cross-device check while on it.
      	(arguments): Remove root_dev.
      	(argp_parser): Remove -r.
      	(main): Remove root_dev.
      cf5f7ee7
  28. 29 Jan, 2012 2 commits
    • Vladimir 'phcoder' Serbinenko's avatar
      * util/getroot.c (grub_util_get_dm_node_linear_info): Fix memory leak. · 63fe43f3
      Vladimir 'phcoder' Serbinenko authored
      	* grub-core/disk/cryptodisk.c (cryptodisk_cleanup): Disable for
      	now to avoid double free.
      	* grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_dev): Rename to
      	hostdisk.
      	* include/grub/disk.h (grub_disk_dev_id): New id HOSTDISK.
      	* util/grub-probe.c (escape_of_path): Always return a new copy.
      	(print_full_name): Escape path.
      	(probe): Don't call grub_util_devname_to_ofpath on NULL.
      	Fix hints on abstractions.
      63fe43f3
    • Vladimir 'phcoder' Serbinenko's avatar
      Merge common RAID and LVM logic to an abstract diskfilter. · 076e7c0f
      Vladimir 'phcoder' Serbinenko authored
      	Add LDM support using the same framework.
      
      	* Makefile.util.def (libgrubkern): Add grub-core/disk/ldm.c,
      	grub-core/disk/diskfilter.c and grub-core/partmap/gpt.c.
      	(libgrubmods): Remove grub-core/disk/raid.c and
      	grub-core/partmap/gpt.c.
      	* grub-core/Makefile.core.def (ldm): New module.
      	(raid): Renamed to diskfilter. All users updated.
      	* grub-core/disk/raid.c: Moved to ...
      	* grub-core/disk/diskfilter.c: ... here.
      	* grub-core/disk/diskfilter.c: Rename grub_raid_ to grub_diskfilter_.
      	(lv_num): New var.
      	(find_array): Renamed to ...
      	(find_lv): ... this. Support multi-LV. Skip nameless LVs
      	(grub_is_array_readable): Renamed to ...
      	(grub_is_lv_readable): ... this. Support multinode hierarchy.
      	(insert_array): New argument id.
      	(is_node_readable): New function.
      	(scan_device): Rename to ...
      	(scan_disk): .. this. Restrict to one disk.
      	(scan_devices): New function.
      	(grub_diskfilter_iterate): Support multi-LV.
      	Skip invisible and nameless LVs.
      	(grub_diskfilter_memberlist): Support multi-LV.
      	(grub_diskfilter_read_node): New function.
      	(grub_raid_read): Most of logic moved to ...
      	(read_segment): ... here
      	(read_lv): New function.
      	(grub_diskfilter_get_vg_by_uuid): New function.
      	(grub_diskfilter_make_raid): Likewise.
      	* grub-core/disk/ldm.c: New file.
      	* grub-core/disk/lvm.c (vg_list): Removed.
      	(lv_count): Likewise.
      	(scan_depth): Likewise.
      	(is_lv_readable): Likewise.
      	(grub_lvm_getvalue): Advance pointer past the number.
      	(find_lv): Removed.
      	(do_lvm_scan): Refactored into ...
      	(grub_lvm_detect): ... this. Support raid.
      	(grub_lvm_iterate): Removed.
      	(grub_lvm_memberlist): Likewise.
      	(grub_lvm_open): Likewise.
      	(grub_lvm_close): Likewise.
      	(read_lv): Likewise.
      	(read_node): Likewise.
      	(is_node_readable): Likewise.
      	(is_lv_readable): Likewise.
      	(grub_lvm_read): Likewise.
      	(grub_lvm_write): Likewise.
      	(grub_lvm_dev): Use diskfilter
      	(GRUB_MOD_INIT): Likewise.
      	(GRUB_MOD_FINI): Likewise.
      	* grub-core/disk/dmraid_nvidia.c (grub_dmraid_nv_detect): Use
      	new interface.
      	* grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): Likewise.
      	* grub-core/disk/mdraid_linux.c (grub_mdraid_detect): Likewise.
      	* grub-core/disk/raid5_recover.c (grub_raid5_recover): Use
      	grub_diskfilter_read_node.
      	Fix a bug with xor.
      	* grub-core/disk/raid6_recover.c (grub_raid6_recover): Use
      	grub_diskfilter_read_node.
      	Support GRUB_RAID_LAYOUT_MUL_FROM_POS.
      	* grub-core/kern/disk.c (grub_disk_dev_list): Make global.
      	(grub_disk_dev_iterate): Move from here...
      	* include/grub/disk.h (grub_disk_dev_iterate): ... to here. Inlined.
      	* grub-core/kern/emu/hostdisk.c (grub_hostdisk_find_partition_start):
      	Make global.
      	(grub_hostdisk_find_partition_start): Likewise.
      	(grub_hostdisk_os_dev_to_grub_drive): New function.
      	(grub_util_biosdisk_get_osdev): Check that disk is biosdisk.
      	* grub-core/kern/emu/hostdisk.c (make_device_name): Move to ...
      	* util/getroot.c (make_device_name): ... here.
      	* grub-core/kern/emu/hostdisk.c (grub_util_get_dm_node_linear_info):
      	Move to ...
      	* util/getroot.c (grub_util_get_dm_node_linear_info): ...here.
      	* grub-core/kern/emu/hostdisk.c
      	(convert_system_partition_to_system_disk): Move to ...
      	* util/getroot.c (convert_system_partition_to_system_disk): ...here.
      	* grub-core/kern/emu/hostdisk.c (device_is_wholedisk): Move to ...
      	* util/getroot.c (device_is_wholedisk): ... here.
      	* grub-core/kern/emu/hostdisk.c (find_system_device): Move to ...
      	* util/getroot.c (find_system_device): ... here.
      	* grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_is_present):
      	Move to ...
      	* util/getroot.c (grub_util_biosdisk_is_present): ...here.
      	* grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_get_grub_dev):
      	Move to ...
      	* util/getroot.c (grub_util_biosdisk_get_grub_dev): ... here.
      	Handle LDM.
      	* grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_is_floppy):
      	Move to ...
      	* util/getroot.c (grub_util_biosdisk_is_floppy): ... here.
      	* grub-core/partmap/gpt.c (grub_gpt_partition_map_iterate): Made global.
      	* include/grub/disk.h (grub_disk_dev_id): Replaced RAID and LVM with
      	DISKFILTER.
      	* include/grub/raid.h: Renamed to ...
      	* include/grub/diskfilter.h: ... this.
      	* include/grub/diskfilter.h: Rename grub_raid_* to grub_diskfilter_*
      	(GRUB_RAID_LAYOUT_*): Make into array.
      	(GRUB_RAID_LAYOUT_MUL_FROM_POS): New value.
      	(grub_diskfilter_vg): New struct.
      	(grub_diskfilter_pv_id): Likewise.
      	(grub_raid_member): Removed.
      	(grub_raid_array): Likewise.
      	(grub_diskfilter_pv): New struct.
      	(grub_diskfilter_lv): Likewise.
      	(grub_diskfilter_segment): Likewise.
      	(grub_diskfilter_node): Likewise.
      	(grub_diskfilter_get_vg_by_uuid): New proto.
      	(grub_raid_register): Inline.
      	(grub_diskfilter_unregister): Likewise.
      	(grub_diskfilter_make_raid): New proto.
      	(grub_diskfilter_vg_register): Likewise.
      	(grub_diskfilter_read_node): Likewise.
      	(grub_diskfilter_get_pv_from_disk) [GRUB_UTIL]: Likewise.
      	* include/grub/emu/hostdisk.h (grub_util_get_ldm): New proto.
      	(grub_util_is_ldm): Likewise.
      	(grub_util_ldm_embed) [GRUB_UTIL]: Likewise.
      	(grub_hostdisk_find_partition_start): Likewise.
      	(grub_hostdisk_os_dev_to_grub_drive): Likewise.
      	* include/grub/gpt_partition.h (GRUB_GPT_PARTITION_TYPE_LDM):
      	New definition.
      	(grub_gpt_partition_map_iterate): New proto.
      	* include/grub/lvm.h (grub_lvm_vg): Removed.
      	(grub_lvm_pv): Likewise.
      	(grub_lvm_lv): Likewise.
      	(grub_lvm_segment): Likewise.
      	(grub_lvm_node): Likewise.
      	* util/getroot.c [...]
      	* util/grub-probe.c (probe_raid_level): Handle diskfilter.
      	(probe_abstraction): Likewise.
      	* util/grub-setup.c (setup): Remove must_embed. Support LDM.
      	(main): Remove dead logic.
      076e7c0f
  29. 23 Jan, 2012 1 commit