diff -Nru ltsp-5.5.1/debian/changelog ltsp-5.5.1/debian/changelog --- ltsp-5.5.1/debian/changelog 2014-03-14 13:37:09.000000000 +0000 +++ ltsp-5.5.1/debian/changelog 2014-04-14 13:24:06.000000000 +0000 @@ -1,3 +1,18 @@ +ltsp (5.5.1-1ubuntu2) trusty; urgency=medium + + * Cherry-pick upstream bugfixes: + - r2557: Drop "plymouth:force-splash vt.handoff=7" from the cmdline + as they interfere with LTSP debugging and don't provide any improvement + as LTSP's initrd doesn't contain plymouth anymore and we don't get + flicker free X startup anyway. + - r2558: Increase the udhcp timeout from 4 to 10 seconds, this fixes + boot on some slower hardware. + - r2559: Fix ltsp-update-image --revert. + - r2560: More udhcp fix to pick up interfaces which show up after + the script has started. + + -- Stéphane Graber Mon, 14 Apr 2014 09:24:05 -0400 + ltsp (5.5.1-1ubuntu1) trusty; urgency=medium * Pick up upstream bugfix release for the LTS. diff -Nru ltsp-5.5.1/debian/patches/r2557-plymouth.diff ltsp-5.5.1/debian/patches/r2557-plymouth.diff --- ltsp-5.5.1/debian/patches/r2557-plymouth.diff 1970-01-01 00:00:00.000000000 +0000 +++ ltsp-5.5.1/debian/patches/r2557-plymouth.diff 2014-04-14 13:19:56.000000000 +0000 @@ -0,0 +1,13 @@ +=== modified file 'client/Ubuntu/etc/ltsp/update-kernels.conf' +--- old/client/Ubuntu/etc/ltsp/update-kernels.conf 2014-01-04 11:37:22 +0000 ++++ new/client/Ubuntu/etc/ltsp/update-kernels.conf 2014-03-01 15:48:19 +0000 +@@ -16,7 +16,7 @@ + BOOT_METHODS="NBD NFS AOE" + + # Default commandline arguments common to all boot methods +-CMDLINE_LINUX_DEFAULT="init=/sbin/init-ltsp quiet splash plymouth:force-splash vt.handoff=7" ++CMDLINE_LINUX_DEFAULT="init=/sbin/init-ltsp quiet splash" + + # Commandline used with NFS root + CMDLINE_NFS="root=/dev/nfs ip=dhcp boot=nfs" + diff -Nru ltsp-5.5.1/debian/patches/r2558-udhcp.diff ltsp-5.5.1/debian/patches/r2558-udhcp.diff --- ltsp-5.5.1/debian/patches/r2558-udhcp.diff 1970-01-01 00:00:00.000000000 +0000 +++ ltsp-5.5.1/debian/patches/r2558-udhcp.diff 2014-04-14 13:20:03.000000000 +0000 @@ -0,0 +1,13 @@ +=== modified file 'client/Debian/share/initramfs-tools/scripts/init-premount/udhcp' +--- old/client/Debian/share/initramfs-tools/scripts/init-premount/udhcp 2014-02-26 09:40:10 +0000 ++++ new/client/Debian/share/initramfs-tools/scripts/init-premount/udhcp 2014-03-03 14:50:17 +0000 +@@ -73,7 +73,7 @@ + while i=$(($i+1)); do + if ip -oneline link show up | grep -vw lo | grep -q LOWER_UP; then + break +- elif [ $i -ge 4 ]; then ++ elif [ $i -ge 10 ]; then + # After a while, give a shell to the user in case he can fix it + panic "No network interfaces are up" + i=0 + diff -Nru ltsp-5.5.1/debian/patches/r2559-revert-support.diff ltsp-5.5.1/debian/patches/r2559-revert-support.diff --- ltsp-5.5.1/debian/patches/r2559-revert-support.diff 1970-01-01 00:00:00.000000000 +0000 +++ ltsp-5.5.1/debian/patches/r2559-revert-support.diff 2014-04-14 13:20:15.000000000 +0000 @@ -0,0 +1,13 @@ +=== modified file 'server/ltsp-update-image' +--- old/server/ltsp-update-image 2014-01-17 12:17:22 +0000 ++++ new/server/ltsp-update-image 2014-03-06 07:40:48 +0000 +@@ -265,7 +265,7 @@ + -h|--help) usage; exit 0 ;; + -m|--no-compress) NO_COMPRESS=true ;; + -n|--no-backup) NO_BACKUP=true ;; +- -r|--revert) REVERT=$1 ;; ++ -r|--revert) REVERT=true ;; + --version) ltsp_version; exit 0 ;; + --) shift ; break ;; + *) die "$0: Internal error!" ;; + diff -Nru ltsp-5.5.1/debian/patches/r2560-udhcp.diff ltsp-5.5.1/debian/patches/r2560-udhcp.diff --- ltsp-5.5.1/debian/patches/r2560-udhcp.diff 1970-01-01 00:00:00.000000000 +0000 +++ ltsp-5.5.1/debian/patches/r2560-udhcp.diff 2014-04-14 13:20:21.000000000 +0000 @@ -0,0 +1,65 @@ +=== modified file 'client/Debian/share/initramfs-tools/scripts/init-premount/udhcp' +--- old/client/Debian/share/initramfs-tools/scripts/init-premount/udhcp 2014-03-03 14:50:17 +0000 ++++ new/client/Debian/share/initramfs-tools/scripts/init-premount/udhcp 2014-03-06 09:15:36 +0000 +@@ -46,15 +46,14 @@ + + bring_up_interfaces() + { +- local i ++ local i j + +- # Wait for the network interfaces to become available ++ # Wait for a network interface to become available + i=0 + while i=$(($i+1)); do +- interfaces=$(ip -oneline link show | sed -n '/ether/s/[0-9 :]*\([^:]*\).*/\1/p') +- if [ -n "$interfaces" ]; then ++ if [ -n "$(ip -oneline link show | sed -n '/ether/s/[0-9 :]*\([^:]*\).*/\1/p')" ]; then + break +- elif [ $i -ge 10 ]; then ++ elif [ $i -ge 30 ]; then + # After a while, give a shell to the user in case he can fix it + panic "No network interfaces found" + i=0 +@@ -63,17 +62,18 @@ + fi + done + +- # Bring up the interface(s). $interface is set with BOOTIF. +- for i in ${interface:-$interfaces}; do +- ip link set dev $i up +- done +- + # Wait for a network interface to be up + i=0 + while i=$(($i+1)); do ++ # Bring up the interfaces. Note that more interfaces may become ++ # available progressively, so `ip link show` needs to be re-run. ++ for j in $(ip -oneline link show | sed -n '/ether/s/[0-9 :]*\([^:]*\).*/\1/p'); do ++ ip link set dev $j up ++ done ++ # Check if an interface is up + if ip -oneline link show up | grep -vw lo | grep -q LOWER_UP; then + break +- elif [ $i -ge 10 ]; then ++ elif [ $i -ge 30 ]; then + # After a while, give a shell to the user in case he can fix it + panic "No network interfaces are up" + i=0 +@@ -169,9 +169,12 @@ + { + hostname_param=${hostname:+"-h $hostname"} + ip_param=${ip:+"-r $ip"} +-# If a specific interface wasn't provided, try all of them +-# TODO: it would be nice if we could prefer the interface with the connected cable, though +-interfaces=${interface:-$interfaces} ++# If a specific interface wasn't provided, try all of the connected ones ++if [ -n "$interface" ]; then ++ interfaces=$interface ++else ++ interfaces=$(ip -oneline link show | grep LOWER_UP | sed -n '/ether/s/[0-9 :]*\([^:]*\).*/\1/p') ++fi + + # Clear screen when quiet to dampen some noise + [ "$quiet" = "y" ] && clear + diff -Nru ltsp-5.5.1/debian/patches/series ltsp-5.5.1/debian/patches/series --- ltsp-5.5.1/debian/patches/series 2014-03-14 13:29:31.000000000 +0000 +++ ltsp-5.5.1/debian/patches/series 2014-04-14 13:20:46.000000000 +0000 @@ -3,3 +3,7 @@ jetpipe-from-ltsp-client-core-init-script manpages-use-debian-version default-to-24-bit-video +r2557-plymouth.diff +r2558-udhcp.diff +r2559-revert-support.diff +r2560-udhcp.diff