diff options
| -rw-r--r-- | data/defaults.json | 2 | ||||
| -rw-r--r-- | docker/Dockerfile | 5 | ||||
| -rwxr-xr-x | scripts/build-GCE-image | 9 | ||||
| -rwxr-xr-x | scripts/build-packages | 1 |
4 files changed, 12 insertions, 5 deletions
diff --git a/data/defaults.json b/data/defaults.json index d730a8a6..ae2697d1 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "buster", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", - "kernel_version": "4.19.109", + "kernel_version": "4.19.112", "kernel_flavor": "amd64-vyos", "additional_repositories": [], "custom_packages": [] diff --git a/docker/Dockerfile b/docker/Dockerfile index 26ef80b7..880e2945 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -391,9 +391,8 @@ RUN echo "$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc # Cleanup RUN rm -rf /tmp/* -# Do not enable visual mode on right click in vim -# https://github.com/vim/vim/issues/1326 -RUN echo "set mouse-=a" >> /etc/vim/vimrc +# Disable mouse in vim +RUN echo -e "set mouse=\nset ttymouse=" > /etc/vim/vimrc.local COPY entrypoint.sh /usr/local/bin/entrypoint.sh ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] diff --git a/scripts/build-GCE-image b/scripts/build-GCE-image index 9986e8dc..90eb6468 100755 --- a/scripts/build-GCE-image +++ b/scripts/build-GCE-image @@ -16,6 +16,9 @@ # Purpose: # Build VyOS image for Google cloud. +apt-get update && apt-get install -y \ + grub-pc grub2-common parted kpartx + lb bootstrap lb chroot @@ -60,6 +63,12 @@ OUTPUTGZ=VyOS-"$dateymd".tar.gz IMAGE_SIZE=10 qemu-img create -f raw ${OUTPUT} ${IMAGE_SIZE}G +LOOPNAME=`losetup -f` +LOOPMINOR=${LOOPNAME//[^0-9]} +if [ ! -e $LOOPNAME ]; then + mknod $LOOPNAME b 7 $LOOPMINOR +fi + ${PARTED} -s ${OUTPUT} mktable msdos ${PARTED} -s -a optimal ${OUTPUT} mkpart primary ext4 1Mi 100% ${PARTED} -s ${OUTPUT} set 1 boot on diff --git a/scripts/build-packages b/scripts/build-packages index 58778fad..d7c06b4c 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -187,7 +187,6 @@ vyos_packages = ['vyatta-bash', 'vyatta-iproute', 'vyatta-biosdevname', 'vyos-opennhrp', - 'vyos-salt-minion', 'udp-broadcast-relay', 'vyos-1x', 'vyatta-conntrack', |