Ubuntu Pastebin

Paste from serge at Thu, 9 Apr 2015 23:45:54 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
diff -u upstart-1.13.2/debian/changelog upstart-1.13.2/debian/changelog
--- upstart-1.13.2/debian/changelog
+++ upstart-1.13.2/debian/changelog
@@ -1,3 +1,10 @@
+upstart (1.13.2-0ubuntu13) vivid; urgency=medium
+
+  * remove running-in-container - it is moved to init-system-helpers and
+    made to work also with systemd.  (LP: #1442228)
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com>  Thu, 09 Apr 2015 18:40:12 -0500
+
 upstart (1.13.2-0ubuntu12) vivid; urgency=medium
 
   * debian/xsession.d/99upstart:
reverted:
--- upstart-1.13.2/debian/running-in-container
+++ upstart-1.13.2.orig/debian/running-in-container
@@ -1,10 +0,0 @@
-#!/bin/sh
-# Return 0 if in a container, 1 if not
-# if in a container, also print the container type
-status container-detect 2>/dev/null | grep -q start
-
-if [ $? -eq 0 ]; then
-    [ -f /run/container_type ] && cat /run/container_type
-    exit 0
-fi
-exit 1
diff -u upstart-1.13.2/debian/upstart.install upstart-1.13.2/debian/upstart.install
--- upstart-1.13.2/debian/upstart.install
+++ upstart-1.13.2/debian/upstart.install
@@ -2,7 +2,6 @@
 bin/initctl2dot usr/bin/
 debian/conf/*.conf etc/init/
 debian/migrate-inittab.pl usr/lib/upstart/
-debian/running-in-container bin/
 debian/upstart-job lib/init/
 debian/upstart-xsessions etc/
 debian/user-conf/*.conf usr/share/upstart/sessions/
Download as text