cmd/snap: implement userd command as replacement for snapd-xdg-open #3260
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| // -*- Mode: Go; indent-tabs-mode: t -*- | ||
|
|
||
| /* | ||
| * Copyright (C) 2017 Canonical Ltd | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 3 as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| "os/signal" | ||
| "syscall" | ||
|
|
||
| "github.com/jessevdk/go-flags" | ||
|
|
||
| "github.com/snapcore/snapd/i18n" | ||
| "github.com/snapcore/snapd/userd" | ||
| ) | ||
|
|
||
| type cmdUserd struct { | ||
| userd userd.Userd | ||
| } | ||
|
|
||
| var shortUserdHelp = i18n.G("Start the userd service") | ||
| var longUserdHelp = i18n.G("The userd command starts the snap user session service.") | ||
|
|
||
| func init() { | ||
| cmd := addCommand("userd", | ||
| shortAbortHelp, | ||
| longAbortHelp, | ||
| func() flags.Commander { | ||
| return &cmdUserd{} | ||
| }, | ||
| nil, | ||
| []argDesc{}, | ||
| ) | ||
| cmd.hidden = true | ||
| } | ||
|
|
||
| func (x *cmdUserd) Execute(args []string) error { | ||
| if len(args) > 0 { | ||
| return ErrExtraArgs | ||
| } | ||
|
|
||
| if err := x.userd.Init(); err != nil { | ||
| return err | ||
| } | ||
| x.userd.Start() | ||
|
|
||
| ch := make(chan os.Signal) | ||
| signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM, syscall.SIGUSR1) | ||
| select { | ||
| case sig := <-ch: | ||
| fmt.Fprintf(Stdout, "Exiting on %s.\n", sig) | ||
| case <-x.userd.Dying(): | ||
| // something called Stop() | ||
| } | ||
|
|
||
| return x.userd.Stop() | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| // -*- Mode: Go; indent-tabs-mode: t -*- | ||
|
|
||
| /* | ||
| * Copyright (C) 2016 Canonical Ltd | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 3 as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| package main_test | ||
|
|
||
| import ( | ||
| "os" | ||
| "syscall" | ||
| "time" | ||
|
|
||
| . "gopkg.in/check.v1" | ||
|
|
||
| snap "github.com/snapcore/snapd/cmd/snap" | ||
| "github.com/snapcore/snapd/testutil" | ||
| ) | ||
|
|
||
| type userdSuite struct { | ||
| BaseSnapSuite | ||
| testutil.DBusTest | ||
| } | ||
|
|
||
| var _ = Suite(&userdSuite{}) | ||
|
|
||
| func (s *userdSuite) TestUserdBadCommandline(c *C) { | ||
| _, err := snap.Parser().ParseArgs([]string{"userd", "extra-arg"}) | ||
| c.Assert(err, ErrorMatches, "too many arguments for command") | ||
| } | ||
|
|
||
| func (s *userdSuite) TestUserd(c *C) { | ||
| go func() { | ||
| defer func() { | ||
| me, err := os.FindProcess(os.Getpid()) | ||
| c.Assert(err, IsNil) | ||
| me.Signal(syscall.SIGUSR1) | ||
| }() | ||
|
|
||
| needle := "io.snapcraft.Launcher" | ||
| for i := 0; i < 10; i++ { | ||
| for _, objName := range s.SessionBus.Names() { | ||
| if objName == needle { | ||
| return | ||
| } | ||
| time.Sleep(1 * time.Second) | ||
| } | ||
|
|
||
| } | ||
| c.Fatalf("%s does not appeared on the bus", needle) | ||
| }() | ||
|
|
||
| rest, err := snap.Parser().ParseArgs([]string{"userd"}) | ||
| c.Assert(err, IsNil) | ||
| c.Check(rest, DeepEquals, []string{}) | ||
| c.Check(s.Stdout(), Equals, "Exiting on user defined signal 1.\n") | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| all install clean: | ||
| $(MAKE) -C systemd $@ | ||
| $(MAKE) -C dbus $@ | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # | ||
| # Copyright (C) 2017 Canonical Ltd | ||
| # | ||
| # This program is free software: you can redistribute it and/or modify | ||
| # it under the terms of the GNU General Public License version 3 as | ||
| # published by the Free Software Foundation. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, | ||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| # GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License | ||
| # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| BINDIR := /usr/bin | ||
| DBUSSERVICESDIR := /usr/share/dbus-1/services | ||
|
|
||
| SERVICES_GENERATED := $(patsubst %.service.in,%.service,$(wildcard *.service.in)) | ||
| SERVICES := ${SERVICES_GENERATED} | ||
|
|
||
| %.service: %.service.in | ||
| cat $< | sed 's:@bindir@:${BINDIR}:g' | cat > $@ | ||
|
|
||
| all: ${SERVICES} | ||
|
|
||
| install: ${SERVICES} | ||
| install -D -m 0644 -t ${DESTDIR}/${DBUSSERVICESDIR} $^ | ||
|
|
||
| clean: | ||
| rm -f ${SERVICES_GENERATED} |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| [D-BUS Service] | ||
| Name=io.snapcraft.Launcher | ||
| Exec=@bindir@/snap userd | ||
|
There was a problem hiding this comment. Feels like libexecdir thing to me. There was a problem hiding this comment. This is the regular There was a problem hiding this comment. This is correct, though I expected this to be implemented in a libexecdir command, as users shouldn't usually do things here. Not a biggie, though. |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ Build-Depends: autoconf, | |
| autotools-dev, | ||
| bash-completion, | ||
| debhelper (>= 9), | ||
| dbus, | ||
| dh-apparmor, | ||
| dh-autoreconf, | ||
| dh-golang (>=1.7), | ||
|
|
@@ -64,8 +65,8 @@ Depends: adduser, | |
| systemd, | ||
| ${misc:Depends}, | ||
| ${shlibs:Depends} | ||
| Replaces: ubuntu-snappy (<< 1.9), ubuntu-snappy-cli (<< 1.9), snap-confine (<< 2.23), ubuntu-core-launcher (<< 2.22), snapd-xdg-open (<< 0.0.0) | ||
|
There was a problem hiding this comment. Finally, thank you again for doing this :-) There was a problem hiding this comment. That is an insane number of |
||
| Breaks: ubuntu-snappy (<< 1.9), ubuntu-snappy-cli (<< 1.9), snap-confine (<< 2.23), ubuntu-core-launcher (<< 2.22), snapd-xdg-open (<< 0.0.0) | ||
| Conflicts: snap (<< 2013-11-29-1ubuntu1) | ||
| Built-Using: ${Built-Using} ${misc:Built-Using} | ||
| Description: Tool to interact with Ubuntu Core Snappy. | ||
|
|
@@ -112,3 +113,11 @@ Section: oldlibs | |
| Pre-Depends: dpkg (>= 1.15.7.2) | ||
| Description: Transitional package for snapd | ||
| This is a transitional dummy package. It can safely be removed. | ||
|
|
||
| Package: snapd-xdg-open | ||
|
There was a problem hiding this comment. keeping this as separate package will break for users using only "apt-get upgrade" (vs dist-upgrade) if snapd gets a dependency on it. There was a problem hiding this comment. similar to snap-confine btw ... There was a problem hiding this comment. It will stay a separate package but produced by the snapd source package so we can migrate people away from the other snapd-xdg-open deb package. That was the idea. Didn't tested yet this works well. There was a problem hiding this comment. well, but that means you have to either add a recommends (in which case the package will never be installed for users only doing "apt-get upgrade") or you add a hard dependency in which case users of "apt-get upgrade" will get an upgrade error. we have tons of bugs for that case from snap-confine which was one of the reasons to include it without a separate package, keeping a separate binary package looks to me like we are exactly re-introducing the same problem again just with another package now. There was a problem hiding this comment. We need one or another way to get the snapd-xdg-open package removed from installations out there. If we have a binary package produced by two different source packages but the second one has a higher version as the first one isn't then the one from the first source package overwritten? The Recommends is for sure missing. Any other ways how we can achieve this? There was a problem hiding this comment. yes, include the binaries in snapd and have the proper breaks/replaces lines (and perhaps a provides) in the snapd package. There was a problem hiding this comment. Ok, including the binaries in the snapd package was the plan. Will add the Breaks/Replaces line. There was a problem hiding this comment. CC @mvo5 - I think we just want to have this in the main snapd package and have snapd-xdg-open as an empty transitional package. |
||
| Architecture: any | ||
| Depends: snapd (= ${binary:Version}), ${misc:Depends} | ||
| Section: oldlibs | ||
| Pre-Depends: dpkg (>= 1.15.7.2) | ||
| Description: Transitional package for snapd-xdg-open | ||
| This is a transitional dummy package. It can safely be removed. | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for using
$(MAKE)