Import patches-unapplied version 2.469 to ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 577646d435de9082462cda66f75722fd427f3bbb

New changelog entries:
  * Unminimization information should only go to motd when we are actually
    minimized.
This commit is contained in:
Steve Langasek 2017-10-08 16:08:10 -04:00 committed by usd-importer
parent 577646d435
commit 2ec24bdfce
2 changed files with 11 additions and 4 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.469) artful; urgency=medium
* Unminimization information should only go to motd when we are actually
minimized.
-- Steve Langasek <steve.langasek@ubuntu.com> Sun, 08 Oct 2017 16:08:10 -0400
livecd-rootfs (2.468) artful; urgency=medium livecd-rootfs (2.468) artful; urgency=medium
[ Dimitri John Ledkov ] [ Dimitri John Ledkov ]

View File

@ -135,10 +135,9 @@ rm -f /etc/update-motd.d/60-unminimize
EOF EOF
chmod +x chroot/usr/local/sbin/unminimize chmod +x chroot/usr/local/sbin/unminimize
fi
# inform users about the unminimize script # inform users about the unminimize script
cat > "chroot/etc/update-motd.d/60-unminimize" << EOF cat > "chroot/etc/update-motd.d/60-unminimize" << EOF
#!/bin/sh #!/bin/sh
# #
# This file is not managed by a package. If you no longer want to # 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." echo "To restore this content, you can run the 'unminimize' command."
EOF 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 \ Chroot chroot "dpkg-divert --quiet --add \
--divert /usr/sbin/update-initramfs.REAL --rename \ --divert /usr/sbin/update-initramfs.REAL --rename \
/usr/sbin/update-initramfs" /usr/sbin/update-initramfs"