~ubuntu-branches/ubuntu/jaunty/grub2/jaunty

« back to all changes in this revision

Viewing changes to util/update-grub.in

  • Committer: Bazaar Package Importer
  • Author(s): Albin Tonnerre
  • Date: 2007-06-06 12:45:39 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070606124539-1mke05d4jw60fsjn
Tags: 1.95+20070604-1ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
  - Disable stack protector.
  - Modify Maintainer value to match Debian-Maintainer-Field Spec

Show diffs side-by-side

added added

removed removed

Lines of Context:
94
94
export GRUB_DEVICE GRUB_FS GRUB_DRIVE GRUB_DRIVE_BOOT GRUB_DRIVE_BOOT_GRUB
95
95
 
96
96
# These are optional, user-defined variables.
97
 
export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR
 
97
export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX
98
98
 
99
99
exec > ${grub_cfg}.new
100
100
chmod 444 ${grub_cfg}.new