Import patches-unapplied version 1.154 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 8e17cb0f2455064d150615365246451fd01db483

New changelog entries:
  * apply setting of the default session to all ubuntu-armel builds
    so we do not need to do this on first boot.
This commit is contained in:
Oliver Grawert 2011-01-10 23:27:43 +01:00 committed by usd-importer
parent 8e17cb0f24
commit 9cca53267f
2 changed files with 8 additions and 1 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (1.154) natty; urgency=low
* apply setting of the default session to all ubuntu-armel builds
so we do not need to do this on first boot.
-- Oliver Grawert <ogra@ubuntu.com> Mon, 10 Jan 2011 23:27:43 +0100
livecd-rootfs (1.153) natty; urgency=low
* Update default suite in BuildLiveCD to natty.

View File

@ -712,7 +712,7 @@ Pin-Priority: 550
fi
if [ "$FS" = ubuntu-netbook ] && \
[ "$TARGETARCH+$SUBARCH" = armel+dove ] && \
[ "$TARGETARCH" = armel ] && \
[ -e "$ROOT/usr/share/xsessions/une-efl.desktop" ]; then
chroot $ROOT /usr/lib/gdm/gdm-set-default-session une-efl
fi