From 6acd330376a325123806b6f1c2113f4a99557ef3 Mon Sep 17 00:00:00 2001 From: Steve McIntyre Date: Tue, 28 Apr 2015 00:34:38 +0100 Subject: [PATCH] Remove mention of desktop choice from yaboot boot messages Backport of fix for #783569 --- data/jessie/yaboot/boot.msg | 9 --------- data/jessie/yaboot/boot32.msg | 10 ---------- debian/changelog | 7 +++++++ 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/data/jessie/yaboot/boot.msg b/data/jessie/yaboot/boot.msg index 86249465..8133ab39 100644 --- a/data/jessie/yaboot/boot.msg +++ b/data/jessie/yaboot/boot.msg @@ -15,14 +15,5 @@ Press TAB for a full list of options. If the system fails to boot with a white screen which doesn't go away, add 'video=ofonly'. -The following desktop environments are available: -gnome, kde, xfce and lxde. The default on this ${MEDIA_TYPE} -is ${DEFAULT_DESKTOP}. -If you prefer a different desktop, append - "desktop=" -e.g. to do an expert install with the xfce desktop -environment, type - "expert desktop=xfce" -at the "boot:" prompt. diff --git a/data/jessie/yaboot/boot32.msg b/data/jessie/yaboot/boot32.msg index d1da7b82..0d04e7fd 100644 --- a/data/jessie/yaboot/boot32.msg +++ b/data/jessie/yaboot/boot32.msg @@ -12,13 +12,3 @@ If the system fails to boot with a white screen which doesn't go away, try: install video=ofonly - -The following desktop environments are available: -gnome, kde, xfce and lxde. The default on this ${MEDIA_TYPE} -is ${DEFAULT_DESKTOP}. -If you prefer a different desktop, append - "desktop=" -e.g. to do an expert install with the xfce desktop -environment, type - "expert desktop=xfce" -at the "boot:" prompt. diff --git a/debian/changelog b/debian/changelog index 4fcb3504..08d047e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium + + * Backports of fixes from debian-cd in unstable: + + Remove mention of desktop choice from yaboot boot messages + (Closes: #783569) + + debian-cd (3.1.17) unstable; urgency=medium [ Steve McIntyre ]