diffstat for grub2-2.02~beta2 grub2-2.02~beta2 changelog | 9 +++++++++ default/grub | 2 +- legacy/update-grub | 2 +- patches/01_eduboss.patch | 40 ++++++++++++++++++++++++++++++++++++++++ patches/series | 1 + postinst.in | 4 ++-- 6 files changed, 54 insertions(+), 4 deletions(-) diff -Nru grub2-2.02~beta2/debian/changelog grub2-2.02~beta2/debian/changelog --- grub2-2.02~beta2/debian/changelog 2014-12-22 11:55:53.000000000 +0000 +++ grub2-2.02~beta2/debian/changelog 2015-01-08 06:14:11.000000000 +0000 @@ -1,3 +1,12 @@ +grub2 (2.02~beta2-19eduboss1) stable; urgency=medium + + * debian/postinst.in : Dont merge the debconf values for linux_cmdline and linux_cmdline_default. + * debian/default/grub: Set default Distribution id to EduBOSS. + * debian/legacy/update-grub: Added splash entry to kopt value. + * util/grub.d/10_linux_in, 30_os-prober.in , 20_linux_xen.in : Dont ask for user authentication for booting the OS. Added --unrestricted to the CLASS variable. + + -- Prathibha B Thu, 08 Jan 2015 11:44:00 +0000 + grub2 (2.02~beta2-19) unstable; urgency=medium [ Steve McIntyre ] diff -Nru grub2-2.02~beta2/debian/default/grub grub2-2.02~beta2/debian/default/grub --- grub2-2.02~beta2/debian/default/grub 2014-12-22 11:55:53.000000000 +0000 +++ grub2-2.02~beta2/debian/default/grub 2015-01-08 06:00:26.000000000 +0000 @@ -5,7 +5,7 @@ GRUB_DEFAULT=0 GRUB_TIMEOUT=@DEFAULT_TIMEOUT@ -GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian` +GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo EduBOSS` GRUB_CMDLINE_LINUX_DEFAULT="@DEFAULT_CMDLINE@" GRUB_CMDLINE_LINUX="" diff -Nru grub2-2.02~beta2/debian/legacy/update-grub grub2-2.02~beta2/debian/legacy/update-grub --- grub2-2.02~beta2/debian/legacy/update-grub 2014-12-22 11:55:53.000000000 +0000 +++ grub2-2.02~beta2/debian/legacy/update-grub 2015-01-08 06:07:02.000000000 +0000 @@ -215,7 +215,7 @@ fi # Default kernel options, overidden by the kopt statement in the menufile. -kopt="root=$linux_root_device ro" +kopt="root=$linux_root_device ro splash gfxpayload=1024x768x16 quiet" # Title title="Debian GNU/`uname -s | sed -e s,GNU/,,g`" diff -Nru grub2-2.02~beta2/debian/patches/01_eduboss.patch grub2-2.02~beta2/debian/patches/01_eduboss.patch --- grub2-2.02~beta2/debian/patches/01_eduboss.patch 1970-01-01 00:00:00.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/01_eduboss.patch 2015-01-08 09:15:23.000000000 +0000 @@ -0,0 +1,40 @@ +Description: + * debian/postinst.in : Dont merge the debconf values for linux_cmdline and linux_cmdline_default. + * debian/default/grub: Set default Distribution id to EduBOSS. + * debian/legacy/update-grub: Added splash entry to kopt value. + * util/grub.d/10_linux_in, 30_os-prober.in , 20_linux_xen.in : Dont ask for user authentication for booting the OS. Added --unrestricted to the CLASS variable. +Author: Prathibha B + +--- grub2-2.02~beta2.orig/util/grub.d/10_linux.in ++++ grub2-2.02~beta2/util/grub.d/10_linux.in +@@ -31,7 +31,7 @@ vt_handoff="@VT_HANDOFF@" + export TEXTDOMAIN=@PACKAGE@ + export TEXTDOMAINDIR="@localedir@" + +-CLASS="--class gnu-linux --class gnu --class os" ++CLASS="--class gnu-linux --class gnu --class os --unrestricted" + + if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then + OS=GNU/Linux +--- grub2-2.02~beta2.orig/util/grub.d/20_linux_xen.in ++++ grub2-2.02~beta2/util/grub.d/20_linux_xen.in +@@ -26,7 +26,7 @@ datarootdir="@datarootdir@" + export TEXTDOMAIN=@PACKAGE@ + export TEXTDOMAINDIR="@localedir@" + +-CLASS="--class gnu-linux --class gnu --class os --class xen" ++CLASS="--class gnu-linux --class gnu --class os --class xen --unrestricted" + + if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then + OS=GNU/Linux +--- grub2-2.02~beta2.orig/util/grub.d/30_os-prober.in ++++ grub2-2.02~beta2/util/grub.d/30_os-prober.in +@@ -67,7 +67,7 @@ osx_entry() { + # TRANSLATORS: it refers on the OS residing on device %s + onstr="$(gettext_printf "(on %s)" "${DEVICE}")" + cat << EOF +-menuentry '$(echo "${LONGNAME} $bitstr $onstr" | grub_quote)' --class osx --class darwin --class os \$menuentry_id_option 'osprober-xnu-$2-$(grub_get_device_id "${DEVICE}")' { ++menuentry '$(echo "${LONGNAME} $bitstr $onstr" | grub_quote)' --unrestricted --class osx --class darwin --class os \$menuentry_id_option 'osprober-xnu-$2-$(grub_get_device_id "${DEVICE}")' { + EOF + save_default_entry | grub_add_tab + prepare_grub_to_access_device ${DEVICE} | grub_add_tab diff -Nru grub2-2.02~beta2/debian/patches/series grub2-2.02~beta2/debian/patches/series --- grub2-2.02~beta2/debian/patches/series 2014-12-22 11:55:53.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/series 2015-01-08 09:15:09.000000000 +0000 @@ -63,3 +63,4 @@ gettext-print-typo.patch insmod-xzio-and-lzopio-on-xen.patch grub-install-extra-removable.patch +01_eduboss.patch diff -Nru grub2-2.02~beta2/debian/postinst.in grub2-2.02~beta2/debian/postinst.in --- grub2-2.02~beta2/debian/postinst.in 2014-12-22 11:55:53.000000000 +0000 +++ grub2-2.02~beta2/debian/postinst.in 2015-01-08 05:57:36.000000000 +0000 @@ -370,8 +370,8 @@ trap "rm -f ${tmp_default_grub}" EXIT cp -p /usr/share/grub/default/grub ${tmp_default_grub} - merge_debconf_into_conf "$tmp_default_grub" GRUB_CMDLINE_LINUX grub2/linux_cmdline - merge_debconf_into_conf "$tmp_default_grub" GRUB_CMDLINE_LINUX_DEFAULT grub2/linux_cmdline_default +# merge_debconf_into_conf "$tmp_default_grub" GRUB_CMDLINE_LINUX grub2/linux_cmdline +# merge_debconf_into_conf "$tmp_default_grub" GRUB_CMDLINE_LINUX_DEFAULT grub2/linux_cmdline_default case @PACKAGE@ in grub-pc)