From 947c33c0f017da1a39ddf31ec64ad9f802967fb9 Mon Sep 17 00:00:00 2001 From: Sven Slootweg Date: Sun, 5 Jan 2014 12:16:51 +0100 Subject: [PATCH] Updated install script to make it work on Debian 7 --- .../slave/command_daemon | 0 installer/slave/grub_deb7.cfg | 202 ++++++++++++++++++ installer/slave/install.py | 39 +++- 3 files changed, 239 insertions(+), 2 deletions(-) rename command_daemon/command_daemon.py => installer/slave/command_daemon (100%) create mode 100644 installer/slave/grub_deb7.cfg diff --git a/command_daemon/command_daemon.py b/installer/slave/command_daemon similarity index 100% rename from command_daemon/command_daemon.py rename to installer/slave/command_daemon diff --git a/installer/slave/grub_deb7.cfg b/installer/slave/grub_deb7.cfg new file mode 100644 index 0000000..e83b17e --- /dev/null +++ b/installer/slave/grub_deb7.cfg @@ -0,0 +1,202 @@ +#! /bin/sh +set -e + +# grub-mkconfig helper script. +# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc. +# +# Modified (C) 2014 Sven Slootweg +# Adapted for use in CVM, for prioritized OpenVZ-specific boot entries. +# +# GRUB is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# GRUB is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GRUB. If not, see . + +prefix="/usr" +exec_prefix="${prefix}" +datarootdir="${prefix}/share" + +. "${datarootdir}/grub/grub-mkconfig_lib" + +export TEXTDOMAIN=grub +export TEXTDOMAINDIR="${datarootdir}/locale" + +CLASS="--class gnu-linux --class gnu --class os" + +if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then + OS="GNU/Linux (CVM)" +else + OS="${GRUB_DISTRIBUTOR} GNU/Linux (CVM)" + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" +fi + +# loop-AES arranges things so that /dev/loop/X can be our root device, but +# the initrds that Linux uses don't like that. +case ${GRUB_DEVICE} in + /dev/loop/*|/dev/loop[0-9]) + GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"` + # We can't cope with devices loop-mounted from files here. + case ${GRUB_DEVICE} in + /dev/*) ;; + *) exit 0 ;; + esac + ;; +esac + +if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ + || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ + || uses_abstraction "${GRUB_DEVICE}" lvm; then + LINUX_ROOT_DEVICE=${GRUB_DEVICE} +else + LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} +fi + +if [ "x`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" = xbtrfs ] \ + || [ "x`stat -f --printf=%T /`" = xbtrfs ]; then + rootsubvol="`make_system_path_relative_to_its_root /`" + rootsubvol="${rootsubvol#/}" + if [ "x${rootsubvol}" != x ]; then + GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}" + fi +fi + +linux_entry () +{ + os="$1" + version="$2" + recovery="$3" + args="$4" + if ${recovery} ; then + title="$(gettext_quoted "%s, with Linux %s (recovery mode)")" + else + title="$(gettext_quoted "%s, with Linux %s")" + fi + printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" + if ! ${recovery} ; then + save_default_entry | sed -e "s/^/\t/" + fi + + # Use ELILO's generic "efifb" when it's known to be available. + # FIXME: We need an interface to select vesafb in case efifb can't be used. + if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then + cat << EOF + load_video +EOF + else + if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then + cat << EOF + load_video +EOF + fi + cat << EOF + set gfxpayload=$GRUB_GFXPAYLOAD_LINUX +EOF + fi + + cat << EOF + insmod gzio +EOF + + if [ x$dirname = x/ ]; then + if [ -z "${prepare_root_cache}" ]; then + prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/")" + fi + printf '%s\n' "${prepare_root_cache}" + else + if [ -z "${prepare_boot_cache}" ]; then + prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" + fi + printf '%s\n' "${prepare_boot_cache}" + fi + message="$(gettext_printf "Loading Linux %s ..." ${version})" + cat << EOF + echo '$message' + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} +EOF + if test -n "${initrd}" ; then + message="$(gettext_printf "Loading initial ramdisk ...")" + cat << EOF + echo '$message' + initrd ${rel_dirname}/${initrd} +EOF + fi + cat << EOF +} +EOF +} + +case x`uname -m` in + xi?86 | xx86_64) + list=`for i in /boot/vmlinuz-*openvz* /vmlinuz-*openvz* /boot/kernel-*openvz* ; do + if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi + done` ;; + *) + list=`for i in /boot/vmlinuz-*openvz* /boot/vmlinux-*openvz* /vmlinuz-*openvz* /vmlinux-*openvz* /boot/kernel-*openvz* ; do + if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi + done` ;; +esac + +prepare_boot_cache= +prepare_root_cache= + +while [ "x$list" != "x" ] ; do + linux=`version_find_latest $list` + echo "Found linux image: $linux" >&2 + basename=`basename $linux` + dirname=`dirname $linux` + rel_dirname=`make_system_path_relative_to_its_root $dirname` + version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` + alt_version=`echo $version | sed -e "s,\.old$,,g"` + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + + initrd= + for i in "initrd.img-${version}" "initrd-${version}.img" \ + "initrd-${version}" "initramfs-${version}.img" \ + "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ + "initrd-${alt_version}" "initramfs-${alt_version}.img" \ + "initramfs-genkernel-${version}" \ + "initramfs-genkernel-${alt_version}"; do + if test -e "${dirname}/${i}" ; then + initrd="$i" + break + fi + done + + config= + for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do + if test -e "${i}" ; then + config="${i}" + break + fi + done + + initramfs= + if test -n "${config}" ; then + initramfs=`grep CONFIG_INITRAMFS_SOURCE= "${config}" | cut -f2 -d= | tr -d \"` + fi + + if test -n "${initrd}" ; then + echo "Found initrd image: ${dirname}/${initrd}" >&2 + elif test -z "${initramfs}" ; then + # "UUID=" magic is parsed by initrd or initramfs. Since there's + # no initrd or builtin initramfs, it can't work here. + linux_root_device_thisversion=${GRUB_DEVICE} + fi + + linux_entry "${OS}" "${version}" false \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${version}" true \ + "single ${GRUB_CMDLINE_LINUX}" + fi + + list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` +done diff --git a/installer/slave/install.py b/installer/slave/install.py index 866d52a..b1c80a1 100644 --- a/installer/slave/install.py +++ b/installer/slave/install.py @@ -1,4 +1,4 @@ -import sys, os, subprocess, stat, shutil, re, urllib +import sys, os, subprocess, stat, shutil, re, urllib, glob import setuplib BOLD_START = '\033[1m' @@ -51,6 +51,9 @@ if os.path.exists("/etc/centos-release"): exit(1) elif os.path.exists("/etc/debian_version"): distro = "debian" + + with open("/etc/debian_version", "r") as f: + debian_version = int(f.read().split(".")[0]) else: sys.stderr.write("This installer only supports Debian and CentOS.\n") exit(1) @@ -304,7 +307,15 @@ else: if architecture == "x86_64": packages.append("linux-image-openvz-amd64") elif architecture == "i386" or architecture == "i686": - packages.append("linux-image-openvz-686") + packages.append("linux-image-openvz-686") # This might fail on deb7! + + if debian_version >= 7: + with open("/etc/apt/sources.list.d/openvz-rhel6.list", "w") as f: + f.write("deb http://download.openvz.org/debian wheezy main") + + subprocess.call('wget --output-document="-" http://ftp.openvz.org/debian/archive.key | apt-key add -', shell=True, stdout=stfu, stderr=stfu) + + packages.append("ploop") packages.append("vzdump") subprocess.call(["apt-get", "update", "-y"], stdout=stfu, stderr=stfu) @@ -330,6 +341,30 @@ else: sys.stdout.write("Configuration for sysctl updated.\n") + if debian_version >= 7: + # Starting from Debian 7, the OpenVZ kernel is no longer set as the default boot option. This + # code will copy a GRUB configuration file template, with the appropriate kernel path, and + # insert it before the regular boot options. This way, the OpenVZ kernel will be default. + try: + kernel_name = [fname for fname in glob.glob("/boot/vmlinuz-*") if "openvz" in fname][0].split("/vmlinuz-")[-1] + except IndexError, e: + # No suitable kernel found! TODO: Error out + sys.stderr.write("ERROR: Could not find an OpenVZ kernel image to add to the GRUB\n") + sys.stderr.write("configuration! Most likely, installation failed. Aborting...\n") + exit(1) + + setuplib.copy_file("grub_deb7.cfg", "/etc/grub.d/06_CVM_openvz", True, 0, 0, "u+rwx g+rx o+rx") + + setuplib.set_modes("/etc/grub.d/06_CVM_openvz", "u+rwx g+rx o+rx") + + result = subprocess.call(["update-grub"], stdout=stfu, stderr=stfu) + + if result != 0: + sys.stderr.write("WARNING: Failed to update GRUB configuration. Please ensure you have a\n") + sys.stderr.write(" valid GRUB configuration before rebooting, or you may brick your server.\n") + else: + sys.stdout.write("Configured GRUB to automatically boot into OpenVZ.\n") + if os.path.exists("/etc/grub.d/06_OVHkernel"): # OVH likes inserting a custom kernel before the standard installed kernels, and this # breaks the default kernel booting, leading to the OpenVZ kernel never being booted.