diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-09-10 04:45:44 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-09-10 04:45:44 +0000 |
| commit | 592c582a110a8c1f0788d77c2b20d3f8aad7e242 (patch) | |
| tree | c5e63f42fe6670c34f0710f7e5cc69985fd50c69 /sys-boot | |
| parent | arm love (diff) | |
| download | historical-592c582a110a8c1f0788d77c2b20d3f8aad7e242.tar.gz historical-592c582a110a8c1f0788d77c2b20d3f8aad7e242.tar.bz2 historical-592c582a110a8c1f0788d77c2b20d3f8aad7e242.zip | |
filter out password/initrd from grub.conf #145629 by Joel
Package-Manager: portage-2.1.1_rc1-r6
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/Manifest | 14 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.97-r3.ebuild | 23 |
2 files changed, 19 insertions, 18 deletions
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 6d04b5f3d494..eb94936f06bf 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -39,10 +39,10 @@ EBUILD grub-0.97-r2.ebuild 4837 RMD160 0354978e70fc78dc77f2075dddb625fda8a30855 MD5 cc64596d5c0074754c380757b93f76d5 grub-0.97-r2.ebuild 4837 RMD160 0354978e70fc78dc77f2075dddb625fda8a30855 grub-0.97-r2.ebuild 4837 SHA256 4d51ab395a6346b5f8753bb3bc04c547b1162dcf0381796e8d2f1cea96086496 grub-0.97-r2.ebuild 4837 -EBUILD grub-0.97-r3.ebuild 4811 RMD160 cf848bb7165ebb6e828386d8c862308f80775c20 SHA1 27555d2e4a1f73689ca216ebc931399cf4e92480 SHA256 91d99f44fb470b7afde58b9f9ff473c50aec696907c512ddee386bff1dd37a6d -MD5 9a11ea27f12f8d47e2ce2575b4383bdb grub-0.97-r3.ebuild 4811 -RMD160 cf848bb7165ebb6e828386d8c862308f80775c20 grub-0.97-r3.ebuild 4811 -SHA256 91d99f44fb470b7afde58b9f9ff473c50aec696907c512ddee386bff1dd37a6d grub-0.97-r3.ebuild 4811 +EBUILD grub-0.97-r3.ebuild 4830 RMD160 a4f249163576f9111814a2db24ce540b07d11388 SHA1 3584dde509391c84a1184c0f4667629b588fa85e SHA256 4b8433da17b28dbd3c3674df69e2aecf94e240b7af30bfd4b18ff0ffa7c8ee8e +MD5 ddf22ed0b3d33dff20a5703af75341dd grub-0.97-r3.ebuild 4830 +RMD160 a4f249163576f9111814a2db24ce540b07d11388 grub-0.97-r3.ebuild 4830 +SHA256 4b8433da17b28dbd3c3674df69e2aecf94e240b7af30bfd4b18ff0ffa7c8ee8e grub-0.97-r3.ebuild 4830 EBUILD grub-0.97.ebuild 4518 RMD160 d03dba427b2b040e2b741776a849c4f030793af2 SHA1 07484f2e49a04c267a8f3dec6118b4a2833dbdcd SHA256 7e8e3cd6a5e43507955850ae5d33aaecfb853d8573e54aca5b75b63de7bf48e6 MD5 98aac6dc17a7d909ca1de859ef1394a2 grub-0.97.ebuild 4518 RMD160 d03dba427b2b040e2b741776a849c4f030793af2 grub-0.97.ebuild 4518 @@ -89,7 +89,7 @@ SHA256 c3b2f59fa9ba49b4e91cb3111fa85a6e03cda9164455a518808337796d97d2b4 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFAQoOamhnQswr0vIRAj9SAKCDHcB3blqOJ3j9CYxbFnHcJ15/DgCeKXop -7xeeEAn1yX53uwzz3wC9bx8= -=GF2h +iD8DBQFFA5iIamhnQswr0vIRAvWsAKCaVhfyTVKypTlI4/6AibgDmtAqGwCfdGyT +feGExUY2syGAXg+ux8tApYY= +=Fl8p -----END PGP SIGNATURE----- diff --git a/sys-boot/grub/grub-0.97-r3.ebuild b/sys-boot/grub/grub-0.97-r3.ebuild index d3791d21ea20..9ac670133302 100644 --- a/sys-boot/grub/grub-0.97-r3.ebuild +++ b/sys-boot/grub/grub-0.97-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r3.ebuild,v 1.1 2006/09/08 06:13:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r3.ebuild,v 1.2 2006/09/10 04:45:44 vapier Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs @@ -118,32 +118,33 @@ src_install() { setup_boot_dir() { local dir="${1}" - [[ ! -e "${dir}" ]] && die "${dir} does not exist!" - - [[ ! -e "${dir}/grub" ]] && mkdir "${dir}/grub" + [[ ! -e ${dir} ]] && die "${dir} does not exist!" + [[ ! -e ${dir}/grub ]] && mkdir "${dir}/grub" # change menu.lst to grub.conf - if [[ ! -e "${dir}/grub/grub.conf" && -e "${dir}/grub/menu.lst" ]] ; then - mv -f "${dir}/grub/menu.lst ${dir}/grub/grub.conf" + if [[ ! -e ${dir}/grub/grub.conf ]] && [[ -e ${dir}/grub/menu.lst ]] ; then + mv -f "${dir}"/grub/menu.lst "${dir}"/grub/grub.conf ewarn ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf" ewarn fi - if [[ ! -e "${dir}"/grub/menu.lst ]]; then + if [[ ! -e ${dir}/grub/menu.lst ]]; then einfo "Linking from new grub.conf name to menu.lst" - ln -snf grub.conf "${dir}/grub/menu.lst" + ln -snf grub.conf "${dir}"/grub/menu.lst fi - [[ -e "${dir}"/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old} + [[ -e ${dir}/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old} einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}"" for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do [[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/ done - if [[ -e "${dir}"/grub/grub.conf ]] ; then - egrep -v '^[[:space:]]*(#|$|default|fallback|splashimage|timeout|title)' "${dir}"/grub/grub.conf | \ + if [[ -e ${dir}/grub/grub.conf ]] ; then + egrep \ + -v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \ + "${dir}"/grub/grub.conf | \ /sbin/grub --batch \ --device-map="${dir}"/grub/device.map \ > /dev/null |