diff --git "a/docs/use/devmaster\346\233\277\344\273\243udev\350\277\220\350\241\214/install_devmaster.sh" "b/docs/use/devmaster\346\233\277\344\273\243udev\350\277\220\350\241\214/install_devmaster.sh" index 49ce206810412b2296ac8d90b6c3c58ba43f4728..10dfdd9a886bac76d3e48f1842bbdc141479e450 100644 --- "a/docs/use/devmaster\346\233\277\344\273\243udev\350\277\220\350\241\214/install_devmaster.sh" +++ "b/docs/use/devmaster\346\233\277\344\273\243udev\350\277\220\350\241\214/install_devmaster.sh" @@ -14,7 +14,7 @@ etc_dir=exts/devmaster/config etc_rules_dir=${etc_dir}/rules.d etc_netconf_dir=${etc_dir}/network.d -dracut_modules=exts/devmaster/dracut_modules/95devmaster +dracut_modules=exts/devmaster/dracut_modules/98devmaster etc_conf_install_dir=/etc/devmaster etc_netconf_install_dir=${etc_conf_install_dir}/network.d @@ -51,6 +51,6 @@ test -f ${sysinit_target_dir}/udevd.service && unlink ${sysinit_target_dir}/udev test -f ${multi_user_target_dir}/udev-trigger.service && unlink ${multi_user_target_dir}/udev-trigger.service # Install dracut module of devmaster -install -Dm0755 -t /lib/dracut/modules.d/95devmaster ${dracut_modules}/* || exit 1 +install -Dm0755 -t /lib/dracut/modules.d/98devmaster ${dracut_modules}/* || exit 1 sync diff --git "a/docs/use/devmaster\346\233\277\344\273\243udev\350\277\220\350\241\214/readme.md" "b/docs/use/devmaster\346\233\277\344\273\243udev\350\277\220\350\241\214/readme.md" index 6e171e40947a364030e81882d401e1b6a11493e2..aadb07a8362137fac9527328072f26a5f9c7259e 100644 --- "a/docs/use/devmaster\346\233\277\344\273\243udev\350\277\220\350\241\214/readme.md" +++ "b/docs/use/devmaster\346\233\277\344\273\243udev\350\277\220\350\241\214/readme.md" @@ -34,5 +34,5 @@ Linux localhost.localdomain 5.10.0-60.18.0.50.oe2203.x86_64 #1 SMP Wed Mar 30 03 devmaster提供了dracut模块,用于制作initramfs时替换默认的udev组件。安装devmaster后,执行以下命令制作initramfs: ```shell -# dracut -f --omit "systemd systemd-initrd systemd-networkd dracut-systemd rngd dbus-daemon dbus network-manager rngd plymouth" --add "devmaster" +# dracut -f --omit "systemd systemd-initrd systemd-networkd dracut-systemd rngd dbus-daemon dbus network-manager plymouth" --add "devmaster" ``` diff --git "a/docs/use/devmaster\346\233\277\344\273\243udev\350\277\220\350\241\214/uninstall_devmaster.sh" "b/docs/use/devmaster\346\233\277\344\273\243udev\350\277\220\350\241\214/uninstall_devmaster.sh" index 23367c1d9eac7d9d74cc8d9869eee50967a78e4f..f310dbfde3538fd193c70645085f27bc1962d718 100644 --- "a/docs/use/devmaster\346\233\277\344\273\243udev\350\277\220\350\241\214/uninstall_devmaster.sh" +++ "b/docs/use/devmaster\346\233\277\344\273\243udev\350\277\220\350\241\214/uninstall_devmaster.sh" @@ -9,7 +9,7 @@ etc_rules_install_dir=${etc_conf_install_dir}/rules.d lib_devmaster_dir=/lib/devmaster -dracut_modules=/lib/dracut/modules.d/95devmaster +dracut_modules=/lib/dracut/modules.d/98devmaster service_install_dir=/lib/sysmaster/system sysinit_target_dir=/etc/sysmaster/system/sysinit.target.wants diff --git a/exts/devmaster/dracut_modules/95devmaster/init.sh b/exts/devmaster/dracut_modules/98devmaster/init.sh similarity index 100% rename from exts/devmaster/dracut_modules/95devmaster/init.sh rename to exts/devmaster/dracut_modules/98devmaster/init.sh diff --git a/exts/devmaster/dracut_modules/95devmaster/module-setup.sh b/exts/devmaster/dracut_modules/98devmaster/module-setup.sh similarity index 73% rename from exts/devmaster/dracut_modules/95devmaster/module-setup.sh rename to exts/devmaster/dracut_modules/98devmaster/module-setup.sh index f316debc74ae291151993b497b02c9b8031eb583..09d7b2971eb056edb33cd5d5a4e9a1234ca2f172 100755 --- a/exts/devmaster/dracut_modules/95devmaster/module-setup.sh +++ b/exts/devmaster/dracut_modules/98devmaster/module-setup.sh @@ -2,11 +2,16 @@ check() { require_binaries devctl || return 1 - return 0 + return 255 } # called by dracut install() { + rm -f "${initdir}${systemdutildir}"/systemd-udevd \ + "${initdir}"/bin/udevadm \ + "${initdir}"/sbin/udevd \ + "${initdir}"/"${udevdir}"/udevd + inst_script "$moddir/init.sh" "/init" inst_multiple devctl diff --git a/exts/libudev/src/libudev_monitor.rs b/exts/libudev/src/libudev_monitor.rs index 81b8c9d141fb99c85582a7999618c067b28c475e..db9c993212a422ec69dbe7ca46f990ca4f25894b 100644 --- a/exts/libudev/src/libudev_monitor.rs +++ b/exts/libudev/src/libudev_monitor.rs @@ -189,7 +189,7 @@ pub extern "C" fn udev_monitor_set_receive_buffer_size( ) -> ::std::os::raw::c_int { let m: &mut udev_monitor = unsafe { transmute(&mut *udev_monitor) }; - if let Err(e) = basic::socket_util::set_receive_buffer(m.monitor.borrow().fd(), size as usize) { + if let Err(e) = basic::socket::set_receive_buffer(m.monitor.borrow().fd(), size as usize) { return e.get_errno() as i32; }