Attachment #8031 for bug #28225

View | Details | Raw Unified | Return to bug 28225
Collapse All | Expand All

Lines 2-8 Link Here

(-)a/alterator-grub.spec (-1 / +5 lines)
2		2
3	Name: alterator-grub	3	Name: alterator-grub
4	Version: 0.12	4	Version: 0.12
5	Release: alt2	5	Release: alt3
6		6
7	Summary: alterator module to setup grub bootloader	7	Summary: alterator module to setup grub bootloader
8	License: GPL	8	License: GPL
Lines 49-54 alterator module to setup grub bootloader Link Here
49	%_bindir/*	49	%_bindir/*
50		50
51	%changelog	51	%changelog
		52	* Sun Feb 24 2019 Nikolai Kostrigin <nickel@altlinux.ru> 0.12-alt3
		53	- prevent an error message during bootloader installation if a LUKS
		54	encryption is chosen for root partition
		55
52	* Mon May 21 2018 Sergey Bolshakov <sbolshakov@altlinux.ru> 0.12-alt2	56	* Mon May 21 2018 Sergey Bolshakov <sbolshakov@altlinux.ru> 0.12-alt2
53	- do not require grub-pc on non-pc	57	- do not require grub-pc on non-pc
54		58




	GRUB_DEV=
	for dev in $bootdev; do
		GRUB_DEV="$(blockdev_get_symlink "$dev") $GRUB_DEV"

		# try to overcome an error occuring when a root partition is chosen to be encrypted with LUKS
		if [ -L /dev/mapper/*_luks ]; then
			if ! grep "^GRUB_ENABLE_CRYPTODISK=" /etc/default/grub > /dev/null 2>&1; then
			         echo "GRUB_ENABLE_CRYPTODISK=y" >> /etc/default/grub
			else
			         sed -i "s|GRUB_ENABLE_CRYPTODISK=.*|GRUB_ENABLE_CRYPTODISK=y|" /etc/default/grub
			fi
		fi

		grub-install $target "$dev" >> $gruboutput 2>&1
		if [ $? -ne 0 ]; then
			if grep blocklists $gruboutput; then
- 

Return to bug 28225

Lines 132-137 write_device() { Link Here

(-)a/alterator-grub/backend3/grub (-1 / +10 lines)
132	GRUB_DEV=	132	GRUB_DEV=
133	for dev in $bootdev; do	133	for dev in $bootdev; do
134	GRUB_DEV="$(blockdev_get_symlink "$dev") $GRUB_DEV"	134	GRUB_DEV="$(blockdev_get_symlink "$dev") $GRUB_DEV"
		135
		136	# try to overcome an error occuring when a root partition is chosen to be encrypted with LUKS
		137	if [ -L /dev/mapper/*_luks ]; then
		138	if ! grep "^GRUB_ENABLE_CRYPTODISK=" /etc/default/grub > /dev/null 2>&1; then
		139	echo "GRUB_ENABLE_CRYPTODISK=y" >> /etc/default/grub
		140	else
		141	sed -i "s\|GRUB_ENABLE_CRYPTODISK=.*\|GRUB_ENABLE_CRYPTODISK=y\|" /etc/default/grub
		142	fi
		143	fi
		144
135	grub-install $target "$dev" >> $gruboutput 2>&1	145	grub-install $target "$dev" >> $gruboutput 2>&1
136	if [ $? -ne 0 ]; then	146	if [ $? -ne 0 ]; then
137	if grep blocklists $gruboutput; then	147	if grep blocklists $gruboutput; then
138	-