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() {
68
68
[[ ! -f ${initrd} ]] && initrd=unknown
69
69
[[ ! -f ${kernel} ]] && kernel=unknown
70
70
71
- local log=/var/log/installkernel.log
72
-
73
- einfo " Appending installed kernel to ${log} ..."
74
-
75
71
INSTALLKERNEL_PLUGINS=" ${INSTALLKERNEL_PREINST_PLUGINS: +${INSTALLKERNEL_PREINST_PLUGINS} }${INSTALLKERNEL_POSTINST_PLUGINS} "
76
72
77
73
if [[ -z ${INSTALLKERNEL_CONF_ROOT} ]]; then
@@ -82,7 +78,13 @@ main() {
82
78
fi
83
79
fi
84
80
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=\
86
88
" $( LC_ALL=C date) \t" \
87
89
" gentoo\t" \
88
90
" ${ver:- notset} \t" \
@@ -93,8 +95,10 @@ main() {
93
95
" ${install_dir:- notset} \t" \
94
96
" ${kernel# " ${install_dir} /" } \t" \
95
97
" ${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
98
102
}
99
103
100
104
main
Original file line number Diff line number Diff line change 56
56
[[ ! -f ${INITRD} ]] && INITRD=unknown
57
57
[[ ! -f ${KERNEL} ]] && KERNEL=unknown
58
58
59
- LOG=/var/log/installkernel.log
60
-
61
- [[ ${KERNEL_INSTALL_VERBOSE} == 1 ]] && echo " Appending installed kernel to ${LOG} ..."
62
-
63
59
if [[ -z ${KERNEL_INSTALL_CONF_ROOT} ]]; then
64
60
if [[ -f /etc/kernel/install.conf ]]; then
65
61
KERNEL_INSTALL_CONF_ROOT=/etc/kernel
@@ -68,7 +64,12 @@ if [[ -z ${KERNEL_INSTALL_CONF_ROOT} ]]; then
68
64
fi
69
65
fi
70
66
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=\
72
73
" $( LC_ALL=C date) \t" \
73
74
" systemd\t" \
74
75
" ${KERNEL_VERSION:- notset} \t" \
@@ -79,7 +80,7 @@ echo -e \
79
80
" ${KERNEL_INSTALL_BOOT_ROOT:- notset} \t" \
80
81
" ${KERNEL# " ${KERNEL_INSTALL_BOOT_ROOT} /" } \t" \
81
82
" ${INITRD# " ${KERNEL_INSTALL_BOOT_ROOT} /" } \t" \
82
- " ${KERNEL_INSTALL_PLUGINS:- notset} \t" \
83
- >> " ${LOG} " || exit 1
84
-
83
+ " ${KERNEL_INSTALL_PLUGINS:- notset} "
85
84
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