JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* udevtrigger / udevsettle -> udevadm.

Browse Source 
svn path=/nixos/trunk/; revision=12229
This commit is contained in:
Eelco Dolstra 2008-07-01 08:28:56 +00:00
parent fc877a99a7
commit eaf6b8eb18
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boot/boot-stage-1-init.sh
View File

@ -83,8 +83,8 @@ mknod -m 0666 /dev/null c 1 3
export UDEV_CONFIG_FILE=/udev.conf export UDEV_CONFIG_FILE=/udev.conf
echo 'udev_rules="/no-rules"' > $UDEV_CONFIG_FILE echo 'udev_rules="/no-rules"' > $UDEV_CONFIG_FILE
udevd --daemon udevd --daemon
udevtrigger udevadm trigger
udevsettle udevadm settle
if type -p dmsetup > /dev/null; then if type -p dmsetup > /dev/null; then
echo "dmsetup found, starting device mapper and lvm" echo "dmsetup found, starting device mapper and lvm"
@ -116,7 +116,7 @@ mountFS() {
fi fi
if test -n "$mustCheck"; then if test -n "$mustCheck"; then
FSTAB_FILE="/etc/mtab" fsck -C -a "$device" FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
fsckResult=$? fsckResult=$?
if test $(($fsckResult | 2)) = $fsckResult; then if test $(($fsckResult | 2)) = $fsckResult; then

2
system/system.nix
View File

@ -86,7 +86,7 @@ rec {
fi fi
cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin
cp $udev/sbin/udevd $udev/sbin/udevtrigger $udev/sbin/udevsettle $out/bin cp $udev/sbin/udevd $udev/sbin/udevadm $out/bin
nuke-refs $out/bin/* nuke-refs $out/bin/*
''; # */ ''; # */

6
upstart-jobs/udev.nix
View File

@ -70,13 +70,13 @@ in
# been loaded into the kernel (or for which support is built into # been loaded into the kernel (or for which support is built into
# the kernel). # the kernel).
if ! test -e ${devicesCreated}; then if ! test -e ${devicesCreated}; then
${udev}/sbin/udevtrigger ${udev}/sbin/udevadm trigger
${udev}/sbin/udevsettle # wait for udev to finish ${udev}/sbin/udevadm settle # wait for udev to finish
touch ${devicesCreated} touch ${devicesCreated}
fi fi
# Kill udev, let Upstart restart and monitor it. (This is nasty, # Kill udev, let Upstart restart and monitor it. (This is nasty,
# but we have to run udevtrigger first. Maybe we can use # but we have to run `udevadm trigger' first. Maybe we can use
# Upstart's `binary' keyword, but it isn't implemented yet.) # Upstart's `binary' keyword, but it isn't implemented yet.)
if ! ${procps}/bin/pkill -u root "^udevd$"; then if ! ${procps}/bin/pkill -u root "^udevd$"; then
echo "couldn't stop udevd" echo "couldn't stop udevd"