← Back to branch summary

~ubuntu-branches/ubuntu/trusty/grub2/trusty-updates

« back to all changes in this revision

Viewing changes to include/grub/env.h

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-02-08 11:39:26 UTC
  • mfrom: (17.6.26 experimental)
  • mto: (17.6.27 experimental)
  • mto: This revision was merged to the branch mainline in revision 104.
  • Revision ID: james.westby@ubuntu.com-20110208113926-clfs90haboyk9zip
Tags: 1.99~rc1-2
https://launchpad.net/bugs/712029
https://launchpad.net/bugs/712029
* Merge 1.98+20100804-13 and 1.98+20100804-14, updating translations:
  - Kazakh (Baurzhan Muftakhidinov / Timur Birsh).
* mkconfig_skip_dmcrypt.patch: Refer to GRUB_PRELOAD_MODULES rather than
  suggesting people write a /etc/grub.d/01_modules script (thanks, Jordan
  Uggla).
* Handle empty dir passed to grub_find_root_device_from_mountinfo; fixes
  grub-mkrelpath on btrfs subvolumes (LP: #712029).
* Add rootflags=subvol=<name> if / is on a btrfs subvolume (LP: #712029).
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/grub/env.h
51
51
                                                     grub_env_read_hook_t read_hook,
52
52
                                                     grub_env_write_hook_t write_hook);
53
53
 
54
 
grub_err_t grub_env_context_open (int export);
 
54
grub_err_t grub_env_context_open (void);
55
55
grub_err_t grub_env_context_close (void);
56
 
grub_err_t grub_env_export (const char *name);
 
56
grub_err_t EXPORT_FUNC(grub_env_export) (const char *name);
57
57
 
58
58
void grub_env_unset_menu (void);
59
59
grub_menu_t grub_env_get_menu (void);
60
60
void grub_env_set_menu (grub_menu_t nmenu);
61
61
 
 
62
grub_err_t
 
63
grub_env_extractor_open (int source);
 
64
 
 
65
grub_err_t
 
66
grub_env_extractor_close (int source);
 
67
 
 
68
 
62
69
#endif /* ! GRUB_ENV_HEADER */