Skip to content

Commit 5827c9c

Browse files
committed
ubuntu is now a synonym for debian. if ubuntu type is specified,
gen_cloud_template.sh treats it like debian. This might be useful if we later write a script that pushes templates to the cloud and ubuntu is a distro choice
1 parent 34942d7 commit 5827c9c

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

gen_cloud_template.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SCRIPT_BASE_DIR="/usr/share/disk-image-scripts"
2222
PACKAGE_LIST_FILE="addedpacks"
2323
COMPRESS_IMAGE="Y"
2424
TIMEZONE="UTC"
25-
VALID_OS_TYPES="arch debian"
25+
VALID_OS_TYPES="arch debian ubuntu"
2626
DEBMIRROR="http://deb.debian.org/debian/"
2727
DEBDISTRO="stable"
2828
# /Defaults #
@@ -242,7 +242,7 @@ _init_image() {
242242
which pacstrap &> /dev/null || exit_with_error 2 "pacstrap is not installed, may not initialize Debian based environments"
243243
as_root pacstrap "${mount_point}" ${KERNEL} ${BOOTLOADER} ${ARCH_BASE_PACKAGES} ${EXTRAPACKAGES} ${packages_from_file} || exit_with_error 1 "Base Arch Linux install failed. Please check output."
244244
;;
245-
debian)
245+
debian|ubuntu)
246246
# check if debootstrap is installed
247247
which debootstrap &> /dev/null || exit_with_error 2 "debootstrap is not installed, may not initialize Debian based environments"
248248
# debootstrap needs a comma seperated list of packages
@@ -269,7 +269,7 @@ _update_image(){
269269
arch)
270270
_image_shell "pacman -Syu"
271271
;;
272-
debian)
272+
debian|ubuntu)
273273
# Nasty kludge that we can't get both to run in the same choort.
274274
_image_shell "apt update" "apt upgrade"
275275
;;
@@ -392,7 +392,7 @@ EOF
392392

393393
# OS Specific file copy
394394
case ${OSTYPE} in
395-
debian)
395+
debian|ubuntu)
396396
as_root install -Dm 644 "${SCRIPT_BASE_DIR}/debian-syslinux.cfg" "${mount_point}/root/syslinux.cfg"
397397
;;
398398
redhat)

0 commit comments

Comments
 (0)