From 22f6b0eac7b45b91660f62f33c04ac29ae4499e6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 8 Apr 2009 03:23:09 +0200 Subject: [PATCH] triggers: there's no need to call chroot anymore. --HG-- extra : convert_revision : cea0ba9863c0934d8d876801989947e03588d835 --- triggers/initramfs-tools | 18 +++++------------- triggers/x11-fonts | 2 +- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/triggers/initramfs-tools b/triggers/initramfs-tools index a2e1e10951f..9d25d563243 100755 --- a/triggers/initramfs-tools +++ b/triggers/initramfs-tools @@ -21,19 +21,11 @@ run) echo "Running $trigger trigger..." - if [ "$(pwd)" = "/" ]; then - mntproc_cmd="mount -t proc proc /proc" - umntproc_cmd="umount /proc" - mntsys_cmd="mount -t sysfs none /sys" - umntsys_cmd="umount /sys" - initramfs_cmd="update-initramfs" - else - mntproc_cmd="chroot . mount -t proc proc ./proc" - umntproc_cmd="chroot . umount ./proc" - mntsys_cmd="chroot . mount -t sysfs none ./sys" - umntsys_cmd="chroot . umount ./sys" - initramfs_cmd="chroot . update-initramfs" - fi + mntproc_cmd="mount -t proc proc /proc" + umntproc_cmd="umount /proc" + mntsys_cmd="mount -t sysfs none /sys" + umntsys_cmd="umount /sys" + initramfs_cmd="update-initramfs" if [ "$3" = "kernel" -a ! -f ./var/lib/initramfs-tools/$4 ]; then initramfs_cmd="$initramfs_cmd -c -k $4" diff --git a/triggers/x11-fonts b/triggers/x11-fonts index 88d5b27e516..2bf749883f9 100755 --- a/triggers/x11-fonts +++ b/triggers/x11-fonts @@ -35,7 +35,7 @@ run) echo "Building ${dir}/fonts.scale..." ${mkfontscale} .${dir} || exit $? echo "Updating fontconfig's cache..." - chroot . ${fccache} .${dir} 2>/dev/null + ${fccache} .${dir} 2>/dev/null done ;; pre-remove)