diff -Nru live-build-3.0~a57/debian/changelog live-build-3.0~a57/debian/changelog --- live-build-3.0~a57/debian/changelog 2014-10-30 14:56:00.000000000 +0000 +++ live-build-3.0~a57/debian/changelog 2015-03-10 21:14:28.000000000 +0000 @@ -1,3 +1,11 @@ +live-build (3.0~a57-1ubuntu15) vivid; urgency=medium + + * debian/patches/upstart-user-sessions: Only do the upstart initctl + dance if initcl was in the debootstrapped system, so we don't end + up deleting the initctl from the desktop package set install pass + + -- Adam Conrad Tue, 10 Mar 2015 15:08:59 -0600 + live-build (3.0~a57-1ubuntu14) vivid; urgency=medium * ubuntu-pack-bootlogo.patch: diff -Nru live-build-3.0~a57/debian/patches/series live-build-3.0~a57/debian/patches/series --- live-build-3.0~a57/debian/patches/series 2014-10-30 14:31:53.000000000 +0000 +++ live-build-3.0~a57/debian/patches/series 2015-03-10 21:14:36.000000000 +0000 @@ -24,3 +24,4 @@ remove-etc-machineid chroot-resolv-conf-allow-symlinks ubuntu-pack-bootlogo.patch +upstart-user-sessions diff -Nru live-build-3.0~a57/debian/patches/upstart-user-sessions live-build-3.0~a57/debian/patches/upstart-user-sessions --- live-build-3.0~a57/debian/patches/upstart-user-sessions 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a57/debian/patches/upstart-user-sessions 2015-03-10 21:15:49.000000000 +0000 @@ -0,0 +1,35 @@ +Description: Fix upstart handling in a mixed upstart/systemd world + * debian/patches/upstart-user-sessions: Only do the upstart initctl + dance if initcl was in the debootstrapped system, so we don't end + up deleting the initctl from the desktop package set install pass +Author: Adam Conrad +Last-Update: 2015-03-10 + +--- live-build-3.0~a57.orig/scripts/build/lb_chroot_upstart ++++ live-build-3.0~a57/scripts/build/lb_chroot_upstart +@@ -44,7 +44,6 @@ case "${1}" in + then + # Save initctl file + mv chroot/sbin/initctl chroot/sbin/initctl.orig +- fi + + # Create initctl file + cat > chroot/sbin/initctl << EOF +@@ -54,6 +53,7 @@ exit 101 + EOF + + chmod 0755 chroot/sbin/initctl ++ fi + + # Creating stage file + Create_stagefile .build/chroot_upstart +@@ -72,9 +72,6 @@ EOF + then + # Restore initctl file + mv chroot/sbin/initctl.orig chroot/sbin/initctl +- else +- # Remove initctl file +- rm -f chroot/sbin/initctl + fi + + # Removing stage file