1. 16 Mar, 2018 3 commits
    • Colin Watson's avatar
      Add GRUB_RECOVERY_TITLE option · 0adc9d7d
      Colin Watson authored
      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
      0adc9d7d
    • Colin Watson's avatar
      Add configure option to bypass boot menu if possible · 82480176
      Colin Watson authored
      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
      82480176
    • Colin Watson's avatar
      Restore grub-mkdevicemap · de91fba7
      Colin Watson authored
      This is kind of a mess, requiring lots of OS-specific code to iterate
      over all possible devices.  However, we use it in a number of scripts to
      discover devices and reimplementing those in terms of something else
      would be very complicated.
      
      Author: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
      Forwarded: no
      Last-Update: 2018-03-16
      
      Patch-Name: restore_mkdevicemap.patch
      de91fba7
  2. 16 Feb, 2018 3 commits
    • Colin Watson's avatar
      Add GRUB_RECOVERY_TITLE option · 1d867aa1
      Colin Watson authored
      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
      1d867aa1
    • Colin Watson's avatar
      Add configure option to bypass boot menu if possible · 1c8b307a
      Colin Watson authored
      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
      1c8b307a
    • Colin Watson's avatar
      Restore grub-mkdevicemap · 8aeda5b8
      Colin Watson authored
      This is kind of a mess, requiring lots of OS-specific code to iterate
      over all possible devices.  However, we use it in a number of scripts to
      discover devices and reimplementing those in terms of something else
      would be very complicated.
      
      Author: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
      Forwarded: no
      Last-Update: 2016-09-18
      
      Patch-Name: restore_mkdevicemap.patch
      8aeda5b8
  3. 23 Jun, 2017 3 commits
    • Colin Watson's avatar
      Add GRUB_RECOVERY_TITLE option · 9bbef038
      Colin Watson authored
      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
      9bbef038
    • Colin Watson's avatar
      Add configure option to bypass boot menu if possible · 894139cf
      Colin Watson authored
      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
      894139cf
    • Colin Watson's avatar
      Restore grub-mkdevicemap · 7611a560
      Colin Watson authored
      This is kind of a mess, requiring lots of OS-specific code to iterate
      over all possible devices.  However, we use it in a number of scripts to
      discover devices and reimplementing those in terms of something else
      would be very complicated.
      
      Author: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
      Forwarded: no
      Last-Update: 2016-09-18
      
      Patch-Name: restore_mkdevicemap.patch
      7611a560
  4. 03 Feb, 2017 1 commit
    • Daniel Kahn Gillmor's avatar
      documentation: Clarify documentation for special environment variable "default". · bf94ef7f
      Daniel Kahn Gillmor authored
      The current documentation for the special environment variable
      "default" is confusing and unclear.  This patch attempts to clean it
      up.
      
      In particular, the current documentation refers to the "number or
      title", but then in the example it gives, the menu entries and
      submenus all have numbers *in* their title; furthermore, there is no
      example given about how to choose the number, or any indication about
      whether counting is zero-indexed or 1-indexed.
      
      Having a cleaner example and presenting all variants (numeric, title,
      and id) should make it clearer to the user.
      Signed-off-by: Daniel Kahn Gillmor's avatarDaniel Kahn Gillmor <dkg@fifthhorseman.net>
      bf94ef7f
  5. 22 Nov, 2016 1 commit
    • Andrei Borzenkov's avatar
      bootp: export next server IP as environment variable · f8c3af3b
      Andrei Borzenkov authored
      Network boot autoconfiguration sets default server to next server IP
      (siaddr) from BOOTP/DHCP reply, but manual configuration using net_bootp
      exports only server name. Unfortunately semantic of server name is not
      clearly defined. BOOTP RFC 951 defines it only for client request, and
      DHCP RFC 1541 only mentions it, without any implied usage. It looks like
      this field is mostly empty in server replies.
      
      Export next server IP as net_<interface>_next_server variable. This allows
      grub configuration script to set $root/$prefix based on information obtained
      by net_bootp.
      
      Reported and tested by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
      Cc: nikunj@linux.vnet.ibm.com
      
      v2: change variable name to net_<interface>_next_server as discussed on the list
      f8c3af3b
  6. 01 Nov, 2016 2 commits
    • Colin Watson's avatar
      Add GRUB_RECOVERY_TITLE option · 206fab1d
      Colin Watson authored
      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
      206fab1d
    • Colin Watson's avatar
      Add configure option to bypass boot menu if possible · a3af3926
      Colin Watson authored
      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
      a3af3926
  7. 19 Sep, 2016 2 commits
    • Colin Watson's avatar
      Add GRUB_RECOVERY_TITLE option · 8472000f
      Colin Watson authored
      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
      8472000f
    • Colin Watson's avatar
      Add configure option to bypass boot menu if possible · 382eda45
      Colin Watson authored
      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
      382eda45
  8. 18 Sep, 2016 3 commits
    • Colin Watson's avatar
      Add GRUB_RECOVERY_TITLE option · f4283679
      Colin Watson authored
      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
      f4283679
    • Colin Watson's avatar
      Add configure option to bypass boot menu if possible · 1d64d097
      Colin Watson authored
      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
      1d64d097
    • Colin Watson's avatar
      Restore grub-mkdevicemap · 9f2b1f47
      Colin Watson authored
      This is kind of a mess, requiring lots of OS-specific code to iterate
      over all possible devices.  However, we use it in a number of scripts to
      discover devices and reimplementing those in terms of something else
      would be very complicated.
      
      Author: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
      Forwarded: no
      Last-Update: 2016-09-18
      
      Patch-Name: restore_mkdevicemap.patch
      9f2b1f47
  9. 12 Feb, 2016 1 commit
  10. 22 Jan, 2016 2 commits
  11. 14 Dec, 2015 1 commit
  12. 25 Nov, 2015 2 commits
    • Colin Watson's avatar
      Add GRUB_RECOVERY_TITLE option · c88ce860
      Colin Watson authored
      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
      c88ce860
    • Colin Watson's avatar
      Add configure option to bypass boot menu if possible · 13e55eba
      Colin Watson authored
      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
      13e55eba
  13. 12 Nov, 2015 1 commit
  14. 07 Nov, 2015 1 commit
  15. 04 Sep, 2015 4 commits
    • Colin Watson's avatar
      Add GRUB_RECOVERY_TITLE option · 50a4985a
      Colin Watson authored
      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
      50a4985a
    • Colin Watson's avatar
      Add configure option to bypass boot menu if possible · 93182e8b
      Colin Watson authored
      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
      93182e8b
    • Colin Watson's avatar
      Add GRUB_RECOVERY_TITLE option · f2dbb6da
      Colin Watson authored
      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
      f2dbb6da
    • Colin Watson's avatar
      Add configure option to bypass boot menu if possible · 953d78be
      Colin Watson authored
      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-05-14
      
      Patch-Name: quick_boot.patch
      953d78be
  16. 14 Jun, 2015 3 commits
    • Colin Watson's avatar
      Add GRUB_RECOVERY_TITLE option · 8a8d72c2
      Colin Watson authored
      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
      8a8d72c2
    • Colin Watson's avatar
      Add configure option to bypass boot menu if possible · 4365ed0e
      Colin Watson authored
      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-05-14
      
      Patch-Name: quick_boot.patch
      4365ed0e
    • Colin Watson's avatar
      Restore grub-mkdevicemap · aaaae9b2
      Colin Watson authored
      This is kind of a mess, requiring lots of OS-specific code to iterate
      over all possible devices.  However, we use it in a number of scripts to
      discover devices and reimplementing those in terms of something else
      would be very complicated.
      
      Patch-Name: restore_mkdevicemap.patch
      aaaae9b2
  17. 30 May, 2015 1 commit
  18. 17 May, 2015 1 commit
    • Andrei Borzenkov's avatar
      bootp: ignore gateway_ip (relay) field. · a666c8bd
      Andrei Borzenkov authored
      From RFC1542:
      
         The 'giaddr' field is rather poorly named.  It exists to facilitate
         the transfer of BOOTREQUEST messages from a client, through BOOTP
         relay agents, to servers on different networks than the client.
         Similarly, it facilitates the delivery of BOOTREPLY messages from the
         servers, through BOOTP relay agents, back to the client.  In no case
         does it represent a general IP router to be used by the client.  A
         BOOTP client MUST set the 'giaddr' field to zero (0.0.0.0) in all
         BOOTREQUEST messages it generates.
      
         A BOOTP client MUST NOT interpret the 'giaddr' field of a BOOTREPLY
         message to be the IP address of an IP router.  A BOOTP client SHOULD
         completely ignore the contents of the 'giaddr' field in BOOTREPLY
         messages.
      
      Leave code ifdef'd out for the time being in case we see regression.
      
      Suggested by: Rink Springer <rink@rink.nu>
      Closes: 43396
      a666c8bd
  19. 14 May, 2015 2 commits
    • Colin Watson's avatar
      Add GRUB_RECOVERY_TITLE option · 61e10268
      Colin Watson authored
      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
      61e10268
    • Colin Watson's avatar
      Add configure option to bypass boot menu if possible · a6c14d00
      Colin Watson authored
      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-05-14
      
      Patch-Name: quick_boot.patch
      a6c14d00
  20. 12 Apr, 2015 1 commit
  21. 18 Nov, 2014 2 commits
    • Colin Watson's avatar
      Add GRUB_RECOVERY_TITLE option · aa6cd0ed
      Colin Watson authored
      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
      aa6cd0ed
    • Colin Watson's avatar
      Add configure option to bypass boot menu if possible · 211894b6
      Colin Watson authored
      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>
      Forwarded: no
      Last-Update: 2014-01-17
      
      Patch-Name: quick_boot.patch
      211894b6