diff --git a/debian/changelog b/debian/changelog index 1b8d5cba..86d88273 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,18 @@ +livecd-rootfs (1.150) maverick; urgency=low + + * Set GDM's default session to une-efl on ubuntu-netbook armel+dove. + + -- Colin Watson Tue, 31 Aug 2010 19:44:43 +0100 + +livecd-rootfs (1.149) maverick; urgency=low + + * Fix syntax error in icon cache checks. + + -- Colin Watson Tue, 31 Aug 2010 12:36:42 +0100 + livecd-rootfs (1.148) maverick; urgency=low - * Add universe support to kubuntu-mobile + * Add universe support to kubuntu-mobile to work around seed change -- Emmet Hikory Thu, 26 Aug 2010 23:57:25 +0900 diff --git a/livecd.sh b/livecd.sh index 4201558e..26a9fa9f 100755 --- a/livecd.sh +++ b/livecd.sh @@ -693,10 +693,16 @@ Pin-Priority: 550 # No point keeping Gnome icon cache around for Kubuntu if [ "$FS" = "kubuntu" ] || \ [ "$FS" = "kubuntu-netbook" ] || \ - [ "$FS" = "kubuntu-mobile"] ; then + [ "$FS" = "kubuntu-mobile" ]; then rm -f ${ROOT}/usr/share/icons/*/icon-theme.cache fi + if [ "$FS" = ubuntu-netbook ] && \ + [ "$TARGETARCH+$SUBARCH" = armel+dove ] && \ + [ -e "$ROOT/usr/share/xsessions/une-efl.desktop" ]; then + chroot $ROOT /usr/lib/gdm/gdm-set-default-session une-efl + fi + # all done with the chroot; reset the debconf frontend, so Colin doesn't cry echo RESET debconf/frontend | chroot $ROOT debconf-communicate echo FSET debconf/frontend seen true | chroot $ROOT debconf-communicate