Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/, doc/
Date: Fri, 28 Aug 2020 20:18:54
Message-Id: 1598632559.8cca1dada7be5625cbdbcf4e8ab14c51d131e099.whissi@gentoo
1 commit: 8cca1dada7be5625cbdbcf4e8ab14c51d131e099
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 28 13:28:33 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 28 16:35:59 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8cca1dad
7
8 defaults/linuxrc: Add gk.udev.debug to run udevd in debug mode
9
10 When gk.udev.debug=yes is set (boolean option), udevd will run in
11 debug mode. Output will be written to /run/initramfs/udevd.log.
12
13 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
14
15 defaults/initrd.defaults | 1 +
16 defaults/linuxrc | 10 +++++++++-
17 doc/genkernel.8.txt | 4 ++++
18 3 files changed, 14 insertions(+), 1 deletion(-)
19
20 diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
21 index fa71ecb..b665355 100644
22 --- a/defaults/initrd.defaults
23 +++ b/defaults/initrd.defaults
24 @@ -96,6 +96,7 @@ GK_SSHD_PIDFILE='/var/run/dropbear.pid'
25 GK_SSHD_PORT=22
26 GK_SSHD_WAIT=
27 GK_UDEV_LOG='/run/initramfs/udevd.log'
28 +GK_UDEV_DEBUG=0
29 GK_UDEV_TIMEOUT=120
30 GK_USERINTERACTION_DISABLED_STATEFILE='/tmp/user-interaction.disabled'
31
32
33 diff --git a/defaults/linuxrc b/defaults/linuxrc
34 index 1a4ddac..b42366f 100644
35 --- a/defaults/linuxrc
36 +++ b/defaults/linuxrc
37 @@ -332,6 +332,14 @@ do
38 fi
39 unset tmp_wait
40 ;;
41 + gk.udev.debug=*)
42 + tmp_enabled=${x#*=}
43 + if is_true "${tmp_enabled}"
44 + then
45 + GK_UDEV_DEBUG=1
46 + fi
47 + unset tmp_enabled
48 + ;;
49 gk.udev.timeout=*)
50 tmp_timeout=${x#*=}
51 if is_int "${tmp_timeout}"
52 @@ -566,7 +574,7 @@ fi
53 good_msg 'Activating udev ...'
54
55 udevd_cmd="run udevd --resolve-names=never"
56 -if is_debug
57 +if [ "${GK_UDEV_DEBUG}" = '1' ]
58 then
59 udevd_cmd="${udevd_cmd} --debug > ${GK_UDEV_LOG} 2>&1 &"
60 else
61
62 diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
63 index d8b9e09..7b96879 100644
64 --- a/doc/genkernel.8.txt
65 +++ b/doc/genkernel.8.txt
66 @@ -721,6 +721,10 @@ recognized by the kernel itself.
67 *gk.net.timeout.interface*=<...>::
68 By default we will wait up to 10 seconds for interface to show up.
69
70 +*gk.udev.debug*=<...>::
71 + This boolean option allows you to run udevd in debug mode. Output
72 + will be logged to '/run/initramfs/udevd.log'.
73 +
74 *gk.udev.timeout*=<...>::
75 By default we will wait up to 120 seconds (UDEV default) for
76 UDEV event queue to become empty.