kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

prepare for future udev rules.d location 

future udev will have rules.d in /dev/.run/udev/rules.d

Also remove compat symlinks, because we want to get rid of these files
anyway.
master
Harald Hoyer 2011-03-10 19:18:14 +01:00
parent 1e2a167fe6
commit 77e607a3a7
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules.d/90dmsquash-live/dmsquash-live-genrules.sh
View File

@ -14,7 +14,7 @@ case "$root" in
${root#live:/dev/} ${root#live:/dev/}
printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \ printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
${root#live:/dev/} ${root#live:/dev/}
} >> /etc/udev/rules.d/99-live-squash.rules } >> $UDEVRULESD/99-live-squash.rules
echo '[ -e /dev/root ]' > /initqueue-finished/dmsquash.sh echo '[ -e /dev/root ]' > /initqueue-finished/dmsquash.sh
;; ;;
live:*) live:*)

2
modules.d/95resume/resume-genrules.sh
View File

@ -17,7 +17,7 @@ if [ -n "$resume" ]; then
${resume#/dev/}; ${resume#/dev/};
printf "SYMLINK==\"%s\", ACTION==\"add|change\", SYMLINK+=\"/dev/resume\"\n" \ printf "SYMLINK==\"%s\", ACTION==\"add|change\", SYMLINK+=\"/dev/resume\"\n" \
${resume#/dev/}; ${resume#/dev/};
} >> /dev/.udev/rules.d/99-resume-link.rules } >> $UDEVRULESD/99-resume-link.rules


{ {
if [ -x /usr/sbin/resume ]; then if [ -x /usr/sbin/resume ]; then

2
modules.d/95rootfs-block/block-genrules.sh
View File

@ -8,7 +8,7 @@ if [ "${root%%:*}" = "block" ]; then
${root#block:/dev/} ${root#block:/dev/}
printf 'SYMLINK=="%s", SYMLINK+="root"\n' \ printf 'SYMLINK=="%s", SYMLINK+="root"\n' \
${root#block:/dev/} ${root#block:/dev/}
} >> /dev/.udev/rules.d/99-root.rules } >> $UDEVRULESD/99-root.rules
printf '[ -e "%s" ] && { ln -s "%s" /dev/root 2>/dev/null; rm "$job"; }\n' \ printf '[ -e "%s" ] && { ln -s "%s" /dev/root 2>/dev/null; rm "$job"; }\n' \
"${root#block:}" "${root#block:}" >> /initqueue-settled/blocksymlink.sh "${root#block:}" "${root#block:}" >> /initqueue-settled/blocksymlink.sh

24
modules.d/99base/init
View File

@ -108,15 +108,23 @@ ln -s /proc/self/fd/2 /dev/stderr >/dev/null 2>&1
mkdir -m 0755 /dev/shm /dev/pts /dev/.run mkdir -m 0755 /dev/shm /dev/pts /dev/.run
mount -t devpts -o gid=5,mode=620,noexec,nosuid devpts /dev/pts >/dev/null 2>&1 mount -t devpts -o gid=5,mode=620,noexec,nosuid devpts /dev/pts >/dev/null 2>&1
mount -t tmpfs -o mode=1777,nosuid,nodev tmpfs /dev/shm >/dev/null 2>&1 mount -t tmpfs -o mode=1777,nosuid,nodev tmpfs /dev/shm >/dev/null 2>&1

# create /dev/.run which will be /var/run
# creat /dev/.run which will be /var/run
mount -t tmpfs -o mode=0755,nodev,noexec,nosuid tmpfs /dev/.run >/dev/null 2>&1 mount -t tmpfs -o mode=0755,nodev,noexec,nosuid tmpfs /dev/.run >/dev/null 2>&1
mkdir -m 0755 /dev/.run/udev /dev/.run/udev/rules.d /dev/.run/initramfs


# create compat symlinks mkdir -m 0755 /dev/.run/initramfs
ln -s .run/initramfs /dev/.initramfs
ln -s /dev/.run /var/run UDEVVERSION=$(udevadm --version)
ln -s .run/udev /dev/.udev if [ $UDEVVERSION -ge 999 ]; then
# newer versions of udev use /dev/.run/udev/rules.d
mkdir -m 0755 /dev/.run/udev /dev/.run/udev/rules.d
export UDEVRULESD=/dev/.run/udev/rules.d
else
mkdir -m 0755 /dev/.udev /dev/.udev/rules.d
export UDEVRULESD=/dev/.udev/rules.d
fi

[ -e /var/run ] && rm -fr /var/run
ln -fs /dev/.run /var/run


if getargbool 0 rd.debug -y rdinitdebug -y rdnetdebug; then if getargbool 0 rd.debug -y rdinitdebug -y rdnetdebug; then
getarg quiet && DRACUT_QUIET="yes" getarg quiet && DRACUT_QUIET="yes"
@ -129,8 +137,6 @@ fi


setdebug setdebug


UDEVVERSION=$(udevadm --version)

source_conf /etc/conf.d source_conf /etc/conf.d


# run scriptlets to parse the command line # run scriptlets to parse the command line