Diff lilo-24.0-r1 with a lilo-24.1

/usr/portage/sys-boot/lilo/lilo-24.1.ebuild 2019-12-11 15:40:00.000000000 +0300
19 19

  
20 20
SLOT="0"
21 21
LICENSE="BSD GPL-2"
22
KEYWORDS="-* amd64 x86"
22
KEYWORDS="-* ~amd64 ~x86"
23 23

  
24 24
DEPEND=">=sys-devel/bin86-0.15.5"
25 25
RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )"
......
94 94
	local rootpart="$(mount | grep -v "tmpfs" | grep -v "rootfs" | grep "on / " | cut -f1 -d " ")"
95 95

  
96 96
	echo
97
	einfon "Checking for LILO ..."
97
	ebegin "Checking whether LILO can be safely updated"
98 98

  
99 99
	if [ "$(whoami)" != "root" ]
100 100
	then
101
		echo; echo
102
		eerror "Only root can check for LILO!"
101
		eend 1
102
		eerror "Only root can check for LILO"
103 103
		return 1
104 104
	fi
105 105

  
106 106
	if [ -z "${rootpart}" ]
107 107
	then
108
		echo; echo
109
		eerror "Could not determine root partition!"
108
		eend 1
109
		eerror "Could not determine root partition"
110 110
		return 1
111 111
	fi
112 112

  
113 113
	if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ]
114 114
	then
115
		echo " No"
115
		eend 1
116
		eerror "No LILO configuration in place"
116 117
		return 1
117 118
	fi
118 119

  
......
126 127

  
127 128
	if ! dd if=${bootpart} ibs=16 count=1 2>&- | grep -q 'LILO'
128 129
	then
129
		echo; echo
130
		ewarn "Yes, but I couldn't find a LILO signature on ${bootpart}"
130
		eend 1
131
		eerror "No LILO signature on ${bootpart}"
131 132
		ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand."
132 133
		return 1
133 134
	fi
134 135

  
135
	echo " Yes, on ${bootpart}"
136
	if grep -q "^[[:space:]]*password[[:space:]]*=[[:space:]]*\"\"" /etc/lilo.conf
137
	then
138
		eend 1
139
		eerror "Interactive password entry configured"
140
		ewarn "Run /sbin/lilo -p by hand."
141
		return 1
142
	fi
136 143

  
144
	einfo "LILO on ${bootpart} is safe to update"
145
	eend 0
137 146
	return 0
138 147
}
139 148

  
......
148 157
	then
149 158
		if lilocheck
150 159
		then
151
			einfo "Running DOLILO to complete the install ..."
160
			einfo "Running DOLILO to complete the install"
152 161
			# do not redirect to /dev/null because it may display some input
153 162
			# prompt
154 163
			/sbin/dolilo
155 164
			if [ "$?" -ne 0 ]
156 165
			then
157
				echo
158
				eerror "Running /sbin/dolilo failed!  Please check what the problem is"
159
				eerror "before your next reboot."
166
				eerror "You must manually configure and run LILO"
160 167
			fi
161 168
		fi
162 169
		echo
......
164 171
	if use !minimal; then
165 172
		echo
166 173
		einfo "Issue 'dolilo' instead of 'lilo' to have a friendly wrapper that"
167
		einfo "handles mounting and unmounting /boot for you. It can do more then"
168
		einfo "that when asked, edit /etc/conf.d/dolilo to harness it's full potential."
174
		einfo "handles mounting and unmounting /boot for you. It can do more, "
175
		einfo "edit /etc/conf.d/dolilo to harness its full potential."
169 176
		echo
170 177
	fi
171 178
}
Thank you!