CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-make-grub2' into 'etiona'

Browse source 
Fix make grub2

See merge request trisquel/package-helpers!253
This commit is contained in:
Ruben Rodriguez 2019-09-13 20:08:33 +00:00
commit 5c3c7a724e
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
helpers/make-grub2
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2011-2017 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2011-2017 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2019 Mason Hock <mason@masonhock.com>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -17,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=3 VERSION=4
COMPONENT=main COMPONENT=main
. ./config . ./config
@ -50,7 +51,9 @@ find |grep ubuntu|xargs rename s/ubuntu/trisquel/
# Allow Windows and MacOX entries to boot without a password # Allow Windows and MacOX entries to boot without a password
sed 's/class osx/class osx --unrestricted/; s/class windows/class osx --unrestricted/;' -i ./util/grub.d/30_os-prober.in sed 's/class osx/class osx --unrestricted/; s/class windows/class osx --unrestricted/;' -i ./util/grub.d/30_os-prober.in
changelog "rebranded and adapted for trisquel" sed -i '/set -e/aexit 77' tests/grub_cmd_set_date.in
changelog "skip test grub_cmd_set_date.in"
compile compile