File tree Expand file tree Collapse file tree 2 files changed +20
-15
lines changed Expand file tree Collapse file tree 2 files changed +20
-15
lines changed Original file line number Diff line number Diff line change @@ -68,10 +68,6 @@ main() {
6868 [[ ! -f ${initrd} ]] && initrd=unknown
6969 [[ ! -f ${kernel} ]] && kernel=unknown
7070
71- local log=/var/log/installkernel.log
72-
73- einfo " Appending installed kernel to ${log} ..."
74-
7571 INSTALLKERNEL_PLUGINS=" ${INSTALLKERNEL_PREINST_PLUGINS: +${INSTALLKERNEL_PREINST_PLUGINS} }${INSTALLKERNEL_POSTINST_PLUGINS} "
7672
7773 if [[ -z ${INSTALLKERNEL_CONF_ROOT} ]]; then
@@ -82,7 +78,13 @@ main() {
8278 fi
8379 fi
8480
85- echo -e \
81+ local state=/var/lib/installkernel
82+ local log=/var/log/installkernel.log
83+
84+ einfo " Appending installed kernel to ${log} ..."
85+
86+
87+ local logline=\
8688" $( LC_ALL=C date) \t" \
8789" gentoo\t" \
8890" ${ver:- notset} \t" \
@@ -93,8 +95,10 @@ main() {
9395" ${install_dir:- notset} \t" \
9496" ${kernel# " ${install_dir} /" } \t" \
9597" ${initrd# " ${install_dir} /" } \t" \
96- " ${INSTALLKERNEL_PLUGINS:- notset} \t" \
97- >> " ${log} " || exit 1
98+ " ${INSTALLKERNEL_PLUGINS:- notset} "
99+
100+ echo -e " ${logline} " > " ${state} " || exit 1
101+ echo -e " ${logline} " >> " ${log} " || exit 1
98102}
99103
100104main
Original file line number Diff line number Diff line change 5656[[ ! -f ${INITRD} ]] && INITRD=unknown
5757[[ ! -f ${KERNEL} ]] && KERNEL=unknown
5858
59- LOG=/var/log/installkernel.log
60-
61- [[ ${KERNEL_INSTALL_VERBOSE} == 1 ]] && echo " Appending installed kernel to ${LOG} ..."
62-
6359if [[ -z ${KERNEL_INSTALL_CONF_ROOT} ]]; then
6460 if [[ -f /etc/kernel/install.conf ]]; then
6561 KERNEL_INSTALL_CONF_ROOT=/etc/kernel
@@ -68,7 +64,12 @@ if [[ -z ${KERNEL_INSTALL_CONF_ROOT} ]]; then
6864 fi
6965fi
7066
71- echo -e \
67+ STATE=/var/lib/installkernel
68+ LOG=/var/log/installkernel.log
69+
70+ [[ ${KERNEL_INSTALL_VERBOSE} == 1 ]] && echo " Appending installed kernel to ${LOG} ..."
71+
72+ LOGLINE=\
7273" $( LC_ALL=C date) \t" \
7374" systemd\t" \
7475" ${KERNEL_VERSION:- notset} \t" \
@@ -79,7 +80,7 @@ echo -e \
7980" ${KERNEL_INSTALL_BOOT_ROOT:- notset} \t" \
8081" ${KERNEL# " ${KERNEL_INSTALL_BOOT_ROOT} /" } \t" \
8182" ${INITRD# " ${KERNEL_INSTALL_BOOT_ROOT} /" } \t" \
82- " ${KERNEL_INSTALL_PLUGINS:- notset} \t" \
83- >> " ${LOG} " || exit 1
84-
83+ " ${KERNEL_INSTALL_PLUGINS:- notset} "
8584
85+ echo -e " ${LOGLINE} " > " ${STATE} " || exit 1
86+ echo -e " ${LOGLINE} " >> " ${LOG} " || exit 1
You can’t perform that action at this time.
0 commit comments