← Back to branch summary

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

« back to all changes in this revision

Viewing changes to util/grub.d/10_hurd.in

  • 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:
util/grub.d/10_hurd.in
81
81
menuentry "${OS} ${KERNEL}" ${CLASS} {
82
82
EOF
83
83
  prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
 
84
  message="$(gettext_printf "Loading GNU Mach ...")"
84
85
  cat << EOF
85
 
        echo            '$(gettext_quoted "Loading GNU Mach ...")'
 
86
        echo            '$message'
86
87
        multiboot       ${kernel} root=device:${GRUB_DEVICE#/dev/}
87
88
EOF
88
89
  save_default_entry | sed -e "s/^/\t/"
89
90
  prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
 
91
  message="$(gettext_printf "Loading the Hurd ...")"
90
92
  cat << EOF
91
 
        echo            '$(gettext_quoted "Loading the Hurd ...")'
 
93
        echo            '$message'
92
94
        module          /hurd/${hurd_fs}.static ${hurd_fs} --readonly \\
93
95
                        --multiboot-command-line='\${kernel-command-line}' \\
94
96
                        --host-priv-port='\${host-port}' \\
103
105
menuentry "${OS} ${KERNEL} (recovery mode)" ${CLASS} {
104
106
EOF
105
107
  prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
 
108
  message="$(gettext_printf "Loading GNU Mach ...")"
106
109
  cat << EOF
107
 
        echo            '$(gettext_quoted "Loading GNU Mach ...")'
 
110
        echo            '$message'
108
111
        multiboot       ${kernel} root=device:${GRUB_DEVICE#/dev/} -s
109
112
EOF
110
 
  save_default_entry | sed -e "s/^/\t/"
111
113
  prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
 
114
  message="$(gettext_printf "Loading the Hurd ...")"
112
115
  cat << EOF
113
 
        echo            '$(gettext_quoted "Loading the Hurd ...")'
 
116
        echo            '$message'
114
117
        module          /hurd/${hurd_fs}.static ${hurd_fs} \\
115
118
                        --multiboot-command-line='\${kernel-command-line}' \\
116
119
                        --host-priv-port='\${host-port}' \\