summaryrefslogtreecommitdiff
path: root/util/grub-mkconfig.in
Commit message (Collapse)AuthorAge
* Add GRUB_RECOVERY_TITLE optionColin Watson2020-03-07
| | | | | | | | | | This allows the controversial "recovery mode" text to be customised. Bug-Ubuntu: https://bugs.launchpad.net/bugs/1240360 Forwarded: no Last-Update: 2013-12-25 Patch-Name: mkconfig-recovery-title.patch
* Add configure option to bypass boot menu if possibleColin Watson2020-03-07
| | | | | | | | | | | | | | | | | | | | | | If other operating systems are installed, then automatically unhide the menu. Otherwise, if GRUB_HIDDEN_TIMEOUT is 0, then use keystatus if available to check whether Shift is pressed. If it is, show the menu, otherwise boot immediately. If keystatus is not available, then fall back to a short delay interruptible with Escape. This may or may not remain Ubuntu-specific, although it's not obviously wanted upstream. It implements a requirement of https://wiki.ubuntu.com/DesktopExperienceTeam/KarmicBootExperienceDesignSpec#Bootloader. If the previous boot failed (defined as failing to get to the end of one of the normal runlevels), then show the boot menu regardless. Author: Richard Laager <rlaager@wiktel.com> Author: Robie Basak <robie.basak@ubuntu.com> Forwarded: no Last-Update: 2015-09-04 Patch-Name: quick-boot.patch
* Read /etc/default/grub.d/*.cfg after /etc/default/grubColin Watson2020-03-07
| | | | | | | | Bug-Ubuntu: https://bugs.launchpad.net/bugs/901600 Forwarded: no Last-Update: 2014-01-28 Patch-Name: default-grub-d.patch
* Make grub.cfg world-readable if it contains no passwordsColin Watson2019-07-09
| | | | Patch-Name: grub.cfg-400.patch
* grub-mkconfig: Use -c instead of --printf for statOvidiu Panait2019-05-20
| | | | | | | | | | | | "--printf" only works with the stat variant provided by coreutils. With busybox, stat will fail with the following error: stat: unrecognized option '--printf=%T' Usage: stat [OPTIONS] FILE... Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
* templates: Update grub script template filesNicholas Vinson2018-04-23
| | | | | | | | | | | | | | | | | | | | | | | | | | Update grub-mkconfig.in and 10_linux.in to support grub-probe's new partuuid target. Update grub.texi documentation. The following table shows how GRUB_DISABLE_LINUX_UUID, GRUB_DISABLE_LINUX_PARTUUID, and initramfs detection interact: Initramfs GRUB_DISABLE_LINUX_PARTUUID GRUB_DISABLE_LINUX_UUID Linux Root detected Set Set ID Method false false false part UUID false false true part UUID false true false dev name false true true dev name true false false fs UUID true false true part UUID true true false fs UUID true true true dev name Note: GRUB_DISABLE_LINUX_PARTUUID and GRUB_DISABLE_LINUX_UUID equate to 'false' when unset or set to any value other than 'true'. GRUB_DISABLE_LINUX_PARTUUID defaults to 'true'. Signed-off-by: Nicholas Vinson <nvinson234@gmail.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
* grub-mkconfig/10_linux: Support multiple early initrd imagesMatthew S. Turnbull2018-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for multiple, shared, early initrd images. These early images will be loaded in the order declared, and all will be loaded before the initrd image. While many classes of data can be provided by early images, the immediate use case would be for distributions to provide CPU microcode to mitigate the Meltdown and Spectre vulnerabilities. There are two environment variables provided for declaring the early images. * GRUB_EARLY_INITRD_LINUX_STOCK is for the distribution declare images that are provided by the distribution or installed packages. If undeclared, this will default to a set of common microcode image names. * GRUB_EARLY_INITRD_LINUX_CUSTOM is for user created images. User images will be loaded after the stock images. These separate configurations allow the distribution and user to declare different image sets without clobbering each other. This also makes a minor update to ensure that UUID partition labels stay disabled when no initrd image is found, even if early images are present. This is a continuation of a previous patch published by Christian Hesse in 2016: http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00025.html Down stream Gentoo bug: https://bugs.gentoo.org/645088 Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Matthew S. Turnbull <sparky@bluefang-logic.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
* Failed config now returns exit code (#1252311)Robert Marshall2016-03-11
| | | | | | | Grub would notify the user if the new config was invalid, however, it did not exit properly with exit code 1. Added the proper exit code. Resolves: rhbz#1252311
* Change -v to -V for version of shell utils.Vladimir Serbinenko2016-02-12
|
* grub-mkconfig: use $pkgdatadir in scriptsAndrei Borzenkov2015-04-29
| | | | Otherwise scripts will source wrong grub-mkconfig_lib.
* Fix typo (gettext_print instead of gettext_printf)Andrey Borzenkov2014-08-14
|
* Revert grub-file usage in grub-mkconfig.Vladimir Serbinenko2013-12-24
|
* ARM64 grub-file and grub-mkconfig support.Vladimir Serbinenko2013-12-23
|
* grub-mkconfig: fix Xen platform conditionsAndrey Borzenkov2013-12-22
|
* * util/grub-mkconfig.in: Skip non-executable files.Lars Wendler2013-12-22
|
* Implement grub_file tool and use it to implement generating of configVladimir Serbinenko2013-12-17
| | | | in separate root.
* * util/grub-mkconfig.in: Add missing newline to output.Colin Watson2013-12-09
|
* Merge GRUBFS and GRUB_FS variables.Vladimir Serbinenko2013-12-07
|
* Add GRUB_TIMEOUT_STYLE_BUTTON supportColin Watson2013-11-29
| | | | Suggested by Vladimir Serbinenko.
* Revamp hidden timeout handlingColin Watson2013-11-28
| | | | | | | | | | | | | | Add a new timeout_style environment variable and a corresponding GRUB_TIMEOUT_STYLE configuration key for grub-mkconfig. This controls hidden-timeout handling more simply than the previous arrangements, and pressing any hotkeys associated with menu entries during the hidden timeout will now boot the corresponding menu entry immediately. GRUB_HIDDEN_TIMEOUT=<non-empty> + GRUB_TIMEOUT=<non-zero> now generates a warning, and if it shows the menu it will do so as if the second timeout were not present. Other combinations are translated into reasonable equivalents.
* * util/grub-mkconfig.in: Say explicit "grub configuration" ratherVladimir Serbinenko2013-11-20
| | | | than grub.cfg.
* * util/grub.d/30_os-prober.in: Add GRUB_OS_PROBER_SKIP_LIST toAxel Kellermann2013-11-19
| | | | selectively skipping systems.
* Support GRUB_DISABLE_SUBMENU config.Vladimir Serbinenko2013-11-04
| | | | Inspired by patch from Prarit Bhargava.
* * util/grub-mkconfig.in: Replace $0 with $self.Grégoire Sutre2013-10-26
| | | | | * util/grub-reboot.in: Likewise. * util/grub-set-default.in: Likewise.
* * util/grub-mkconfig.in: Fix detection of Emacs autosave files.Colin Watson2013-08-11
|
* * util/grub-mkconfig.in: Accept GRUB_TERMINAL_OUTPUT=vga_text.Colin Watson2012-12-28
| | | Fixes Savannah bug #37821.
* Apply program name transformations at build-time rather than atColin Watson2012-12-28
| | | | | | | | | | | | | | | | | | | | | | run-time. Fixes Debian bug #696465. * acinclude.m4 (grub_TRANSFORM): New macro. * configure.ac: Create output variables with transformed names for most programs. * util/bash-completion.d/grub-completion.bash.in: Use pre-transformed variables for program names. * util/grub-install.in: Likewise. * util/grub-kbdcomp.in: Likewise. * util/grub-mkconfig.in: Likewise. * util/grub-mkconfig_lib.in: Likewise. * util/grub-mknetdir.in: Likewise. * util/grub-mkrescue.in: Likewise. * util/grub-mkstandalone.in: Likewise. * util/grub-reboot.in: Likewise. * util/grub-set-default.in: Likewise. * util/powerpc/ieee1275/grub-mkrescue.in: Likewise. * tests/util/grub-shell-tester.in: Remove unused assignment. * tests/util/grub-shell.in: Likewise. * util/grub.d/00_header.in: Likewise.
* Fix --help formatting.Vladimir 'phcoder' Serbinenko2012-04-07
| | | | | | | | | | | | | | * util/grub-mkconfig_lib.in (print_option_help): New function. (grub_fmt): Likewise. * util/grub-install.in: Use print_option_help and grub_fmt. * util/grub-kbdcomp.in: Likewise. * util/grub-mkconfig.in: Likewise. * util/grub-mknetdir.in: Likewise. * util/grub-mkrescue.in: Likewise. * util/grub-mkstandalone.in: Likewise. * util/grub-reboot.in: Likewise. * util/grub-set-default.in: Likewise. * util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
* * util/grub-install.in: Unify "option requires an argument" messageVladimir 'phcoder' Serbinenko2012-03-05
| | | | | with similar messages in other files. * util/grub-mkconfig.in: Likewise.
* Use submenus in grub-mkconfig.Vladimir 'phcoder' Serbinenko2012-03-04
| | | | | | | | | | | | | | | * util/grub-mkconfig.in: Define GRUB_ACTUAL_DEFAULT. * util/grub-mkconfig_lib.in (grub_quote): New function. (gettext_printf): Use gettext and not gettext_quoted to fix several messages. * util/grub.d/10_hurd.in: Use submenus. * util/grub.d/10_kfreebsd.in: Likewise. * util/grub.d/10_linux.in: Likewise. * util/grub.d/10_netbsd.in: Likewise. * util/grub.d/20_linux_xen.in: Likewise. * util/grub.d/30_os-prober.in: Likewise. * util/grub.d/10_illumos.in: Add missing quoting. * util/grub.d/10_windows.in: Likewise.
* * grub-core/commands/gptsync.c: Fix typographic quoting.Vladimir 'phcoder' Serbinenko2012-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | * grub-core/commands/ieee1275/suspend.c: Likewise. * grub-core/commands/parttool.c: Likewise. * grub-core/commands/search_wrap.c: Likewise. * grub-core/commands/videoinfo.c: Likewise. * grub-core/gfxmenu/gui_label.c: Likewise. * grub-core/hello/hello.c: Likewise. * grub-core/kern/emu/main.c: Likewise. * grub-core/net/net.c: Likewise. * grub-core/normal/menu.c: Likewise. * grub-core/normal/menu_text.c: Likewise. * grub-core/normal/misc.c: Likewise. * util/grub-editenv.c: Likewise. * util/grub-install.in: Likewise. * util/grub-kbdcomp.in: Likewise. * util/grub-mkconfig.in: Likewise. * util/grub-mknetdir.in: Likewise. * util/grub-mkrescue.in: Likewise. * util/grub-mkstandalone.in: Likewise. * util/grub-reboot.in: Likewise. * util/grub-set-default.in: Likewise. * util/grub-setup.c: Likewise. * util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
* * grub-core/commands/i386/pc/drivemap.c: Add TRANSLATORS comments.Vladimir 'phcoder' Serbinenko2012-03-02
| | | | | | | | | | | | | | | * grub-core/commands/lsmmap.c: Likewise. * grub-core/commands/minicmd.c: Likewise. * grub-core/commands/mips/loongson/lsspd.c: Likewise. * grub-core/commands/regexp.c: Likewise. * grub-core/gdb/gdb.c: Likewise. * grub-core/term/gfxterm.c: Likewise. * util/grub-mkconfig.in: Likewise. * util/grub-mkfont.c: Likewise. * util/grub-mklayout.c: Likewise. * util/grub-mknetdir.in: Likewise. * util/grub-mkrescue.in: Likewise. * util/grub.d/30_os-prober.in: Likewise.
* * util/grub-install.in: Add missing gettext init.Vladimir 'phcoder' Serbinenko2012-03-01
| | | | | | | | | | | | | | | * util/grub-kbdcomp.in: Likewise. * util/grub-mkconfig.in: Likewise. * util/grub-mknetdir.in: Likewise. * util/grub-mkrescue.in: Likewise. * util/grub-mkstandalone.in: Likewise. * util/grub-reboot.in: Likewise. * util/grub-set-default.in: Likewise. * util/grub.d/00_header.in: Likewise. * util/grub.d/10_hurd.in: Likewise. * util/grub.d/10_windows.in: Likewise. * util/grub.d/30_os-prober.in: Likewise. * util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
* Replace PACKAGE_TARNAME with PACKAGE in pkglibdir and pkgdatadir.Vladimir 'phcoder' Serbinenko2012-02-27
|
* Don't transform PACKAGE_TARNAME following a discussion on autoconfVladimir 'phcoder' Serbinenko2012-02-26
| | | | | | | | | | | | | | | mailing list. * util/grub-install.in: Don't transform PACKAGE_TARNAME. * util/grub-kbdcomp.in: Likewise. * util/grub-mkconfig.in: Likewise. * util/grub-mkconfig_lib.in: Likewise. * util/grub-mknetdir.in: Likewise. * util/grub-mkrescue.in: Likewise. * util/grub-mkstandalone.in: Likewise. * util/grub-reboot.in: Likewise. * util/grub-set-default.in: Likewise. * util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
* Remove GRUB_PREFIX.Vladimir 'phcoder' Serbinenko2012-02-26
| | | | | | * util/grub-mkconfig.in: Remove GRUB_PREFIX. * util/grub.d/00_header.in: Compute prefix in the only place it's still used for backward compatibility.
* * grub-core/font/font.c (grub_font_load): Add support for defaultVladimir 'phcoder' Serbinenko2012-02-24
| | | | | | | | | | path for fonts ($prefix/fonts). * grub-core/kern/corecmd.c (grub_core_cmd_insmod): Unify condition for checking if string is a path. * grub-core/normal/main.c (features): Add feature_default_font_path. * util/grub-mkconfig.in: Skip mangling of GRUB_FONT into GRUB_FONT_PATH. * util/grub.d/00_header.in: Use default directory if possible. * util/grub-install.in: Install unicode.pf2.
* 2012-02-19 Samuel Thibault <samuel.thibault@ens-lyon.org>Samuel Thibault2012-02-19
| | | | | | | | * util/grub-mkconfig.in (GRUB_CMDLINE_GNUMACH): Export variable. * util/grub.d/10_hurd.in: Include GRUB_CMDLINE_GNUMACH in gnumach command line. * docs/grub.texi (Simple configuration): Document GRUB_CMDLINE_GNUMACH.
* Source grub-mkconfig_lib from the build directory at build time.Grégoire Sutre2012-02-10
|
* Improve gettext support. Stylistic fixes and error handling fixes whileVladimir 'phcoder' Serbinenko2012-02-08
| | | | on it.
* * util/grub-mkconfig.in: Use umask rather than chmod to createMark Wooding2012-02-03
| | | | grub.cfg.new to avoid insecure grub.cfg.
* * util/grub-mkstandalone.in: Fix help messages. Gettextize.Vladimir 'phcoder' Serbinenko2012-02-03
| | | | | | | | | | | | | | | | | | | | | | * util/grub-install.in: Gettextize. * util/grub-mkconfig.in: Likewise. * util/grub-mkconfig_lib.in: Replace gettext with echo -n and not echo if not available. (grub_warn): Gettextize. * util/grub-mknetdir.in: Gettextize. * util/grub-mkrescue.in: Likewise. * util/grub-mkstandalone.in: Likewise. * util/grub-reboot.in: Likewise. * util/grub-set-default.in: Likewise. * util/grub.d/00_header.in: Likewise. * util/grub.d/10_hurd.in: Likewise. * util/grub.d/10_kfreebsd.in: Likewise. * util/grub.d/10_linux.in: Likewise. * util/grub.d/10_netbsd.in: Likewise. * util/grub.d/10_windows.in: Likewise. * util/grub.d/20_linux_xen.in: Likewise. * util/grub.d/30_os-prober.in: Likewise. * po/POTFILES-shell.in: Regenerate.
* Handle newer autotools. Add some missing quotes while on it.Vladimir 'phcoder' Serbinenko2012-01-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Makefile.am (pkglib_DATA): Remove update-grub_lib. (pkglib_DATA): Move grub-mkconfig_lib from here ... (pkgdata_DATA): ... here. * Makefile.util.def (update-grub_lib): Removed. * conf/Makefile.common (pkglib_DATA): Removed. (pkglib_SCRIPTS): Likewise. (pkgdata_DATA): New variable. * tests/util/grub-shell-tester.in: Replace pkglib with pkgdata where needed. Add missing quotes. Remove unused variable while on it. * tests/util/grub-shell.in: Likewise. * util/grub-install.in: Likewise. * util/grub-mkconfig.in: Likewise. * util/grub-mknetdir.in: Likewise. * util/grub-mkrescue.in: Likewise. * util/grub-mkstandalone.in: Likewise. * util/grub.d/00_header.in: Likewise. * util/grub.d/10_hurd.in: Likewise. * util/grub.d/10_illumos.in: Likewise. * util/grub.d/10_kfreebsd.in: Likewise. * util/grub.d/10_linux.in: Likewise. * util/grub.d/10_netbsd.in: Likewise. * util/grub.d/10_windows.in: Likewise. * util/grub.d/20_linux_xen.in: Likewise. * util/grub.d/30_os-prober.in: Likewise. * util/update-grub_lib.in: Removed.
* merge mainline into hintsVladimir 'phcoder' Serbinenko2011-12-23
|\
| * LUKS and GELI support.Vladimir Serbinenko2011-07-07
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Makefile.util.def (libgrubkern.a): Add grub-core/lib/crypto.c, grub-core/disk/luks.c, grub-core/disk/geli.c, grub-core/disk/cryptodisk.c, grub-core/disk/AFSplitter.c, grub-core/lib/pbkdf2.c, grub-core/commands/extcmd.c, grub-core/lib/arg.c. (libgrubmods.a): Remove gcrypts cflags and cppflags. Remove grub-core/commands/extcmd.c, grub-core/lib/arg.c, grub-core/lib/crypto.c, grub-core/lib/libgcrypt-grub/cipher/sha512.c, grub-core/lib/libgcrypt-grub/cipher/crc.c and grub-core/lib/pbkdf2.c. (grub-bin2h): Add libgcry.a. (grub-mkimage): Likewise. (grub-mkrelpath): Likewise. (grub-script-check): Likewise. (grub-editenv): Likewise. (grub-mkpasswd-pbkdf2): Likewise. (grub-pe2elf): Likewise. (grub-fstest): Likewise. (grub-mkfont): Likewise. (grub-mkdevicemap): Likewise. (grub-probe): Likewise. (grub-ofpath): Likewise. (grub-mklayout): Likewise. (example_unit_test): Likewise. (grub-menulst2cfg): Likewise. * autogen.sh (UTIL_DEFS): Add Makefile.utilgcry.def. * grub-core/Makefile.core.def (cryptodisk): New module. (luks): Likewise. (geli): Likewise. * grub-core/disk/AFSplitter.c: New file. * grub-core/disk/cryptodisk.c: Likewise. * grub-core/disk/geli.c: Likewise. * grub-core/disk/luks.c: Likewise. * grub-core/kern/emu/getroot.c (get_dm_uuid): New function based on grub_util_is_lvm. (grub_util_get_dm_abstraction): New function. (grub_util_follow_gpart_up): Likewise. (grub_util_get_geom_abstraction): Likewise. (grub_util_get_dev_abstraction): Use new functions. (grub_util_pull_device): Pull GELI and LUKS. (grub_util_get_grub_dev): Handle LUKS and GELI. * grub-core/kern/emu/hostdisk.c (grub_util_get_fd_sectors): New function. (grub_util_biosdisk_open): Use grub_util_get_fd_sectors. (follow_geom_up): Removed. (grub_util_fd_seek): New function. (open_device): Use grub_util_fd_seek. (nread): Rename to .. (grub_util_fd_read): ... this. All users updated. * grub-core/lib/crypto.c (grub_crypto_ecb_decrypt): A better prototype. (grub_crypto_cbc_decrypt): Likewise. (grub_crypto_hmac_write): Likewise. (grub_crypto_hmac_buffer): Likewise. (grub_password_get): Extend to util. * include/grub/crypto.h (gcry_cipher_spec) [GRUB_UTIL]: New member modname. (gcry_md_spec) [GRUB_UTIL]: Likewise. * include/grub/cryptodisk.h: New file. * include/grub/disk.h (grub_disk_dev_id): Rename LUKS to CRYPTODISK. * include/grub/emu/getroot.h (grub_dev_abstraction_types): Add LUKS and GELI. (grub_util_follow_gpart_up): New proto. * include/grub/emu/hostdisk.h (grub_util_fd_seek): Likewise. (grub_util_fd_read): Likewise. (grub_cryptodisk_cheat_mount): Likewise. (grub_util_cryptodisk_print_uuid): Likewise. (grub_util_get_fd_sectors): Likewise. * util/grub-fstest.c (mount_crypt): New var. (fstest): Mount crypto if requested. (options): New option -C. (argp_parser): Parse -C. (main): Init and fini gcry. * util/grub-install.in: Support cryptodisk install. * util/grub-mkconfig.in: Export GRUB_ENABLE_CRYPTODISK. * util/grub-mkconfig_lib.in (is_path_readable_by_grub): Support cryptodisk. (prepare_grub_to_access_device): Likewise. * util/grub-mkpasswd-pbkdf2.c (main): Use grub_password_get. * util/grub-probe.c (probe_partmap): Support cryptodisk UUID probe. (probe_cryptodisk_uuid): New function. (probe_abstraction): Likewise. (probe): Use new functions. * util/import_gcry.py: Create Makefile.utilgcry.def. Add modname member. Also-By: Michael Gorven <michael@gorven.za.net> Also-By: Clemens Fruhwirth <clemens@endorphin.org>
| | * Integrate geli into autoconfiguration systemVladimir 'phcoder' Serbinenko2011-04-25
| | |
| | * support LUKS in shell librariesVladimir 'phcoder' Serbinenko2011-04-23
| | |
| * | Use @PACKAGE@ instead of hardcoded name when sourcing grub-mkconfig_lib.Grégoire Sutre2011-07-02
| | |
| * | * util/grub-mkconfig.in: Export GRUB_CMDLINE_LINUX_XEN_REPLACE andColin Watson2011-05-20
| |/ | | | | | | GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT. Reported by: Pawel Tecza.
* / Initial integration of hintsVladimir 'phcoder' Serbinenko2011-12-23
|/