1 |
wolf31o2 08/02/25 22:13:21 |
2 |
|
3 |
Modified: grub-static-0.97.ebuild ChangeLog |
4 |
Log: |
5 |
Sync with sys-boot/grub. |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.5 sys-boot/grub-static/grub-static-0.97.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97.ebuild?rev=1.5&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97.ebuild?rev=1.5&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97.ebuild?r1=1.4&r2=1.5 |
14 |
|
15 |
Index: grub-static-0.97.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97.ebuild,v |
18 |
retrieving revision 1.4 |
19 |
retrieving revision 1.5 |
20 |
diff -u -r1.4 -r1.5 |
21 |
--- grub-static-0.97.ebuild 20 Dec 2006 16:21:23 -0000 1.4 |
22 |
+++ grub-static-0.97.ebuild 25 Feb 2008 22:13:20 -0000 1.5 |
23 |
@@ -1,6 +1,6 @@ |
24 |
-# Copyright 1999-2006 Gentoo Foundation |
25 |
+# Copyright 1999-2008 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97.ebuild,v 1.4 2006/12/20 16:21:23 dsd Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97.ebuild,v 1.5 2008/02/25 22:13:20 wolf31o2 Exp $ |
29 |
|
30 |
inherit mount-boot |
31 |
|
32 |
@@ -27,30 +27,30 @@ |
33 |
setup_boot_dir() { |
34 |
local dir="${1}" |
35 |
|
36 |
- [[ ! -e ${dir} ]] && die "${dir} does not exist!" |
37 |
- [[ ! -e ${dir}/grub ]] && mkdir "${dir}/grub" |
38 |
+ [[ ! -e "${dir}" ]] && die "${dir} does not exist!" |
39 |
+ [[ ! -e "${dir}"/grub ]] && mkdir "${dir}/grub" |
40 |
|
41 |
# change menu.lst to grub.conf |
42 |
- if [[ ! -e ${dir}/grub/grub.conf ]] && [[ -e ${dir}/grub/menu.lst ]] ; then |
43 |
+ if [[ ! -e "${dir}"/grub/grub.conf ]] && [[ -e "${dir}"/grub/menu.lst ]] ; then |
44 |
mv -f "${dir}"/grub/menu.lst "${dir}"/grub/grub.conf |
45 |
ewarn |
46 |
ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf" |
47 |
ewarn |
48 |
fi |
49 |
|
50 |
- if [[ ! -e ${dir}/grub/menu.lst ]]; then |
51 |
+ if [[ ! -e "${dir}"/grub/menu.lst ]]; then |
52 |
einfo "Linking from new grub.conf name to menu.lst" |
53 |
ln -snf grub.conf "${dir}"/grub/menu.lst |
54 |
fi |
55 |
|
56 |
- [[ -e ${dir}/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old} |
57 |
+ [[ -e "${dir}"/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old} |
58 |
|
59 |
- einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}"" |
60 |
+ einfo "Copying files from /lib/grub and /usr/lib/grub to ${dir}" |
61 |
for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do |
62 |
- [[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/ |
63 |
+ [[ -f "${x}" ]] && cp -p "${x}" "${dir}"/grub/ |
64 |
done |
65 |
|
66 |
- if [[ -e ${dir}/grub/grub.conf ]] ; then |
67 |
+ if [[ -e "${dir}"/grub/grub.conf ]] ; then |
68 |
egrep \ |
69 |
-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \ |
70 |
"${dir}"/grub/grub.conf | \ |
71 |
@@ -61,7 +61,8 @@ |
72 |
} |
73 |
|
74 |
pkg_postinst() { |
75 |
- [[ ${ROOT} != "/" ]] && return 0 |
76 |
+ [[ "${ROOT}" != "/" ]] && return 0 |
77 |
+ [[ -n ${DONT_MOUNT_BOOT} ]] && return 0 |
78 |
setup_boot_dir /boot |
79 |
einfo "To install grub files to another device (like a usb stick), just run:" |
80 |
einfo " emerge --config =${PF}" |
81 |
@@ -71,5 +72,5 @@ |
82 |
local dir |
83 |
einfo "Enter the directory where you want to setup grub:" |
84 |
read dir |
85 |
- setup_boot_dir ${dir} |
86 |
+ setup_boot_dir "${dir}" |
87 |
} |
88 |
|
89 |
|
90 |
|
91 |
1.14 sys-boot/grub-static/ChangeLog |
92 |
|
93 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.14&view=markup |
94 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.14&content-type=text/plain |
95 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?r1=1.13&r2=1.14 |
96 |
|
97 |
Index: ChangeLog |
98 |
=================================================================== |
99 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v |
100 |
retrieving revision 1.13 |
101 |
retrieving revision 1.14 |
102 |
diff -u -r1.13 -r1.14 |
103 |
--- ChangeLog 20 Dec 2006 16:21:23 -0000 1.13 |
104 |
+++ ChangeLog 25 Feb 2008 22:13:20 -0000 1.14 |
105 |
@@ -1,6 +1,10 @@ |
106 |
# ChangeLog for sys-boot/grub-static |
107 |
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 |
108 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.13 2006/12/20 16:21:23 dsd Exp $ |
109 |
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
110 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.14 2008/02/25 22:13:20 wolf31o2 Exp $ |
111 |
+ |
112 |
+ 25 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
113 |
+ grub-static-0.97.ebuild: |
114 |
+ Sync with sys-boot/grub. |
115 |
|
116 |
20 Dec 2006; Daniel Drake <dsd@g.o> grub-static-0.97.ebuild: |
117 |
Stable on amd64, bug #156459 |
118 |
|
119 |
|
120 |
|
121 |
-- |
122 |
gentoo-commits@l.g.o mailing list |