Import patches-unapplied version 2.445 to ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 2d6d50b86f

New changelog entries:
  * Resurrect Balint's fix from
    lp:~rbalint/livecd-rootfs/livecd-rootfs-autopkgtest-fix to wrap kpartx
    and trap spurious errors, since the problem is still being seen
    intermittently on i386 despite us calling sync before kpartx.
  [ Mathieu Trudel-Lapierre ]
  * Use ubuntu-server as the user for autologin on ubuntu-server live images.
  [ Simon Quigley ]
  * Use the correct task for lubuntu-next.
  * Use --no-install-recommends for lubuntu-next, consistent with lubuntu.
impish
Steve Langasek 8 years ago committed by usd-importer
parent 2d6d50b86f
commit e55a4a7910

16
debian/changelog vendored

@ -1,3 +1,19 @@
livecd-rootfs (2.445) artful; urgency=medium
* Resurrect Balint's fix from
lp:~rbalint/livecd-rootfs/livecd-rootfs-autopkgtest-fix to wrap kpartx
and trap spurious errors, since the problem is still being seen
intermittently on i386 despite us calling sync before kpartx.
[ Mathieu Trudel-Lapierre ]
* Use ubuntu-server as the user for autologin on ubuntu-server live images.
[ Simon Quigley ]
* Use the correct task for lubuntu-next.
* Use --no-install-recommends for lubuntu-next, consistent with lubuntu.
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 23 May 2017 15:56:52 -0700
livecd-rootfs (2.444) artful; urgency=medium
* For now, make sure all automated image builds are on the edge channel.

@ -348,7 +348,7 @@ case $PROJECT in
lubuntu-next)
add_task install minimal standard lubuntu-qt-desktop
LIVE_TASK='lubuntu-next-live'
LIVE_TASK='lubuntu-live-qt'
case $ARCH in
amd64) add_package live linux-signed-generic ;;
esac
@ -356,6 +356,10 @@ case $PROJECT in
case $ARCH in
amd64|i386) KERNEL_FLAVOURS=generic ;;
esac
# The Lubuntu STRUCTURE file has "feature
# no-follow-recommends". Mirror this.
export APT_OPTIONS="--yes --no-install-recommends"
;;
ubuntu-gnome)

@ -11,11 +11,22 @@ backing_img=
apt-get -qqy install dosfstools gdisk
clean_loops() {
local kpartx_ret
local kpartx_stdout
if [ -n "${backing_img}" ]; then
# sync before removing loop to avoid "Device or resource busy" errors
sync
kpartx -v -d "${backing_img}"
kpartx_ret=""
kpartx_stdout=$(kpartx -v -d "${backing_img}") || kpartx_ret=$?
echo "$kpartx_stdout"
if [ -n "$kpartx_ret" ]; then
if echo "$kpartx_stdout" | grep -q "loop deleted: "; then
echo "Suppressing kpartx returning error (#860894)"
else
exit $kpartx_ret
fi
fi
unset backing_img
fi

@ -1,3 +1,3 @@
[Service]
ExecStart=
ExecStart=-/sbin/agetty --noclear -n --autologin ubuntu %I $TERM
ExecStart=-/sbin/agetty --noclear -n --autologin ubuntu-server %I $TERM

Loading…
Cancel
Save