Merge lp:~cyphermox/casper/shutdown into lp:ubuntu/vivid/casper

[Mathieu Trudel-Lapierre]

=== modified file 'bin/casper-stop'
--- bin/casper-stop	2015-03-26 03:02:27 +0000
+++ bin/casper-stop	2015-04-13 19:48:18 +0000
@@ -25,8 +25,10 @@
     path="$1"
 
     if [ -d "$path" ]; then
-        find "$path" -type f | xargs cat > /dev/null 2>&1
-    elif [ -f "$path" ]; then
+        for f in $(find "$path" -type f); do
+            cache_path "$f"
+        done
+    elif [ -f "$path" ] && [ ! -L "$path" ]; then
         if [ -x "$path" ]; then
             if file -L "$path" | grep -q 'dynamically linked'; then
                 for lib in $(ldd "$path" | awk '{ print $3 }'); do
@@ -34,7 +36,7 @@
                 done
             fi
         fi
-        cat "$path" >/dev/null 2>&1
+        echo -n >> "$path"
     fi
 }
 
@@ -73,7 +75,7 @@
         prompt=
     fi
 
-    for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth; do
+    for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth /lib/plymouth /lib/*/plymouth /lib/systemd /etc/systemd /lib/*/libnss_files* /etc/nsswitch.conf /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf /etc/fonts/fonts.conf /etc/fonts/conf.d/60-latin.conf; do
         cache_path "$path"
     done
 
 
=== modified file 'debian/casper.service'
--- debian/casper.service	2015-03-26 03:02:27 +0000
+++ debian/casper.service	2015-04-13 19:48:18 +0000
@@ -1,11 +1,12 @@
 [Unit]
 Description=Shuts down the "live" preinstalled system cleanly
 DefaultDependencies=no
-Before=shutdown.target
+Before=final.target
+After=shutdown.target umount.target
 
 [Service]
 Type=oneshot
 ExecStart=/sbin/casper-stop
 
 [Install]
-WantedBy=shutdown.target
+WantedBy=final.target
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-03-27 11:03:03 +0000
+++ debian/changelog	2015-04-13 19:48:18 +0000
@@ -1,3 +1,22 @@
+casper (1.359) UNRELEASED; urgency=medium
+
+  * Do a better job at caching files we might need for plymouth and systemd
+    on shutdown. (LP: #1436656)
+  * debian/casper.service: Order the casper service just before final.target
+    so it's running at a better point in time on shutdown.
+  * scripts/casper-bottom/25disable_cdrom.mount: mask the cdrom.mount task,
+    so it doesn't unncessarily spin trying to unmount the cdrom, which casper
+    will do. (LP: #1436715)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 13 Apr 2015 09:56:23 -0500
+
+casper (1.358) vivid; urgency=medium
+
+  * In 34disable_kde_services disable kubuntu-notification-helper and
+    muon notifications on live system
+
+ -- Jonathan Riddell <[e-mail]>  Thu, 02 Apr 2015 15:09:31 +0200
+
 casper (1.357) vivid; urgency=medium
 
   * Adjust screenlocker disabling for Kubuntu with Plasma 5.3 the locking
 
=== added file 'scripts/casper-bottom/25disable_cdrom.mount'
--- scripts/casper-bottom/25disable_cdrom.mount	1970-01-01 00:00:00 +0000
+++ scripts/casper-bottom/25disable_cdrom.mount	2015-04-13 19:48:18 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+ln -s /dev/null /root/lib/systemd/system/cdrom.mount
 
=== modified file 'scripts/casper-bottom/34disable_kde_services'
--- scripts/casper-bottom/34disable_kde_services	2015-03-27 11:03:03 +0000
+++ scripts/casper-bottom/34disable_kde_services	2015-04-13 19:48:18 +0000
@@ -39,6 +39,9 @@
 if [ -d /root/usr/share/kubuntu-default-settings/kf5-settings/ ]; then
     printf "[Daemon]\nTimeout=0\nAutolock=false\n" >> /root/usr/share/kubuntu-default-settings/kf5-settings/kscreenlockerrc
     printf "[Basic Settings]\nIndexing-Enabled=false\n" >> /root/usr/share/kubuntu-default-settings/kf5-settings/baloofilerc
+    printf "[Module-notificationhelper]\nautoload=false\n" >> /root/usr/share/kubuntu-default-settings/kf5-settings/kded5rc
+    printf "[Event/Update]\nAction=\n" >> /root/usr/share/kubuntu-default-settings/kf5-settings/muonabstractnotifier.notifyrc
+    printf "[Event/Update]\nAction=\n" >> /root/usr/share/kubuntu-default-settings/kf5-settings/muonapplicationnotifier.notifyrc
 fi
 
 log_end_msg