diff -Nru ltsp-5.3.5/ChangeLog ltsp-5.3.6/ChangeLog --- ltsp-5.3.5/ChangeLog 2012-03-09 18:02:08.000000000 +0000 +++ ltsp-5.3.6/ChangeLog 2012-03-22 19:25:16.000000000 +0000 @@ -1,4 +1,76 @@ ------------------------------------------------------------ +revno: 2146 +tags: ltsp-5.3.6 +committer: Stéphane Graber +branch nick: ltsp-trunk +timestamp: Thu 2012-03-22 15:24:48 -0400 +message: + version 5.3.6 +------------------------------------------------------------ +revno: 2145 +committer: Alkis Georgopoulos +branch nick: ltsp-trunk +timestamp: Thu 2012-03-22 07:22:50 +0200 +message: + Ubuntu: select the correct LDM theme for fat chroots too. +------------------------------------------------------------ +revno: 2144 +committer: Alkis Georgopoulos +branch nick: ltsp-trunk +timestamp: Wed 2012-03-21 09:46:32 +0200 +message: + Ubuntu: fix fat desktops and ldm themes selection. +------------------------------------------------------------ +revno: 2143 +committer: Marc Gariepy +branch nick: ltsp-trunk +timestamp: Tue 2012-03-20 17:18:49 -0400 +message: + replace dpkg-query with dpkg to fix script and installs ldm-ubuntut-theme +------------------------------------------------------------ +revno: 2142 +committer: Vagrant Cascadian +branch nick: ltsp-trunk +timestamp: Sun 2012-03-18 16:34:45 -0700 +message: + ltsp-update-kernels: only create yaboot symlinks if not otherwise present, + making it possible to configure a custom yaboot environment. +------------------------------------------------------------ +revno: 2141 +committer: Wim Muskee +branch nick: ltsp-trunk +timestamp: Sun 2012-03-18 14:29:35 +0100 +message: + Gentoo: 5.3 aware ltspfs is stable +------------------------------------------------------------ +revno: 2140 +committer: Wim Muskee +branch nick: ltsp-trunk +timestamp: Sat 2012-03-17 17:43:38 +0100 +message: + Gentoo: Client download lts.conf not from x86 but i686. +------------------------------------------------------------ +revno: 2139 +committer: Wim Muskee +branch nick: ltsp-trunk +timestamp: Mon 2012-03-12 12:07:52 +0100 +message: + Gentoo: Support for setting installed client video card drivers. +------------------------------------------------------------ +revno: 2138 +committer: Wim Muskee +branch nick: ltsp-trunk +timestamp: Mon 2012-03-12 09:08:04 +0100 +message: + Blacklist Xsession.desktop in fat chroot autodetection. +------------------------------------------------------------ +revno: 2137 +committer: Alkis Georgopoulos +branch nick: ltsp-trunk +timestamp: Fri 2012-03-09 21:55:02 +0200 +message: + Simplify fat chroot autodetection. +------------------------------------------------------------ revno: 2136 tags: ltsp-5.3.5 committer: Stéphane Graber @@ -798,6 +870,7 @@ ltsp_nbd: missed $rootmnt while saving $DEVICE. ------------------------------------------------------------ revno: 2025 +tags: current committer: Alkis Georgopoulos branch nick: ltsp-trunk timestamp: Sun 2012-02-12 13:07:25 +0200 diff -Nru ltsp-5.3.5/client/init-ltsp.d/Gentoo/05-getltsconffile ltsp-5.3.6/client/init-ltsp.d/Gentoo/05-getltsconffile --- ltsp-5.3.5/client/init-ltsp.d/Gentoo/05-getltsconffile 2012-03-09 18:02:07.000000000 +0000 +++ ltsp-5.3.6/client/init-ltsp.d/Gentoo/05-getltsconffile 2012-03-22 19:25:15.000000000 +0000 @@ -1,6 +1,6 @@ # Attempt to get lts.conf via tftp -arch=$(uname -m | sed -e 's:i[3-6]86:x86:' -e 's:x86_64:amd64:' -e 's:parisc:hppa:') +arch=$(uname -m | sed -e 's:x86_64:amd64:' -e 's:parisc:hppa:') tftppath="/ltsp/${arch}/lts.conf" lts_conf_temp=$(mktemp) diff -Nru ltsp-5.3.5/client/ltsp_config.d/20fatclients ltsp-5.3.6/client/ltsp_config.d/20fatclients --- ltsp-5.3.5/client/ltsp_config.d/20fatclients 2012-03-09 18:02:07.000000000 +0000 +++ ltsp-5.3.6/client/ltsp_config.d/20fatclients 2012-03-22 19:25:15.000000000 +0000 @@ -2,14 +2,9 @@ test -z "$LTSP_FATCLIENT" || return test -f /proc/meminfo || return -unset supports_local_logins # process_lts_conf() unsets glob expansion (set -f), so we need to use `find` -for xsession in $(find /usr/share/xsessions/ -name '*.desktop' 2>/dev/null); do - supports_local_logins=true - break -done - -if [ -n "$supports_local_logins" ]; then +# blacklist Xsession.desktop (installed by xinit on Gentoo) +if [ -n "$(find /usr/share/xsessions/ -not -name Xsession.desktop -name '*.desktop' 2>/dev/null)" ]; then # Don't set LTSP_FATCLIENT for low-RAM clients booting from a fat chroot memtotal=$(sed -n 's/MemTotal: *\([0-9]*\) .*/\1/p' /proc/meminfo) FAT_RAM_THRESHOLD=${FAT_RAM_THRESHOLD:-300} diff -Nru ltsp-5.3.5/debian/changelog ltsp-5.3.6/debian/changelog --- ltsp-5.3.5/debian/changelog 2012-03-09 18:07:22.000000000 +0000 +++ ltsp-5.3.6/debian/changelog 2012-03-22 19:28:07.000000000 +0000 @@ -1,3 +1,16 @@ +ltsp (5.3.6-0ubuntu1) precise; urgency=low + + * New upstream bugfix release (5.3.6). + - Simplify fat chroot autodetection + - Blacklist Xsession.desktop in fat chroot autodetection + - ltsp-update-kernels: only create yaboot symlinks if not otherwise present, + making it possible to configure a custom yaboot environment + - replace dpkg-query with dpkg to fix script and installs ldm-ubuntu-theme + - fix fat desktops and ldm themes selection + - select the correct LDM theme for fat chroots too + + -- Stéphane Graber Thu, 22 Mar 2012 15:26:42 -0400 + ltsp (5.3.5-0ubuntu1) precise; urgency=low * New upstream bugfix release (5.3.5) diff -Nru ltsp-5.3.5/release.conf ltsp-5.3.6/release.conf --- ltsp-5.3.5/release.conf 2012-03-09 18:02:07.000000000 +0000 +++ ltsp-5.3.6/release.conf 2012-03-22 19:25:15.000000000 +0000 @@ -1,3 +1,3 @@ NAME=ltsp -VERSION=5.3.5 +VERSION=5.3.6 EXPORTCHANGELOG=yes diff -Nru ltsp-5.3.5/server/configs/Gentoo/kicktoo-5.2.profile ltsp-5.3.6/server/configs/Gentoo/kicktoo-5.2.profile --- ltsp-5.3.5/server/configs/Gentoo/kicktoo-5.2.profile 2012-03-09 18:02:07.000000000 +0000 +++ ltsp-5.3.6/server/configs/Gentoo/kicktoo-5.2.profile 2012-03-22 19:25:15.000000000 +0000 @@ -32,6 +32,10 @@ makeconf_line GENTOO_MIRRORS "${MIRRORS}" fi +if [ -n "${VIDEO_CARDS}" ]; then + makeconf_line VIDEO_CARDS "${VIDEO_CARDS}" +fi + if [ "${CCACHE}" == "true" ]; then makeconf_line FEATURES "ccache" makeconf_line CCACHE_SIZE "4G" diff -Nru ltsp-5.3.5/server/configs/Gentoo/kicktoo-5.3.profile ltsp-5.3.6/server/configs/Gentoo/kicktoo-5.3.profile --- ltsp-5.3.5/server/configs/Gentoo/kicktoo-5.3.profile 2012-03-09 18:02:07.000000000 +0000 +++ ltsp-5.3.6/server/configs/Gentoo/kicktoo-5.3.profile 2012-03-22 19:25:15.000000000 +0000 @@ -32,6 +32,10 @@ makeconf_line GENTOO_MIRRORS "${MIRRORS}" fi +if [ -n "${VIDEO_CARDS}" ]; then + makeconf_line VIDEO_CARDS "${VIDEO_CARDS}" +fi + if [ "${CCACHE}" == "true" ]; then makeconf_line FEATURES "ccache" makeconf_line CCACHE_SIZE "4G" @@ -80,7 +84,6 @@ # make sure the new unstable versions get installed cat > ${chroot_dir}/etc/portage/package.keywords <<- EOF net-misc/ltsp-client - sys-fs/ltspfs EOF # linking ltsp profile from overlay diff -Nru ltsp-5.3.5/server/configs/Gentoo/ltsp-build-client.conf ltsp-5.3.6/server/configs/Gentoo/ltsp-build-client.conf --- ltsp-5.3.5/server/configs/Gentoo/ltsp-build-client.conf 2012-03-09 18:02:07.000000000 +0000 +++ ltsp-5.3.6/server/configs/Gentoo/ltsp-build-client.conf 2012-03-22 19:25:15.000000000 +0000 @@ -28,3 +28,6 @@ # Packages to exclude from the final chroot. # EXCLUDE="sys-apps/man-pages" + +# Install only the following video card drivers in the chroot +# VIDEO_CARDS="vesa intel radeon mach64 via" diff -Nru ltsp-5.3.5/server/configs/Gentoo/quickstart-5.2.profile ltsp-5.3.6/server/configs/Gentoo/quickstart-5.2.profile --- ltsp-5.3.5/server/configs/Gentoo/quickstart-5.2.profile 2012-03-09 18:02:07.000000000 +0000 +++ ltsp-5.3.6/server/configs/Gentoo/quickstart-5.2.profile 2012-03-22 19:25:15.000000000 +0000 @@ -85,7 +85,11 @@ mount_bind "/var/lib/layman" "${chroot_dir}/var/lib/layman" if [ -n "${MIRRORS}" ]; then - echo "GENTOO_MIRRORS="${MIRRORS}"" >> ${chroot_dir}/etc/make.conf + echo "GENTOO_MIRRORS=\"${MIRRORS}\"" >> ${chroot_dir}/etc/make.conf + fi + + if [ -n "${VIDEO_CARDS}" ]; then + echo "VIDEO_CARDS=\"${VIDEO_CARDS}\"" >> ${chroot_dir}/etc/make.conf fi # TODO: don't add this by default diff -Nru ltsp-5.3.5/server/configs/Gentoo/quickstart-5.3.profile ltsp-5.3.6/server/configs/Gentoo/quickstart-5.3.profile --- ltsp-5.3.5/server/configs/Gentoo/quickstart-5.3.profile 2012-03-09 18:02:07.000000000 +0000 +++ ltsp-5.3.6/server/configs/Gentoo/quickstart-5.3.profile 2012-03-22 19:25:15.000000000 +0000 @@ -81,7 +81,11 @@ mount_bind "/var/lib/layman" "${chroot_dir}/var/lib/layman" if [ -n "${MIRRORS}" ]; then - echo "GENTOO_MIRRORS="${MIRRORS}"" >> ${chroot_dir}/etc/make.conf + echo "GENTOO_MIRRORS=\"${MIRRORS}\"" >> ${chroot_dir}/etc/make.conf + fi + + if [ -n "${VIDEO_CARDS}" ]; then + echo "VIDEO_CARDS=\"${VIDEO_CARDS}\"" >> ${chroot_dir}/etc/make.conf fi # TODO: don't add this by default @@ -102,7 +106,6 @@ # make sure the new unstable versions get installed cat > ${chroot_dir}/etc/portage/package.keywords <<- EOF net-misc/ltsp-client - sys-fs/ltspfs EOF # linking ltsp profile from overlay diff -Nru ltsp-5.3.5/server/ltsp-update-kernels ltsp-5.3.6/server/ltsp-update-kernels --- ltsp-5.3.5/server/ltsp-update-kernels 2012-03-09 18:02:07.000000000 +0000 +++ ltsp-5.3.6/server/ltsp-update-kernels 2012-03-22 19:25:15.000000000 +0000 @@ -115,8 +115,12 @@ # OFW on Mac is lame, they cannot tftp from directories if [ -e $TFTPBOOT/$CHROOT_NAME/yaboot ]; then - ln -sf ltsp/$CHROOT_NAME/yaboot $TFTPDIR/yaboot - ln -sf ltsp/$CHROOT_NAME/yaboot.conf $TFTPDIR/yaboot.conf + if [ ! -e $TFTPDIR/yaboot ]; then + ln -sf ltsp/$CHROOT_NAME/yaboot $TFTPDIR/yaboot + fi + if [ ! -e $TFTPDIR/yaboot.conf ]; then + ln -sf ltsp/$CHROOT_NAME/yaboot.conf $TFTPDIR/yaboot.conf + fi fi ### Cleanup old kernels and images from tftpboot directory ### diff -Nru ltsp-5.3.5/server/plugins/ltsp-build-client/Gentoo/010-bootstrap ltsp-5.3.6/server/plugins/ltsp-build-client/Gentoo/010-bootstrap --- ltsp-5.3.5/server/plugins/ltsp-build-client/Gentoo/010-bootstrap 2012-03-09 18:02:07.000000000 +0000 +++ ltsp-5.3.6/server/plugins/ltsp-build-client/Gentoo/010-bootstrap 2012-03-22 19:25:15.000000000 +0000 @@ -56,6 +56,7 @@ MAKEOPTS="${MAKEOPTS}" LOCALE="${LOCALE}" BASE="${BASE}" \ ARCH="${ARCH}" MAIN_ARCH="${MAIN_ARCH}" NAME="${CHROOT}" EXCLUDE="${EXCLUDE}" \ KERNEL_CONFIG_URI="${KERNEL_CONFIG_URI}" KERNEL_SOURCES="${KERNEL_SOURCES}" \ + VIDEO_CARDS="${VIDEO_CARDS}" \ $INSTALLER $INSTALLER_ARGS $INSTALLER_PROFILE # And reset to the original value diff -Nru ltsp-5.3.5/server/plugins/ltsp-build-client/Gentoo/030-set-video-cards ltsp-5.3.6/server/plugins/ltsp-build-client/Gentoo/030-set-video-cards --- ltsp-5.3.5/server/plugins/ltsp-build-client/Gentoo/030-set-video-cards 1970-01-01 00:00:00.000000000 +0000 +++ ltsp-5.3.6/server/plugins/ltsp-build-client/Gentoo/030-set-video-cards 2012-03-22 19:25:15.000000000 +0000 @@ -0,0 +1,10 @@ +case "$MODE" in + commandline) + add_option "video-cards" "`eval_gettext "Set video card drivers to install"`" "advanced" "true" + ;; + configure) + if [ -n "$option_video_cards_value" ] || [ -n "$VIDEO_CARDS" ]; then + VIDEO_CARDS="${option_video_cards_value:-$VIDEO_CARDS}" + fi + ;; +esac diff -Nru ltsp-5.3.5/server/plugins/ltsp-build-client/Ubuntu/030-artwork ltsp-5.3.6/server/plugins/ltsp-build-client/Ubuntu/030-artwork --- ltsp-5.3.5/server/plugins/ltsp-build-client/Ubuntu/030-artwork 2012-03-09 18:02:07.000000000 +0000 +++ ltsp-5.3.6/server/plugins/ltsp-build-client/Ubuntu/030-artwork 2012-03-22 19:25:15.000000000 +0000 @@ -1,17 +1,17 @@ case "$MODE" in finalization) - for cdd in ed x k; do - if [ $(dpkg-query -W --showformat='${Package}' ${cdd}ubuntu-desktop 2>/dev/null) ]; then - if dpkg -l | grep -q "${cdd}ubuntu-desktop"; then - chroot $ROOT apt-get $APT_GET_OPTS install ldm-${ccd}ubuntu-theme - fi - if [ -d $ROOT/usr/share/ldm/themes/${cdd}ubuntu ]; then - chroot $ROOT /usr/sbin/update-alternatives --set ldm-theme /usr/share/ldm/themes/${cdd}ubuntu - fi - return + if [ -n "$FAT_CLIENT_DESKTOPS" ]; then + desktops="$FAT_CLIENT_DESKTOPS" + else + desktops=$(dpkg -l | sed -n 's/^ii.*\<\(.*buntu-desktop\)\>.*/\1/p') + fi + # Prefer artwork for desktops other than then default ubuntu one + desktops=$(echo $desktops | sed 's/\//') + for d in $desktops ubuntu-desktop; do + name=${d%-desktop} + if chroot $ROOT apt-get $APT_GET_OPTS install ldm-$name-theme; then + break fi done - chroot $ROOT apt-get $APT_GET_OPTS install ldm-ubuntu-theme - chroot $ROOT /usr/sbin/update-alternatives --set ldm-theme /usr/share/ldm/themes/ubuntu ;; esac diff -Nru ltsp-5.3.5/server/plugins/ltsp-build-client/Ubuntu/030-fat-client ltsp-5.3.6/server/plugins/ltsp-build-client/Ubuntu/030-fat-client --- ltsp-5.3.5/server/plugins/ltsp-build-client/Ubuntu/030-fat-client 2012-03-09 18:02:07.000000000 +0000 +++ ltsp-5.3.6/server/plugins/ltsp-build-client/Ubuntu/030-fat-client 2012-03-22 19:25:15.000000000 +0000 @@ -14,16 +14,7 @@ if [ -n "$option_fat_client_desktop_value" ]; then FAT_CLIENT_DESKTOPS="$(echo $option_fat_client_desktop_value | tr ',' ' ')" elif [ -n "$option_fat_client_value" ]; then - FAT_CLIENT_DESKTOPS="" - - # Code taken from 030-artwork - for cdd in ed k l myth x; do - if [ $(dpkg-query -W --showformat='${Package}' ${cdd}ubuntu-desktop 2>/dev/null) ]; then - if dpkg -l | grep -q "${cdd}ubuntu-desktop"; then - FAT_CLIENT_DESKTOPS="$FAT_CLIENT_DESKTOPS ${cdd}ubuntu-desktop" - fi - fi - done + FAT_CLIENT_DESKTOPS="$(dpkg -l | sed -n 's/^ii.*\<\(.*buntu-desktop\)\>.*/\1/p')" else # If fat client isn't enabled, just continue return 0