Hi, Pratyush On 03/08/16 at 02:14pm, Pratyush Anand wrote: > Recently following patches have been added in upstream Linux kernel, which > (1) fixes parent of watchdog_device so that > /sys/class/watchdog/watchdogn/device is populated. (2) adds some sysfs > device attributes so that different watchdog status can be read. > > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=6551881c86c791237a3bebf11eb3bd70b60ea782 > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=906d7a5cfeda508e7361f021605579a00cd82815 > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=33b711269ade3f6bc9d9d15e4343e6fa922d999b > > With the above support, now we can find out whether a watchdog is active or > not. We can also find out the driver/module responsible for that watchdog > device. > > Proposed patch uses above support and then adds module of active watchdog > in initramfs generated by dracut for hostonly mode. Kernel module for > inactive watchdog will be added as well for none hostonly mode. > > When an user does not want to add kernel module, then one should exclude > complete dracut watchdog module with --omit. > > Testing: > -- When watchdog is active watchdog modules were added > # cat /sys/class/watchdog/watchdog0/identity > iTCO_wdt > # cat /sys/class/watchdog/watchdog0/state > active > # dracut --hostonly initramfs-test.img -a watchdog > # lsinitrd initramfs-test.img | grep iTCO > -rw-r--r-- 1 root root 9100 Feb 24 09:19 usr/lib/modules/.../kernel/drivers/watchdog/iTCO_vendor_support.ko > -rw-r--r-- 1 root root 19252 Feb 24 09:19 usr/lib/modules/.../kernel/drivers/watchdog/iTCO_wdt.ko > > -- When watchdog is inactive then watchdog modules were not added > # cat /sys/class/watchdog/watchdog0/state > inactive > # dracut --hostonly initramfs-test.img -a watchdog > # lsinitrd initramfs-test.img | grep iTCO > > -- When watchdog is inactive, but no hostonly mode, watchdog modules were added > # cat /sys/class/watchdog/watchdog0/state > inactive > # dracut --no-hostonly initramfs-test.img -a watchdog > # lsinitrd initramfs-test.img | grep iTCO > -rw-r--r-- 1 root root 9100 Feb 24 09:19 usr/lib/modules/.../kernel/drivers/watchdog/iTCO_vendor_support.ko > -rw-r--r-- 1 root root 19252 Feb 24 09:19 usr/lib/modules/.../kernel/drivers/watchdog/iTCO_wdt.ko > > Signed-off-by: Pratyush Anand <panand@xxxxxxxxxx> > Cc: Dave Young <dyoung@xxxxxxxxxx> > Cc: Don Zickus <dzickus@xxxxxxxxxx> > Cc: Harald Hoyer <harald@xxxxxxxxxx> > --- > modules.d/04watchdog/module-setup.sh | 28 ++++++++++++++++++++++++++++ > 1 file changed, 28 insertions(+) > > diff --git a/modules.d/04watchdog/module-setup.sh b/modules.d/04watchdog/module-setup.sh > index 7ec757aec032..0ffaa9658502 100755 > --- a/modules.d/04watchdog/module-setup.sh > +++ b/modules.d/04watchdog/module-setup.sh > @@ -32,3 +32,31 @@ install() { > inst_multiple -o wdctl > } > > +installkernel() { > + [[ -d /sys/class/watchdog/ ]] || return > + for dir in /sys/class/watchdog/*; do > + [[ -d "$dir" ]] || continue > + [[ -f "$dir/state" ]] || continue > + active=$(< "$dir/state") > + ! [[ $hostonly ]] || [[ "$active" = "active" ]] || continue Even if for devices which is not active it is still a hostonly device because it being detected by kernel running on the host? But I will not stick to this issue, I'm fine if Harald is ok with it because I do not know how to handle non hostonly in a proper way .. Thanks Dave -- To unsubscribe from this list: send the line "unsubscribe initramfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
