summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-04-13 10:33:51 -0300
committerSilvio Rhatto <rhatto@riseup.net>2012-04-13 10:33:51 -0300
commitd99c33ac5bbee61c3f9f53eee8156fd57fa12553 (patch)
tree72a55b2f50680cd368b71fa51bb4a1e7522b2516
parent3ce7b1337482c20ac6f81e3b8bca0fdae549655f (diff)
downloadhydra-d99c33ac5bbee61c3f9f53eee8156fd57fa12553.tar.gz
hydra-d99c33ac5bbee61c3f9f53eee8156fd57fa12553.tar.bz2
GRUB2 config format at provision
-rw-r--r--lib/hydra/misc2
-rwxr-xr-xshare/hydractl/provision20
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/hydra/misc b/lib/hydra/misc
index e19a8fa..28e73e4 100644
--- a/lib/hydra/misc
+++ b/lib/hydra/misc
@@ -2,7 +2,7 @@
# Set needed environment variables and do basic checks
function hydra_set_env {
- export COMMIT="d3ab3e44f02ed24cd2d5f8f3053ea69b8704d33f"
+ export COMMIT="3ce7b1337482c20ac6f81e3b8bca0fdae549655f"
export CONFIG="$HOME/.hydra/config"
export ACTION="$1"
diff --git a/share/hydractl/provision b/share/hydractl/provision
index 290395c..0ab634f 100755
--- a/share/hydractl/provision
+++ b/share/hydractl/provision
@@ -193,16 +193,16 @@ if [ "$grub" == "y" ]; then
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)
-root (hd0,1)
-kernel /vmlinuz-2.6.26-2-vserver-amd64 root=/dev/mapper/root ro quiet rootdelay=10
-initrd /initrd.img-2.6.26-2-vserver-amd64
-
-title $hostname (hd0) (single)
-root (hd0,1)
-kernel /vmlinuz-2.6.26-2-vserver-amd64 root=/dev/mapper/root ro single rootdelay=10
-initrd /initrd.img-2.6.26-2-vserver-amd64
+ cat /tmp/debootstrap/boot/grub/grub.cfg <<-EOF
+set menu_color_normal=white/blue
+set menu_color_highlight=yellow/red
+
+menuentry 'Standard: $hostname Debian Server' --class debian --class gnu-linux --class gnu --class os {
+ echo 'Debian Server $hostname...'
+ linux /vmlinuz-2.6.32-5-vserver-amd64 root=/dev/mapper/root ro
+ echo 'Loading initial ramdisk...'
+ initrd /initrd.img-2.6.32-5-vserver-amd64-server
+}
EOF
fi