openstack/training-guides
Code Issues Proposed changes

labs: rename config/scripts.<distro>

Browse Source 
Rename config/scripts.<distro> files to config/scripts.<distro>_base,
making it clear that these distro-specific scripts lists are only
used for the base disk.

Change-Id: I358c2df2c8d3f1ddae4fb26850407d2f6fa360ee
This commit is contained in:
Roger Luethi 2015-01-23 17:41:47 +01:00
parent d99d206262
commit b97d617579
6 changed files with 4 additions and 4 deletions

0
labs/config/scripts.fedora → labs/config/scripts.fedora_base

0
labs/config/scripts.ubuntu → labs/config/scripts.ubuntu_base

2
labs/lib/osbash/lib.fedora-20-x86_64

@ -1,7 +1,7 @@
# Fedora 20 x86_64
# Default scripts for all Fedora base disks
: ${BASE_INSTALL_SCRIPTS:=scripts.fedora}
: ${BASE_INSTALL_SCRIPTS:=scripts.fedora_base}
# Give Fedora 20 installer sufficient RAM
VM_BASE_MEM=1024

2
labs/lib/osbash/lib.ubuntu-12.04.4-server-amd64

@ -1,7 +1,7 @@
# Ubuntu 12.04.4 LTS amd64 server
# Default scripts for all Ubuntu installs
: ${BASE_INSTALL_SCRIPTS:=scripts.ubuntu}
: ${BASE_INSTALL_SCRIPTS:=scripts.ubuntu_base}
#-------------------------------------------------------------------------------
# Booting the operating system installer

2
labs/lib/osbash/lib.ubuntu-14.04-server-amd64

@ -1,7 +1,7 @@
# Ubuntu 14.04 LTS amd64 server
# Default scripts for all Ubuntu installs
: ${BASE_INSTALL_SCRIPTS:=scripts.ubuntu}
: ${BASE_INSTALL_SCRIPTS:=scripts.ubuntu_base}
#-------------------------------------------------------------------------------
# Booting the operating system installer

2
labs/lib/osbash/virtualbox.install_base

@ -94,7 +94,7 @@ function vm_install_base {
autostart osbash/base_fixups.sh
# By default, set by lib/osbash/lib.* to something like scripts.ubuntu
# By default, set by lib/osbash/lib.* to something like scripts.ubuntu_base
autostart_from_config "$BASE_INSTALL_SCRIPTS"
autostart zero_empty.sh shutdown.sh