Ubuntu Pastebin

Paste from liuxg at Tue, 15 Nov 2016 10:26:47 +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
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
liuxg@liuxg:~/work/src/github.com/snapcore/snapd/interfaces$ git diff . ~/snappy/desktop/snapd/interfaces/
diff --git a/interfaces/./builtin/all.go b/home/liuxg/snappy/desktop/snapd/interfaces/builtin/all.go
index 598dd5e..e5be948 100644
--- a/interfaces/./builtin/all.go
+++ b/home/liuxg/snappy/desktop/snapd/interfaces/builtin/all.go
@@ -79,7 +79,6 @@ var allInterfaces = []interfaces.Interface{
        NewShutdownInterface(),
        NewTimeControlInterface(),
        NewLibvirtInterface(),
-       NewRebootInterface(),
 }
 
 // Interfaces returns all of the built-in interfaces.
diff --git a/interfaces/./builtin/all_test.go b/home/liuxg/snappy/desktop/snapd/interfaces/builtin/all_test.go
index 28faffa..052f486 100644
--- a/interfaces/./builtin/all_test.go
+++ b/home/liuxg/snappy/desktop/snapd/interfaces/builtin/all_test.go
@@ -77,5 +77,4 @@ func (s *AllSuite) TestInterfaces(c *C) {
        c.Check(all, DeepContains, builtin.NewKernelModuleControlInterface())
        c.Check(all, DeepContains, builtin.NewFuseSupportInterface())
        c.Check(all, DeepContains, builtin.NewTimeControlInterface())
-       c.Check(all, DeepContains, builtin.NewRebootInterface())        
 }
diff --git a/interfaces/./builtin/basedeclaration.go b/home/liuxg/snappy/desktop/snapd/interfaces/builtin/basedeclaration.go
index 555f007..28561bf 100644
--- a/interfaces/./builtin/basedeclaration.go
+++ b/home/liuxg/snappy/desktop/snapd/interfaces/builtin/basedeclaration.go
@@ -420,10 +420,6 @@ slots:
     allow-installation:
       slot-snap-type:
         - core
-  reboot:
-    allow-installation:
-      slot-snap-type:
-        - core        
 `
 
 func init() {
diff --git a/interfaces/./builtin/reboot.go b/interfaces/./builtin/reboot.go
deleted file mode 100644
index 8ae62e3..0000000
--- a/interfaces/./builtin/reboot.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package builtin
-
-import (
-       "github.com/snapcore/snapd/interfaces"
-)
-
-// NewRebootInterface returns a new "reboot" interface.
-func NewRebootInterface() interfaces.Interface {
-       return &commonInterface{
-               name: "reboot",
-               connectedPlugAppArmor: `capability sys_boot,`,
-               connectedPlugSecComp:  `reboot`,
-               reservedForOS:         true,
-       }
-}
Download as text