diff --git a/debian/changelog b/debian/changelog index ae3f7185..c07c9aaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.765.28) jammy; urgency=medium + + * Fix unminimize to correctly list packages. (LP: #1996489) + * Install LXD snap from stable/ubuntu- channel. (LP: #2036725) + + -- Utkarsh Gupta Wed, 04 Oct 2023 13:48:53 +0530 + livecd-rootfs (2.765.27) jammy; urgency=medium [ Thomas Bechtold ] diff --git a/live-build/auto/build b/live-build/auto/build index 279ce344..8b8a9dd4 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -241,18 +241,18 @@ if [ -f /etc/dpkg/dpkg.cfg.d/excludes ] || [ -f /etc/dpkg/dpkg.cfg.d/excludes.dp dpkg -S /usr/share/man/ |sed 's|, |\n|g;s|: [^:]*$||' | DEBIAN_FRONTEND=noninteractive xargs apt-get install --reinstall -y echo "Reinstalling packages with system documentation in /usr/share/doc/ .." # This step processes the packages which still have missing documentation - dpkg --verify --verify-format rpm | awk '/..5...... \/usr\/share\/doc/ {print $2}' | sed 's|/[^/]*$||' | sort |uniq \ + dpkg --verify --verify-format rpm | awk '$2 ~ /\/usr\/share\/doc/ {print $2}' | sed 's|/[^/]*$||' | sort | uniq \ | xargs dpkg -S | sed 's|, |\n|g;s|: [^:]*$||' | uniq | DEBIAN_FRONTEND=noninteractive xargs apt-get install --reinstall -y echo "Restoring system translations..." # This step processes the packages which still have missing translations - dpkg --verify --verify-format rpm | awk '/..5...... \/usr\/share\/locale/ {print $2}' | sed 's|/[^/]*$||' | sort |uniq \ + dpkg --verify --verify-format rpm | awk '$2 ~ /\/usr\/share\/locale/ {print $2}' | sed 's|/[^/]*$||' | sort | uniq \ | xargs dpkg -S | sed 's|, |\n|g;s|: [^:]*$||' | uniq | DEBIAN_FRONTEND=noninteractive xargs apt-get install --reinstall -y - if dpkg --verify --verify-format rpm | awk '/..5...... \/usr\/share\/doc/ {exit 1}'; then + if dpkg --verify --verify-format rpm | awk '$2 ~ /\/usr\/share\/doc/ {exit 1}'; then echo "Documentation has been restored successfully." rm /etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp else echo "There are still files missing from /usr/share/doc/:" - dpkg --verify --verify-format rpm | awk '/..5...... \/usr\/share\/doc/ {print " " $2}' + dpkg --verify --verify-format rpm | awk '$2 ~ /\/usr\/share\/doc/ {print " " $2}' echo "You may want to try running this script again or you can remove" echo "/etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp and restore the files manually." fi @@ -288,8 +288,9 @@ fi echo "Removing lxd installer package..." apt-get purge -y lxd-installer -echo "Installing lxd from snap..." -snap install lxd +. /etc/os-release +echo "Installing lxd from snap from stable/ubuntu-$VERSION_ID channel" +snap install --channel="stable/ubuntu-$VERSION_ID" lxd EOF fi cat >> chroot/usr/local/sbin/unminimize <<'EOF'