Skip to content

systemvm: export $TYPE before patching ssvm/cpvm #2855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 3 commits into from
Sep 21, 2018
Merged

systemvm: export $TYPE before patching ssvm/cpvm #2855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dde260a
systemvm: export $TYPE before patching ssvm/cpvm
yadvr Sep 19, 2018
451bc45
update checksums and version
yadvr Sep 20, 2018
31187cd
fix CMDLINE in postinit.sh
yadvr Sep 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,12 @@ private void updateSystemVmTemplates(final Connection conn) {

final Map<Hypervisor.HypervisorType, String> newTemplateChecksum = new HashMap<Hypervisor.HypervisorType, String>() {
{
put(Hypervisor.HypervisorType.KVM, "f44242570ae4a0b16c4c2eb2cb71fe45");
put(Hypervisor.HypervisorType.XenServer, "afcc31ab9f7635885cd83600eafbbe7f");
put(Hypervisor.HypervisorType.VMware, "54449e31530f14af930c80a3155a308f");
put(Hypervisor.HypervisorType.Hyperv, "7785df30fdbbacdead5acbfc15ae2c98");
put(Hypervisor.HypervisorType.LXC, "f44242570ae4a0b16c4c2eb2cb71fe45");
put(Hypervisor.HypervisorType.Ovm3, "81a6cd8d07fad910824f040f73ce03e3");
put(Hypervisor.HypervisorType.KVM, "6d12cc764cd7d64112d8c35d70923eb1");
put(Hypervisor.HypervisorType.XenServer, "6e8b3ae84ca8145736d1d7d3f7546e65");
put(Hypervisor.HypervisorType.VMware, "e981f8cb951688efd93481913198c9cc");
put(Hypervisor.HypervisorType.Hyperv, "e9032635ffba021371780307162551b9");
put(Hypervisor.HypervisorType.LXC, "6d12cc764cd7d64112d8c35d70923eb1");
put(Hypervisor.HypervisorType.Ovm3, "c4a91f8e52e4531a1c2a9a17c530d5fe");
}
};

Expand Down
6 changes: 5 additions & 1 deletion systemvm/debian/opt/cloud/bin/setup/cloud-early-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@ get_boot_params() {
esac
}

get_systemvm_type() {
export TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
}

patch() {
local PATCH_MOUNT=/media/cdrom
local patchfile=$PATCH_MOUNT/cloud-scripts.tgz
Expand Down Expand Up @@ -216,11 +220,11 @@ start() {

config_guest
get_boot_params
get_systemvm_type
patch
sync
sysctl -p

export TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
log_it "Configuring systemvm type=$TYPE"

if [ -f "/opt/cloud/bin/setup/$TYPE.sh" ]; then
Expand Down
2 changes: 1 addition & 1 deletion systemvm/debian/opt/cloud/bin/setup/postinit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# Eject cdrom if any
eject || true

TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
TYPE=$(grep -Po 'type=\K[a-zA-Z]*' /var/cache/cloud/cmdline)
if [ "$TYPE" == "router" ] || [ "$TYPE" == "vpcrouter" ] || [ "$TYPE" == "dhcpsrvr" ]
then
if [ -x /opt/cloud/bin/update_config.py ]
Expand Down
2 changes: 1 addition & 1 deletion tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
set -e
set -x

CLOUDSTACK_RELEASE=4.11.1
CLOUDSTACK_RELEASE=4.11.2

function configure_apache2() {
# Enable ssl, rewrite and auth
Expand Down