diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-12-07 09:41:01 -0200 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-12-07 09:41:01 -0200 |
commit | a6cccbf4add9dd38d1df3e087dff30563e164d1d (patch) | |
tree | 37d5e1b662aba30aef16cc3eeb6d6a70b4ec6dda /libre/grub/parabola_grub_mkconfig_fixes.patch | |
parent | 13565e188b02f38cc2e0e631cb0bdc6b51ffcbbf (diff) | |
parent | 99167f5b8c828ab5e0cbb2149e7499f0a79b5361 (diff) |
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/grub/parabola_grub_mkconfig_fixes.patch')
-rw-r--r-- | libre/grub/parabola_grub_mkconfig_fixes.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch index 7cf1763a2..fcb302e1d 100644 --- a/libre/grub/parabola_grub_mkconfig_fixes.patch +++ b/libre/grub/parabola_grub_mkconfig_fixes.patch @@ -85,12 +85,12 @@ index e27d6f7..2d60949 100644 alt_version=`echo $version | sed -e "s,\.old$,,g"` linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" -+ if test -e "/etc/arch-release" ; then -+ if echo "${basename}" | grep -q 'vmlinuz-linux' ; then -+ version="`echo "${basename}" | sed -e 's,vmlinuz-linux,,g'`" ++ if test -e "/etc/parabola-release" ; then ++ if echo "${basename}" | grep -q 'vmlinuz-linux-libre' ; then ++ version="`echo "${basename}" | sed -e 's,vmlinuz-linux-libre,,g'`" + + if [ "x${version}" = "x" ] ; then -+ version="core repo kernel" ++ version="libre repo kernel" + else + version="`echo "${version}" | sed -e 's,-,,g'`" + version="${version} kernel" @@ -118,7 +118,7 @@ index e27d6f7..2d60949 100644 linux_root_device_thisversion=${GRUB_DEVICE} fi -+ if test -e "/etc/arch-release" ; then ++ if test -e "/etc/parabola-release" ; then + is_first_entry="false" + + linux_entry "${OS}" "${version}" true \ @@ -141,7 +141,7 @@ index e27d6f7..2d60949 100644 is_top_level=false fi -+ if ! test -e "/etc/arch-release" ; then ++ if ! test -e "/etc/parabola-release" ; then linux_entry "${OS}" "${version}" advanced \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" + fi @@ -153,7 +153,7 @@ index e27d6f7..2d60949 100644 # If at least one kernel was found, then we need to # add a closing '}' for the submenu command. -+if ! test -e "/etc/arch-release" ; then ++if ! test -e "/etc/parabola-release" ; then if [ x"$is_top_level" != xtrue ]; then echo '}' fi |