diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21dbccb..7b66fee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ image: docker:latest variables: GIT_STRATEGY: fetch GIT_SUBMODULE_STRATEGY: recursive - PACKER_VERSION: 1.2.0 + PACKER_VERSION: 1.4.3 ANNOUNCE: http://labsync.lab.fablab-nea.de:6969/announce WEBSEED: http://labsync.lab.fablab-nea.de/labsync/$CI_COMMIT_REF_NAME/$CI_PIPELINE_ID/images DOCKER_IMAGE_BUILDER: ${CI_REGISTRY_IMAGE}/labsync-builder:$CI_COMMIT_REF_SLUG diff --git a/Makefile b/Makefile index c6b559e..918a31c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PACKER_VERSION ?= 1.3.5 +PACKER_VERSION ?= 1.4.3 ANNOUNCE ?= http://10.2.2.1:6969/announce WEBSEED ?= http://10.2.2.1 diff --git a/packer/ansible/roles/labsync/files/labsync-install-localboot.sh b/packer/ansible/roles/labsync/files/labsync-install-localboot.sh index e496484..e5a39cc 100755 --- a/packer/ansible/roles/labsync/files/labsync-install-localboot.sh +++ b/packer/ansible/roles/labsync/files/labsync-install-localboot.sh @@ -14,6 +14,6 @@ if [ -z "$localboot" ]; then sed -i 's/^\(GRUB_DEVICE=\).*$/\1""/' /usr/sbin/grub-mkconfig #sed -i 's/^\(GRUB_CMDLINE_LINUX_DEFAULT=\).*$/\1'"'quiet boot=labsync labsync_localboot=\"$LABSYNC\"'/" /etc/default/grub sed -i 's/^\(GRUB_CMDLINE_LINUX=\).*$/\1'"'boot=labsync labsync_localboot=\"$LABSYNC\"'/" /etc/default/grub - sed -i 's/^\(GRUB_TIMEOUT\)=.*$/\1=0/' /etc/default/grub + sed -i 's/^\(GRUB_TIMEOUT\)=.*$/\1=1/' /etc/default/grub update-grub fi diff --git a/packer/initramfs/labsync b/packer/initramfs/labsync index 2b92337..b9f20db 100755 --- a/packer/initramfs/labsync +++ b/packer/initramfs/labsync @@ -154,7 +154,7 @@ PARTTABLE lvm vgcreate "$vg_name" "$pv_device" fi - lvm lvchange -ay vglab + lvm lvchange -ay "$vg_name" labsync_create_or_resize_lv "$vg_name" "$lv_name_sqashfs" $((image_size_bytes * 2)) $image_size_bytes labsync_create_or_resize_lv "$vg_name" "$lv_name_overlay" $((10000 * 1024 * 1024)) @@ -187,6 +187,7 @@ PARTTABLE lv_name_overlay="ovly-$labsync_localboot" lv_path_squashfs="$(labsync_lv_path "$vg_name" "$lv_name_sqashfs")" lv_path_overlay="$(labsync_lv_path "$vg_name" "$lv_name_overlay")" + lvm lvchange -ay "$vg_name" fi labsync_info "Mounting squashfs and overlay"