Aktualizovat README.md

README.md

@@ -1,3 +1,5 @@
+__LXD INIT not work for now, i dont have time to fix it. So, after installation via script, you need to run lxd init manually and set up it like script.__
+
 __Features:__
 
 copy_containers ->
@@ -7,20 +9,17 @@ zfs-backup-mm-example-config ->
 example config for zfs-backup-mm script, that backup all running containers, except those with "testing" or "deluge "in container name.
 
 setup-usl-mm_install_requirements ->
-configure main and universe repo in sources.list, install dialog utility
+install dialog utility
 
-usl-mm-bionic-upgrade ->
-replace current release codename with codename in first argument, upgrade LXD to 4.16 SNAP version, upgrade system, replace some lines in /root/onstart, reboot
-
-setup-usl-mm ->
+setup-usl-mm
 1. Pre-reboot script ->
 install zfs-utils,
 change timezone to Prague,
 crypt swap partition with ecryptfs-utils,
-crypt some partition with dmcrypt to use with /var/lib/lxd and LXD ZFS storage,
+crypt some partition with dmcrypt to use with /var/snap/lxd/common/lxd/* and LXD ZFS storage,
 add some config to sysctl.conf,
-disable lxd service,
-delete everything in /var/lib/lxd/*,
+disable snapd.lxd service,
+delete everything in /var/snap/lxd/common/lxd/*,
 delete netplan, install ifupdown,
 configure bridged networking (you can put LXD container to your network simple by add br0 to container),
 create zpool with ashift=12,
@@ -31,7 +30,7 @@ create /root/onstart script to decrypt crypted parition with password and start
 reboot
 
 2. Post-reboot script ->
-for sure, stop lxd service and delete everything in /var/lib/lxd/*,
+for sure, stop snapd.lxd service and delete everything in /var/snap/lxd/common/lxd/*,
 exec /root/onstart to decrypt partition and import zpool,
 configure LXD to use encrypted partition as storage,
 add some config to /root/.screenrc (for gnuscreen utility),
@@ -42,7 +41,7 @@ install ksplice tool for kernel live patching
 
 __Requirements:__
 
-Fresh installation of Ubuntu 18.04.1, swap partition and some paritition to crypted data
+Fresh installation of Ubuntu 20.04, swap partition and some paritition to crypted data
 
 
 

setup-usl-mm

@@ -12,6 +12,9 @@ else
 exit 1
 fi
 
+echo "Install net-tools"
+apt install net-tools -y
+
 echo "Exec ifconfig"
 ifconfig
 read -p "Enter interface for configure bridge:" NET_IF
@@ -46,16 +49,18 @@ zfs create crypt/lxd
 zfs create crypt/lxd/dir
 zfs create crypt/lxd/storage
 
-echo "Stopping and disabling lxd"
-systemctl disable lxd
-systemctl disable lxd.socket
-systemctl stop lxd
+echo "Switch to 5.19 LXD version"
+snap switch --channel 5.19/stable lxd
+snap refresh
 
-echo "Deleting everything in /var/lib/lxd/*"
-rm /var/lib/lxd/* -r
+echo "Disabling lxd snap"
+snap disable lxd
 
-echo "Creating mountpoint /var/lib/lxd to crypt/lxd/dir"
-zfs set mountpoint=/var/lib/lxd crypt/lxd/dir
+echo "Deleting everything in /var/snap/lxd/common/lxd/*"
+rm /var/snap/lxd/common/lxd/* -r
+
+echo "Creating mountpoint /var/snap/lxd/common/lxd to crypt/lxd/dir"
+zfs set mountpoint=/var/snap/lxd/common/lxd crypt/lxd/dir
 
 echo "Configuring sysctl"
 echo "vm.swappiness = 1" > /etc/sysctl.d/50-usl-mm.conf
@@ -100,7 +105,7 @@ echo "DNS=8.8.8.8" >> /etc/systemd/resolved.conf
 echo "FallbackDNS=1.1.1.1" >> /etc/systemd/resolved.conf
 
 echo "Purging netplan,disabling dhcpcd and install ifupdown"
-apt purge nplan -y
+apt purge nplan netplan.io -y
 rm /etc/netplan/* -f
 apt install bridge-utils ifupdown -y
 
@@ -119,11 +124,14 @@ echo "else"  >> /root/onstart
 echo "echo \"Passwords not match!\"" >> /root/onstart
 echo "exit 1" >> /root/onstart
 echo "fi"  >> /root/onstart
+echo "echo \"Stopping LXD snap daemon and deleting /var/snap/lxd/common/lxd/*\"" >> /root/onstart
+echo "snap disable lxd" >> /root/onstart
+echo "rm /var/snap/lxd/common/lxd/* -rf" >> /root/onstart
 echo "echo \"Opening encrypted partition\"" >> /root/onstart
 echo "echo \$pass_var | cryptsetup open $PARTITION crypt -c -" >> /root/onstart
 echo "partprobe" >> /root/onstart
 echo "zpool import -d /dev/mapper crypt -f -m" >> /root/onstart
-echo "systemctl start lxd" >> /root/onstart
+echo "snap enable lxd" >> /root/onstart
 
 chmod +x /root/onstart
 read -p "Press any key for reboot"
@@ -131,9 +139,9 @@ reboot
 }
 
 post_reboot_script () {
-echo "Stopping lxd and delete /var/lib/lxd/*"
-systemctl stop lxd
-rm /var/lib/lxd/* -r
+echo "Disabling lxd and delete /var/snap/lxd/common/lxd/*"
+snap disable lxd
+rm /var/snap/lxd/common/lxd/* -r
 
 echo "Executing /root/onstart"
 bash /root/onstart
@@ -196,9 +204,11 @@ main_menu
 
 install_uptrack () {
 cd /tmp
-wget https://ksplice.oracle.com/uptrack/dist/bionic/ksplice-uptrack.deb
-apt install libgtk2-perl dbus-x11 libglade2-0 libpython-stdlib libpython2.7-minimal libpython2.7-stdlib python python-cairo python-dbus python-gi python-glade2 python-gobject-2 python-gtk2 python-minimal python-pycurl python-yaml python2.7 python2.7-minimal  -y
-dpkg -i ksplice-uptrack.deb
+wget https://ksplice.oracle.com/uptrack/dist/focal/uptrack.deb
+apt install python3-pycurl libgtk2-perl dbus-x11 libglade2-0 libpython2-stdlib libpython2.7-minimal libpython2.7-stdlib python2 python-cairo python-dbus python-gi python-gobject-2 python2-minimal python-pycurl python-yaml python2.7 python2.7-minimal  -y
+dpkg -i uptrack.deb
+uptrack-upgrade -y
+apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 82562EA9AD986DA3
 read -p "Done, press any key to return to main menu"
 main_menu
 }

setup-usl-mm_install_requirements

@@ -1,6 +1,3 @@
 #!/bin/bash
-echo "deb http://archive.ubuntu.com/ubuntu bionic main universe" > /etc/apt/sources.list
-echo "deb http://archive.ubuntu.com/ubuntu bionic-security main universe" >> /etc/apt/sources.list
-echo "deb http://archive.ubuntu.com/ubuntu bionic-updates main universe" >> /etc/apt/sources.list
 apt update
-apt install dialog
+apt install dialog -y

usl-mm-bionic-upgrade

@@ -1,67 +0,0 @@
-#!/bin/bash
-# Use with first argument with codename of new ubuntu distro(eoan,focal, etc)
-IFS='
-'
-current_release=$(lsb_release -c | awk {'print $2'})
-export DEBIAN_FRONTEND=noninteractive
-apt update
-apt dist-upgrade -y -o Dpkg::Options::="--force-confold"
-apt install rpl -y
-snap install --channel 4.16/stable lxd
-if [ $current_release == bionic ]; then
-lxd.migrate -yes
-fi
-zfs set mountpoint=/var/snap/lxd/common/lxd crypt/lxd/dir
-rpl $current_release $1 /etc/apt/sources.list
-rpl $current_release $1 /etc/apt/sources.list.d/*
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 82562EA9AD986DA3
-apt update
-apt dist-upgrade -y -o Dpkg::Options::="--force-confold"
-
-echo "Creating onstart-new script in /root"
-echo "#!/bin/bash" > /root/onstart-new
-echo "read -p \"Press any button to start...\"" >> /root/onstart-new
-echo "pass_var=\$(dialog --passwordbox \"Enter password:\" 25 25  --output-fd 1)" >> /root/onstart-new
-echo "pass_var2=\$(dialog --passwordbox \"Enter password again:\" 25 25  --output-fd 1)" >> /root/onstart-new
-echo "if [ \"\$pass_var\" == \"\$pass_var2\" ]; then" >> /root/onstart-new
-echo "echo \"Passwords match!\""  >> /root/onstart-new
-echo "else"  >> /root/onstart-new
-echo "echo \"Passwords not match!\"" >> /root/onstart-new
-echo "exit 1" >> /root/onstart-new
-echo "fi"  >> /root/onstart-new
-echo "echo \"Stopping LXD snap daemon and deleting /var/snap/lxd/common/lxd/*\"" >> /root/onstart-new
-echo "snap disable lxd" >> /root/onstart-new
-echo "rm /var/snap/lxd/common/lxd/* -rf" >> /root/onstart-new
-echo "echo \"Opening encrypted partition\"" >> /root/onstart-new
-for i in $(cat /root/onstart | grep "cryptsetup open")
-do echo "$i" >> /root/onstart-new
-done
-echo "partprobe" >> /root/onstart-new
-for i in $(cat /root/onstart | grep "zpool import")
-do echo "$i" >> /root/onstart-new
-done
-echo "snap enable lxd" >> /root/onstart-new
-for i in $(cat /root/onstart | grep "iptables")
-do echo "$i" >> /root/onstart-new
-done
-for i in $(cat /root/onstart | grep "firewall")
-do echo "$i" >> /root/onstart-new
-done
-
-echo "cryptdisks_start cryptswap1" >> /root/onstart-new
-echo "swapon -a" >> /root/onstart-new
-
-chmod +x /root/onstart-new
-
-mv /root/onstart /root/onstart-old
-mv /root/onstart-new /root/onstart
-
-zfs set mountpoint=/var/snap/lxd/common/lxd crypt/lxd/dir
-
-snap switch --channel 5.19/stable lxd
-snap refresh
-
-apt install uptrack -y
-
-read -p "Press any key for reboot"
-reboot