Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-16 05:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.568

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2019-03-12 03:26:07 +00:00
parent 7b01dc83ed
commit 9cda759d89
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
livecd-rootfs (2.568) disco; urgency=medium
[ Tobias Koch ]
* Make sure snap-tool exits with non-zero exit status, if a problem
occurred.
[ Steve Langasek ]
* divert grub when calling into lb chroot, to avoid any problems from
grub-probe.
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 11 Mar 2019 18:14:46 -0700
livecd-rootfs (2.567) disco; urgency=medium livecd-rootfs (2.567) disco; urgency=medium
* Fix change to ignore ubiquity packages, it failed to mark anything * Fix change to ignore ubiquity packages, it failed to mark anything

2
live-build/auto/build
View File

@ -261,12 +261,14 @@ EOF
chmod +x chroot/usr/bin/man chmod +x chroot/usr/bin/man
fi fi
divert_grub chroot
if [ -n "${PASSES}" ]; then if [ -n "${PASSES}" ]; then
PATH="config/:$PATH" lb chroot_layered "$@" PATH="config/:$PATH" lb chroot_layered "$@"
else else
divert_update_initramfs divert_update_initramfs
lb chroot "$@" lb chroot "$@"
fi fi
undivert_grub chroot
# Let all configuration non multi-layered project here. # Let all configuration non multi-layered project here.
# If those are moving to a multi-layer layout, this needs to be # If those are moving to a multi-layer layout, this needs to be

3
snap-tool
View File

@ -392,7 +392,8 @@ class SnapCli:
if __name__ == "__main__": if __name__ == "__main__":
try: try:
SnapCli()(sys.argv[1:]) rval = SnapCli()(sys.argv[1:])
except KeyboardInterrupt: except KeyboardInterrupt:
sys.stderr.write("snap-tool: caught keyboard interrupt, exiting.\n") sys.stderr.write("snap-tool: caught keyboard interrupt, exiting.\n")
sys.exit(EXIT_ERR) sys.exit(EXIT_ERR)
sys.exit(rval)