Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 331923
Collapse All | Expand All

(-)a/targets/support/kmerge.sh (-3 / +35 lines)
Lines 7-13 check_genkernel_version Link Here
7
install -d /tmp/kerncache
7
install -d /tmp/kerncache
8
PKGDIR=/tmp/kerncache/${clst_kname}/ebuilds
8
PKGDIR=/tmp/kerncache/${clst_kname}/ebuilds
9
9
10
# true if $2 in $1
11
str2in1() {
12
	[ "${1#*$2*}" != "$1" ]
13
}
14
10
setup_gk_args() {
15
setup_gk_args() {
16
	local use_dracut=yes
17
	str2in1 "${clst_gk_mainargs}" '--no-dracut' && use_dracut=''
18
11
	# default genkernel args
19
	# default genkernel args
12
	GK_ARGS="${clst_gk_mainargs} \
20
	GK_ARGS="${clst_gk_mainargs} \
13
			 ${clst_kernel_gk_kernargs} \
21
			 ${clst_kernel_gk_kernargs} \
Lines 17-22 setup_gk_args() { Link Here
17
			 --modulespackage=/tmp/kerncache/${clst_kname}-modules-${clst_version_stamp}.tar.bz2 \
25
			 --modulespackage=/tmp/kerncache/${clst_kname}-modules-${clst_version_stamp}.tar.bz2 \
18
			 --minkernpackage=/tmp/kerncache/${clst_kname}-kernel-initrd-${clst_version_stamp}.tar.bz2 all"
26
			 --minkernpackage=/tmp/kerncache/${clst_kname}-kernel-initrd-${clst_version_stamp}.tar.bz2 all"
19
	# extra genkernel options that we have to test for
27
	# extra genkernel options that we have to test for
28
	[ "${use_dracut}" = yes ] && GK_ARGS="${GK_ARGS} --generic"
20
	if [ -n "${clst_KERNCACHE}" ]
29
	if [ -n "${clst_KERNCACHE}" ]
21
	then
30
	then
22
		GK_ARGS="${GK_ARGS} --kerncache=/tmp/kerncache/${clst_kname}-kerncache-${clst_version_stamp}.tar.bz2"
31
		GK_ARGS="${GK_ARGS} --kerncache=/tmp/kerncache/${clst_kname}-kerncache-${clst_version_stamp}.tar.bz2"
Lines 28-40 setup_gk_args() { Link Here
28
37
29
	if [ -n "${clst_splash_theme}" ]
38
	if [ -n "${clst_splash_theme}" ]
30
	then
39
	then
31
		GK_ARGS="${GK_ARGS} --splash=${clst_splash_theme}"
40
		if [ "${use_dracut}" = yes ]
41
		then
42
			GK_ARGS="${GK_ARGS} --gensplash=${clst_splash_theme}"
43
		else
44
			GK_ARGS="${GK_ARGS} --splash=${clst_splash_theme}"
45
		fi
32
		# Setup case structure for livecd_type
46
		# Setup case structure for livecd_type
33
		case ${clst_livecd_type} in
47
		case ${clst_livecd_type} in
34
			gentoo-release-minimal|gentoo-release-universal)
48
			gentoo-release-minimal|gentoo-release-universal)
35
				case ${clst_hostarch} in
49
				case ${clst_hostarch} in
36
					amd64|x86)
50
					amd64|x86)
37
						GK_ARGS="${GK_ARGS} --splash-res=1024x768"
51
						if [ "${use_dracut}" = yes ]
52
						then
53
							# we assume there's no space after theme name
54
							GK_ARGS="${GK_ARGS}:1024x768"
55
						else
56
							GK_ARGS="${GK_ARGS} --splash-res=1024x768"
57
						fi
38
					;;
58
					;;
39
				esac
59
				esac
40
			;;
60
			;;
Lines 52-67 setup_gk_args() { Link Here
52
72
53
	if [ -n "${clst_linuxrc}" ]
73
	if [ -n "${clst_linuxrc}" ]
54
	then
74
	then
75
		[ "${use_dracut}" = yes ] && {
76
			echo "--linuxrc doesn't work with Dracut engine"
77
			return 1
78
		}
55
		GK_ARGS="${GK_ARGS} --linuxrc=/tmp/linuxrc"
79
		GK_ARGS="${GK_ARGS} --linuxrc=/tmp/linuxrc"
56
	fi
80
	fi
57
81
58
	if [ -n "${clst_busybox_config}" ]
82
	if [ -n "${clst_busybox_config}" ]
59
	then
83
	then
84
		[ "${use_dracut}" = yes ] && {
85
			echo "--busybox-config doesn't work with Dracut engine"
86
			return 1
87
		}
60
		GK_ARGS="${GK_ARGS} --busybox-config=/tmp/busy-config"
88
		GK_ARGS="${GK_ARGS} --busybox-config=/tmp/busy-config"
61
	fi
89
	fi
62
90
63
	if [ "${clst_target}" == "netboot" ]
91
	if [ "${clst_target}" == "netboot" ]
64
	then
92
	then
93
		[ "${use_dracut}" = yes ] && {
94
			echo "For netboot target use internal Genkernel engine"
95
			echo "(append --no-dracut to gk_mainargs)"
96
			exit 1
97
		}
65
		GK_ARGS="${GK_ARGS} --netboot"
98
		GK_ARGS="${GK_ARGS} --netboot"
66
99
67
		if [ -n "${clst_merge_path}" ]
100
		if [ -n "${clst_merge_path}" ]
68
- 

Return to bug 331923