Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 354157 | Differences between
and this patch

Collapse All | Expand All

(-)a/core/scripts/splash_geninitramfs.in (-2 / +9 lines)
Lines 64-69 Link Here
64
declare -a themes
64
declare -a themes
65
mode="h"
65
mode="h"
66
splash_hlp="@sbindir@/fbcondecor_helper"
66
splash_hlp="@sbindir@/fbcondecor_helper"
67
splash_initrd="@PACKAGE_DATA_DIR@/initrd.splash"
67
res=""
68
res=""
68
overlay=""
69
overlay=""
69
verbose=0
70
verbose=0
Lines 149-155 Link Here
149
fi
150
fi
150
151
151
printv "o Creating directory structure.."
152
printv "o Creating directory structure.."
152
mkdir -p ${imgdir}/{dev,dev/fb,dev/misc,dev/vc,$themedir,lib/splash/proc,root,sbin,lib/splash/sys}
153
mkdir -p ${imgdir}/{dev,dev/fb,dev/misc,dev/vc,$themedir,@libdir@/splash/proc,root,sbin,@libdir@/splash/sys}
153
154
154
if [ $EUID == 0 ]; then
155
if [ $EUID == 0 ]; then
155
	[[ ! -e "${imgdir}/dev/null" ]] 	&& mknod "${imgdir}/dev/null" c 1 3
156
	[[ ! -e "${imgdir}/dev/null" ]] 	&& mknod "${imgdir}/dev/null" c 1 3
Lines 169-174 Link Here
169
cp "${splash_hlp}" "${imgdir}@sbindir@"
170
cp "${splash_hlp}" "${imgdir}@sbindir@"
170
ln -sf "${splash_hlp}" "${imgdir}@sbindir@/splash_helper"
171
ln -sf "${splash_hlp}" "${imgdir}@sbindir@/splash_helper"
171
172
173
if [ ! -e "${imgdir}@sysconfdir@/initrd.splash" ] && [ -e ${splash_initrd} ]; then
174
	printv "o Copying ${splash_initrd}.."
175
	cp "${splash_initrd}" "${imgdir}@sysconfdir@"
176
fi
177
172
res=${res//,/ }
178
res=${res//,/ }
173
179
174
printv "o Copying themes.."
180
printv "o Copying themes.."
175
-- a/core/scripts/Makefile.am    2008-11-13 21:54:19.000000000 +0200
181
++ b/core/scripts/Makefile.am 2011-02-08 21:46:03.682684914 +0200
Lines 13-18 Link Here
13
	$(Q)rm -f $@
13
	$(Q)rm -f $@
14
	$(Q)cat $< | $(SED) \
14
	$(Q)cat $< | $(SED) \
15
		-e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \
15
		-e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \
16
		-e 's|@PACKAGE_DATA_DIR[@]|$(pkgdatadir)|g' \
16
		-e 's|@bindir[@]|$(eexecbindir)|g' \
17
		-e 's|@bindir[@]|$(eexecbindir)|g' \
17
		-e 's|@sbindir[@]|$(eexecsbindir)|g' \
18
		-e 's|@sbindir[@]|$(eexecsbindir)|g' \
18
		-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
19
		-e 's|@sysconfdir[@]|$(sysconfdir)|g' \

Return to bug 354157