summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-04-13 00:00:55 -0300
committerSilvio Rhatto <rhatto@riseup.net>2012-04-13 00:00:55 -0300
commitd3ab3e44f02ed24cd2d5f8f3053ea69b8704d33f (patch)
treeff42154754a38d0501d5559f699dd5d372106374 /share
parent73d17146d0d5fd71d4f4aa54a374a87d4577dd36 (diff)
downloadhydra-d3ab3e44f02ed24cd2d5f8f3053ea69b8704d33f.tar.gz
hydra-d3ab3e44f02ed24cd2d5f8f3053ea69b8704d33f.tar.bz2
Using --root-directory on grub-install at provision
Diffstat (limited to 'share')
-rwxr-xr-xshare/hydractl/provision12
1 files changed, 6 insertions, 6 deletions
diff --git a/share/hydractl/provision b/share/hydractl/provision
index ef60edf..2269f73 100755
--- a/share/hydractl/provision
+++ b/share/hydractl/provision
@@ -185,13 +185,13 @@ fi
# Grub.
if [ "$grub" == "y" ]; then
echo "Boot device setup..."
- mkfs.ext3 $boot_device
- mount $boot_device /tmp/debootstrap/boot
+ hydra_safe_run mkfs.ext3 $boot_device
+ hydra_safe_run mount $boot_device /tmp/debootstrap/boot
echo "$boot_device /boot ext3 defaults,errors=remount-ro 0 2" >> /tmp/debootstrap/etc/fstab
echo "Setting up GRUB..."
- chroot /tmp/debootstrap/ apt-get install grub-pc -y
- grub-install --no-floppy "$device"
+ hydra_safe_run chroot /tmp/debootstrap/ apt-get install grub-pc -y
+ hydra_safe_run grub-install --root-directory=/tmp/debootstrap/boot --no-floppy "$device"
mkdir -p /tmp/debootstrap/boot/grub/
cat /tmp/debootstrap/boot/grub/menu.lst <<-EOF
title $hostname (hd0)
@@ -226,11 +226,11 @@ else
kernel_arch="$arch"
fi
-chroot /tmp/debootstrap apt-get install linux-image-2.6-vserver-$kernel_arch -y
+hydra_safe_run chroot /tmp/debootstrap apt-get install linux-image-2.6-vserver-$kernel_arch -y
# Initramfs.
echo "Creating initramfs..."
-chroot /tmp/debootstrap update-initramfs -v -u
+hydra_safe_run chroot /tmp/debootstrap update-initramfs -v -u
# Utils.
echo "Installing basic utilities..."