From e509a81f1d71bfadbe023deff45adbb00bc8b3f0 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sun, 8 Oct 2017 16:08:07 -0400 Subject: [PATCH] Unminimization information should only go to motd when we are actually minimized. --- debian/changelog | 7 +++++++ live-build/auto/build | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index de0d48ed..d2ea8ce5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.469) UNRELEASED; urgency=medium + + * Unminimization information should only go to motd when we are actually + minimized. + + -- Steve Langasek Sun, 08 Oct 2017 16:07:42 -0400 + livecd-rootfs (2.468) artful; urgency=medium [ Dimitri John Ledkov ] diff --git a/live-build/auto/build b/live-build/auto/build index 5b1e147e..29439fa0 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -135,10 +135,9 @@ rm -f /etc/update-motd.d/60-unminimize EOF chmod +x chroot/usr/local/sbin/unminimize - fi - # inform users about the unminimize script - cat > "chroot/etc/update-motd.d/60-unminimize" << EOF + # inform users about the unminimize script + cat > "chroot/etc/update-motd.d/60-unminimize" << EOF #!/bin/sh # # This file is not managed by a package. If you no longer want to @@ -149,7 +148,8 @@ echo "" echo "To restore this content, you can run the 'unminimize' command." EOF - chmod +x chroot/etc/update-motd.d/60-unminimize + chmod +x chroot/etc/update-motd.d/60-unminimize + fi Chroot chroot "dpkg-divert --quiet --add \ --divert /usr/sbin/update-initramfs.REAL --rename \ /usr/sbin/update-initramfs"