Merge lp:~mvo/snappy/snappy-systemctl-enable into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Vogt]

This branch sets a manual symlink to enable a systemd unit instead of using systemctl enable that may not be available on the system.

[Sergio Schvezov (sergiusens)]

Please remerge trunk

review: Needs Fixing

Unmerged revisions

308. By Michael Vogt on 2015-04-08

manually set the symlink that systemctl enable sets to ensure that ubuntu-device-flash works on systems with no systemd

307. By Sergio Schvezov on 2015-04-06

Fixing tests:
- Check for len 0 for system hooks when inhibiting.
- Make it easier on editors that trim empty spaces.

306. By Sergio Schvezov on 2015-04-06

systemctl not to be called with inhibithooks

=== modified file 'snappy/click.go'
--- snappy/click.go	2015-04-08 18:53:49 +0000
+++ snappy/click.go	2015-04-13 14:30:45 +0000
@@ -70,6 +70,9 @@
 	pattern string
 }
 
+// the default target for systemd units that we generate
+const servicesSystemdTarget = "multi-user.target"
+
 const (
 	// from debsig-verify-0.9/debsigs.h
 	dsSuccess           = 0
@@ -421,13 +424,14 @@
 {{if .StopTimeout}}TimeoutStopSec={{.StopTimeout}}{{end}}
 
 [Install]
-WantedBy=multi-user.target
+WantedBy={{.ServicesSystemdTarget}}
 `
 	var templateOut bytes.Buffer
 	t := template.Must(template.New("wrapper").Parse(serviceTemplate))
 	wrapperData := struct {
 		// embed service struct
 		Service
+<<<<<<< TREE
 		// but we need more
 		Name             string
 		Version          string
@@ -437,12 +441,22 @@
 		FullPathStop     string
 		FullPathPostStop string
 		AppTriple        string
+=======
+		AppPath               string
+		AaProfile             string
+		FullPathStart         string
+		FullPathStop          string
+		FullPathPostStop      string
+		AppTriple             string
+		ServicesSystemdTarget string
+>>>>>>> MERGE-SOURCE
 	}{
 		service, m.Name, m.Version, baseDir, aaProfile,
 		filepath.Join(baseDir, service.Start),
 		filepath.Join(baseDir, service.Stop),
 		filepath.Join(baseDir, service.PostStop),
 		fmt.Sprintf("%s_%s_%s", m.Name, service.Name, m.Version),
+		servicesSystemdTarget,
 	}
 	if err := t.Execute(&templateOut, wrapperData); err != nil {
 		// this can never happen, except we forget a variable
@@ -467,6 +481,7 @@
 	return dir[len(globalRootDir):]
 }
 
+<<<<<<< TREE
 func checkPackageForNameClashes(baseDir string) error {
 	m, err := parsePackageYamlFile(filepath.Join(baseDir, "meta", "package.yaml"))
 	if err != nil {
@@ -477,6 +492,18 @@
 }
 
 func addPackageServices(baseDir string, inhibitHooks bool, inter interacter) error {
+=======
+// enable a service via manual symlink creation. Note that we can not
+// use "systemctl enable" as this code needs to run via ubuntu-device-flash
+// on a host that may not have systemd installed
+func systemdEnable(serviceFilename string) error {
+	enableTargetSymlink := filepath.Join(snapServicesDir, servicesSystemdTarget+".wants", filepath.Base(serviceFilename))
+
+	return os.Symlink(stripGlobalRootDir(serviceFilename), enableTargetSymlink)
+}
+
+func addPackageServices(baseDir string, inhibitHooks bool) error {
+>>>>>>> MERGE-SOURCE
 	m, err := parsePackageYamlFile(filepath.Join(baseDir, "meta", "package.yaml"))
 	if err != nil {
 		return err
@@ -501,7 +528,13 @@
 		//
 		// *but* always run enable (which just sets a symlink)
 		serviceName := filepath.Base(generateServiceFileName(m, service))
+
+		if err := systemdEnable(serviceFilename); err != nil {
+			return err
+		}
+
 		if !inhibitHooks {
+<<<<<<< TREE
 			sysd := systemd.New(globalRootDir, inter)
 			if err := sysd.DaemonReload(); err != nil {
 				return err
@@ -512,6 +545,13 @@
 			}
 
 			if err := sysd.Start(serviceName); err != nil {
+=======
+			if err := runSystemctl("daemon-reload"); err != nil {
+				return err
+			}
+
+			if err := runSystemctl("start", serviceName); err != nil {
+>>>>>>> MERGE-SOURCE
 				return err
 			}
 		}

=== modified file 'snappy/click_test.go'
--- snappy/click_test.go	2015-04-08 18:53:49 +0000
+++ snappy/click_test.go	2015-04-13 14:30:45 +0000
@@ -452,10 +452,8 @@
 	// it go de-activated and finally 2.0 got activated
 	content, err := ioutil.ReadFile(filepath.Join(s.tempdir, "hook.trace"))
 	c.Assert(err, IsNil)
-	c.Assert(string(content), Equals, `now: ./bar_app_1.0.tracehook
-now: 
-now: ./bar_app_2.0.tracehook
-`)
+	expected := fmt.Sprintf("now: ./bar_app_1.0.tracehook\nnow: \nnow: ./bar_app_2.0.tracehook\n")
+	c.Assert(string(content), Equals, expected)
 }
 
 func (s *SnapTestSuite) TestClickCopyDataHookFails(c *C) {
@@ -629,13 +627,21 @@
 	_, err := installClick(snapFile, AllowUnauthenticated, nil)
 	c.Assert(err, IsNil)
 
-	servicesFile := filepath.Join(snapServicesDir, "foo.mvo_service_1.0.service")
+	// ensure that we have the services file
+	serviceName := "foo.mvo_service_1.0.service"
+	servicesFile := filepath.Join(snapServicesDir, serviceName)
 	c.Assert(helpers.FileExists(servicesFile), Equals, true)
 	st, err := os.Stat(servicesFile)
 	c.Assert(err, IsNil)
 	// should _not_ be executable
 	c.Assert(st.Mode().String(), Equals, "-rw-r--r--")
 
+	// ensure that we have the wants symlink
+	enabledSymlink := filepath.Join(snapServicesDir, servicesSystemdTarget+".wants", serviceName)
+	target, err := os.Readlink(enabledSymlink)
+	c.Assert(err, IsNil)
+	c.Assert(target, Equals, stripGlobalRootDir(servicesFile))
+
 	// and that it gets removed on remove
 	snapDir := filepath.Join(snapAppsDir, "foo.mvo", "1.0")
 	err = removeClick(snapDir, new(progress.NullProgress))
@@ -662,8 +668,12 @@
 	_, err := installClick(snapFile, 0, nil)
 	c.Assert(err, IsNil)
 
+<<<<<<< TREE
 	c.Assert(allSystemctl, HasLen, 3)
 	c.Assert(allSystemctl[1], DeepEquals, []string{"--root", globalRootDir, "enable", "foo.mvo_service_1.0.service"})
+=======
+	c.Assert(allSystemctl, HasLen, 0)
+>>>>>>> MERGE-SOURCE
 }
 
 const expectedService = `[Unit]

=== modified file 'snappy/snapp_test.go'
--- snappy/snapp_test.go	2015-04-09 09:10:06 +0000
+++ snappy/snapp_test.go	2015-04-13 14:30:45 +0000
@@ -52,6 +52,9 @@
 	clickSystemHooksDir = filepath.Join(s.tempdir, "/usr/share/click/hooks")
 	os.MkdirAll(clickSystemHooksDir, 0755)
 
+	// create a fake systemd environment
+	os.MkdirAll(filepath.Join(snapServicesDir, servicesSystemdTarget+".wants"), 0755)
+
 	// we may not have debsig-verify installed (and we don't need it
 	// for the unittests)
 	runDebsigVerify = func(snapFile string, allowUnauth bool) (err error) {