Skip to content

Commit

Permalink
Fix issue when upgrading with held packages. Ref GNS3/gns3-server#2398
Browse files Browse the repository at this point in the history
  • Loading branch information
grossmj committed Jul 11, 2024
1 parent b876721 commit 383766a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
15 changes: 6 additions & 9 deletions config/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ export DEBIAN_FRONTEND="noninteractive"
dpkg-reconfigure libc6
sudo -E apt-get -q --option Dpkg::Options::=-"-force-confold" --allow-change-held-packages --assume-yes install libssl1.1

# Unhold previously held packages (see https://github.com/GNS3/gns3-server/issues/2398)
sudo apt-mark unhold libvirt-daemon-system
sudo apt-mark unhold tigervnc-standalone-server

if [[ "$(dpkg --print-architecture)" == "arm64" ]]
then

Expand Down Expand Up @@ -124,12 +128,8 @@ then
sudo chown -R gns3:gns3 /home/gns3/.venv
fi


# For the NAT node
apt-get install -y --allow-change-held-packages libvirt-daemon-system

# Prevent libvirt-daemon-system to be uninstalled by cleaner.sh
apt-mark hold libvirt-daemon-system
apt-get install -y libvirt-daemon-system

# Install Qemu
apt-get install -y qemu-system-x86 cpulimit
Expand Down Expand Up @@ -166,10 +166,7 @@ chown root:root /etc/docker/daemon.json
chmod 644 /etc/docker/daemon.json

# Install VNC support for Docker
apt-get install -y --allow-change-held-packages tigervnc-standalone-server

# Prevent tigervnc to be uninstalled by cleaner.sh
apt-mark hold tigervnc-standalone-server
apt-get install -y tigervnc-standalone-server

# Install net-tools for ifconfig etc.
apt-get install -y net-tools
Expand Down
4 changes: 4 additions & 0 deletions scripts/cleaner.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash

# Prevent these packages to be uninstalled by cleaner.sh
apt-mark hold libvirt-daemon-system
apt-mark hold tigervnc-standalone-server

sudo apt-get purge -y --yes vim-common
sudo apt-get purge -y --yes usbutils
sudo apt-get purge -y --yes man-db
Expand Down
1 change: 0 additions & 1 deletion scripts/qemu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ else
sudo add-apt-repository -y --remove ppa:canonical-server/server-backports
fi

sudo apt-mark unhold libvirt-daemon-system
sudo apt-get purge -y "qemu*"
sudo apt-get update
sudo apt-get install -y qemu-system-x86
Expand Down

0 comments on commit 383766a

Please sign in to comment.