fablab-nea/labsync
1
0
Fork 0
Code Issues 11 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-localboot' into 'master'

Browse source 
Fix localboot

See merge request fablab/labsync!52
This commit is contained in:
jalr 2019-09-26 19:48:37 +00:00
commit cee9979679
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -3,7 +3,7 @@ image: docker:latest
variables: variables:
GIT_STRATEGY: fetch GIT_STRATEGY: fetch
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
PACKER_VERSION: 1.2.0 PACKER_VERSION: 1.4.3
ANNOUNCE: http://labsync.lab.fablab-nea.de:6969/announce 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 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 DOCKER_IMAGE_BUILDER: ${CI_REGISTRY_IMAGE}/labsync-builder:$CI_COMMIT_REF_SLUG

2
Makefile
View file

@ -1,4 +1,4 @@
PACKER_VERSION ?= 1.3.5 PACKER_VERSION ?= 1.4.3
ANNOUNCE ?= http://10.2.2.1:6969/announce ANNOUNCE ?= http://10.2.2.1:6969/announce
WEBSEED ?= http://10.2.2.1 WEBSEED ?= http://10.2.2.1

2
packer/ansible/roles/labsync/files/labsync-install-localboot.sh
View file

@ -14,6 +14,6 @@ if [ -z "$localboot" ]; then
sed -i 's/^\(GRUB_DEVICE=\).*$/\1""/' /usr/sbin/grub-mkconfig 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_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_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 update-grub
fi fi

3
packer/initramfs/labsync
View file

@ -154,7 +154,7 @@ PARTTABLE
lvm vgcreate "$vg_name" "$pv_device" lvm vgcreate "$vg_name" "$pv_device"
fi 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_sqashfs" $((image_size_bytes * 2)) $image_size_bytes
labsync_create_or_resize_lv "$vg_name" "$lv_name_overlay" $((10000 * 1024 * 1024)) 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_name_overlay="ovly-$labsync_localboot"
lv_path_squashfs="$(labsync_lv_path "$vg_name" "$lv_name_sqashfs")" lv_path_squashfs="$(labsync_lv_path "$vg_name" "$lv_name_sqashfs")"
lv_path_overlay="$(labsync_lv_path "$vg_name" "$lv_name_overlay")" lv_path_overlay="$(labsync_lv_path "$vg_name" "$lv_name_overlay")"
lvm lvchange -ay "$vg_name"
fi fi
labsync_info "Mounting squashfs and overlay" labsync_info "Mounting squashfs and overlay"