shaba/dracut
1
0
Fork 0
mirror of https://github.com/dracutdevs/dracut.git synced 2024-10-27 17:55:47 +03:00
Code Issues Projects Releases Wiki Activity

fixed install locations for udev rules and change to IMPORT{builtin}

Browse Source
This commit is contained in:
Harald Hoyer 2012-07-27 11:55:31 +02:00
parent 82b1739dce
commit 24a38bc1cb
7 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules.d/90btrfs/module-setup.sh
View File

@ -33,6 +33,7 @@ install() {
inst_rules "$moddir/80-btrfs.rules"
inst_script "$moddir/btrfs_finished.sh" /sbin/btrfs_finished
inst_script "$moddir/btrfs_timeout.sh" /sbin/btrfs_timeout
dracut_install btrfs btrfsck
dracut_install btrfsck
inst $(command -v btrfs) /sbin/btrfs
}

3
modules.d/90dmraid/module-setup.sh
View File

@ -52,7 +52,8 @@ depends() {
install() {
local _i
dracut_install dmraid
dracut_install -o partx kpartx
dracut_install -o kpartx
inst $(command -v partx) /sbin/partx
inst "$moddir/dmraid.sh" /sbin/dmraid_scan

6
modules.d/90mdraid/module-setup.sh
View File

@ -43,8 +43,10 @@ installkernel() {
}
install() {
dracut_install mdadm cat
dracut_install -o mdmon partx
dracut_install cat
dracut_install -o mdmon
inst $(command -v partx) /sbin/partx
inst $(command -v mdadm) /sbin/mdadm
# XXX: mdmon really needs to run as non-root?
# If so, write only the user it needs in the initrd's /etc/passwd (and maybe /etc/group)

5
modules.d/90multipath/module-setup.sh
View File

@ -73,7 +73,6 @@ install() {
dracut_install -o \
dmsetup \
kpartx \
partx \
mpath_wait \
multipath \
multipathd \
@ -83,10 +82,12 @@ install() {
/etc/multipath.conf \
/etc/multipath/*
inst $(command -v partx) /sbin/partx
inst_libdir_file "libmultipath*" "multipath/*"
inst_hook pre-trigger 02 "$moddir/multipathd.sh"
inst_hook cleanup 02 "$moddir/multipathd-stop.sh"
inst_rules 40-multipath.rules 65-multipath.rules 66-kpartx.rules
inst_rules 40-multipath.rules 62-multipath.rules 65-multipath.rules 66-kpartx.rules
}

8
modules.d/95udev-rules/59-persistent-storage.rules
View File

@ -1,8 +1,8 @@
SUBSYSTEM!="block", GOTO="ps_end"
ACTION!="add|change", GOTO="ps_end"
KERNEL=="cciss[0-9]*", IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
KERNEL=="nbd[0-9]*", IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
KERNEL=="cciss[0-9]*", IMPORT{builtin}="blkid"
KERNEL=="nbd[0-9]*", IMPORT{builtin}="blkid"
KERNEL!="md[0-9]*|md_d[0-9]*|md/*", KERNEL!="md*", GOTO="md_end"
@ -19,7 +19,7 @@ ATTR{md/array_state}=="|clear|inactive", GOTO="md_end"
LABEL="md_ignore_state"
IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
IMPORT{builtin}="blkid"
OPTIONS+="link_priority=100"
OPTIONS+="watch"
LABEL="md_end"
@ -32,7 +32,7 @@ ENV{DM_NAME}!="?*", GOTO="ps_end"
ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="ps_end"
ENV{DM_UUID}=="CRYPT-TEMP-?*", GOTO="ps_end"
ENV{DM_UUID}!="?*", ENV{DM_NAME}=="temporary-cryptsetup-?*", GOTO="ps_end"
IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
IMPORT{builtin}="blkid"
LABEL="ps_end"

2
modules.d/95udev-rules/61-persistent-storage.rules
View File

@ -10,7 +10,7 @@ GOTO="pss_end"
LABEL="do_pss"
# by-path (parent device path)
ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="", DEVPATH!="*/virtual/*", IMPORT{program}="path_id %p"
ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="", DEVPATH!="*/virtual/*", IMPORT{builtin}="path_id"
ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}"
ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"

4
modules.d/99base/module-setup.sh
View File

@ -13,8 +13,10 @@ depends() {
install() {
local _d
dracut_install mount mknod mkdir modprobe pidof sleep chroot \
dracut_install mount mknod mkdir pidof sleep chroot \
sed ls flock cp mv dmesg rm ln rmmod mkfifo umount readlink setsid
inst $(command -v modprobe) /sbin/modprobe
dracut_install -o less
if [ ! -e "${initdir}/bin/sh" ]; then
dracut_install bash