many: move firstboot code into the snapd daemon

asserts/fetcher.go

@@ -74,7 +74,7 @@ func (f *fetcher) chase(ref *Ref, a Assertion) error {
 	case fetchSaved:
 		return nil // nothing to do
 	case fetchRetrieved:
-		return fmt.Errorf("internal error: circular assertions are not expected: %s %v", ref.Type.Name, ref.PrimaryKey)
+		return fmt.Errorf("internal error: circular assertions are not expected: %s", ref)
 	}
 	if a == nil {
 		retrieved, err := f.retrieve(ref)

cmd/snap/cmd_booted.go

@@ -23,12 +23,6 @@ import (
 	"fmt"
 
 	"github.com/jessevdk/go-flags"
-
-	"github.com/snapcore/snapd/i18n"
-	"github.com/snapcore/snapd/overlord"
-	"github.com/snapcore/snapd/overlord/boot"
-	"github.com/snapcore/snapd/partition"
-	"github.com/snapcore/snapd/release"
 )
 
 type cmdBooted struct{}
@@ -43,28 +37,14 @@ func init() {
 	cmd.hidden = true
 }
 
+// WARNING: do not remove this command, older systems may still have
+//          a systemd snapd.firstboot.service job in /etc/systemd/system
+//          that we did not cleanup. so we need this dummy command or
+//          those units will start failing.
 func (x *cmdBooted) Execute(args []string) error {
 	if len(args) > 0 {
 		return ErrExtraArgs
 	}
-
-	if release.OnClassic {
-		fmt.Fprintf(Stdout, i18n.G("Ignoring 'booted' on classic"))
-		return nil
-	}
-
-	bootloader, err := partition.FindBootloader()
-	if err != nil {
-		return fmt.Errorf(i18n.G("cannot mark boot successful: %s"), err)
-	}
-
-	if err := partition.MarkBootSuccessful(bootloader); err != nil {
-		return err
-	}
-
-	ovld, err := overlord.New()
-	if err != nil {
-		return err
-	}
-	return boot.UpdateRevisions(ovld)
+	fmt.Fprintf(Stderr, "booted command is deprecated")
+	return nil
 }

cmd/snap/cmd_first_boot.go

@@ -20,9 +20,9 @@
 package main
 
 import (
-	"github.com/jessevdk/go-flags"
+	"fmt"
 
-	"github.com/snapcore/snapd/overlord/boot"
+	"github.com/jessevdk/go-flags"
 )
 
 type cmdInternalFirstBoot struct{}
@@ -36,10 +36,14 @@ func init() {
 	cmd.hidden = true
 }
 
+// WARNING: do not remove this command, older systems may still have
+//          a systemd snapd.firstboot.service job in /etc/systemd/system
+//          that we did not cleanup. so we need this dummy command or
+//          those units will start failing.
 func (x *cmdInternalFirstBoot) Execute(args []string) error {
 	if len(args) > 0 {
 		return ErrExtraArgs
 	}
-
-	return boot.FirstBoot()
+	fmt.Fprintf(Stderr, "firstboot command is deprecated")
+	return nil
 }

debian/rules

@@ -64,18 +64,10 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 endif
 
 override_dh_systemd_enable:
-	# enable boot-ok
-	dh_systemd_enable \
-		-psnapd \
-		snapd.boot-ok.service
 	# enable auto-import
 	dh_systemd_enable \
 		-psnapd \
 		snapd.autoimport.service
-	# enable the first boot service
-	dh_systemd_enable \
-		-psnapd \
-		snapd.firstboot.service
 	# we want the auto-update timer enabled by default
 	dh_systemd_enable \
 		-psnapd \
@@ -94,10 +86,6 @@ override_dh_systemd_enable:
 		snapd.service
 
 override_dh_systemd_start:
-	# start boot-ok
-	dh_systemd_start \
-		-psnapd \
-		snapd.boot-ok.service
 	# we want to start the auto-update timer
 	dh_systemd_start \
 		-psnapd \
@@ -157,11 +145,7 @@ override_dh_install:
 	install --mode=0644 debian/*.socket debian/snapd/$(SYSTEMD_UNITS_DESTDIR)
 	install --mode=0644 debian/snapd.service debian/snapd/$(SYSTEMD_UNITS_DESTDIR)
 	install --mode=0644 debian/*.target debian/snapd/$(SYSTEMD_UNITS_DESTDIR)
-	install --mode=0644 debian/snapd.boot-ok.service debian/snapd/$(SYSTEMD_UNITS_DESTDIR)
-	install --mode=0644 debian/snapd.firstboot.service debian/snapd/$(SYSTEMD_UNITS_DESTDIR)
 ifeq ($(RELEASE),trusty)
-	dh_link debian/snapd/$(SYSTEMD_UNITS_DESTDIR)/snapd.firstboot.service debian/snapd/$(SYSTEMD_UNITS_DESTDIR)/multi-user.target.wants/snapd.firstboot.service
-	dh_link debian/snapd/$(SYSTEMD_UNITS_DESTDIR)/snapd.boot-ok.service debian/snapd/$(SYSTEMD_UNITS_DESTDIR)/multi-user.target.wants/snapd.boot-ok.service
 	dh_link debian/snapd/$(SYSTEMD_UNITS_DESTDIR)/snapd.service debian/snapd/$(SYSTEMD_UNITS_DESTDIR)/multi-user.target.wants/snapd.service
 	dh_link debian/snapd/$(SYSTEMD_UNITS_DESTDIR)/snapd.autoimport.service debian/snapd/$(SYSTEMD_UNITS_DESTDIR)/multi-user.target.wants/snapd.autoimport.service
 endif

debian/snapd.frameworks-pre.target

@@ -2,6 +2,5 @@
 
 [Unit]
 Description=Ready for frameworks
-After=snapd.firstboot.service
 After=cloud-init.service
 

debian/snapd.refresh.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=Automatically refresh installed snaps
-After=network.target snapd.firstboot.service snapd.socket
+After=network.target snapd.socket
 Requisite=snapd.socket
 ConditionPathExistsGlob=/snap/*/current
 Documentation=man:snap(1)

debian/snapd.service

@@ -1,8 +1,5 @@
 [Unit]
 Description=Snappy daemon
-#FIXME: snappy on ubuntu does not have a snapd.firstboot snap installed
-#After=snapd.firstboot.service
-Before=snapd.frameworks-pre.target
 Requires=snapd.socket
 
 [Service]

dirs/dirs.go

@@ -53,8 +53,7 @@ var (
 	SnapAssertsDBDir      string
 	SnapTrustedAccountKey string
 
-	SnapStateFile      string
-	SnapFirstBootStamp string
+	SnapStateFile string
 
 	SnapBinariesDir     string
 	SnapServicesDir     string
@@ -127,10 +126,6 @@ func SetRootDir(rootdir string) {
 	SnapSeedDir = filepath.Join(rootdir, snappyDir, "seed")
 	SnapDeviceDir = filepath.Join(rootdir, snappyDir, "device")
 
-	// NOTE: if you change stampFile, update the condition in
-	// snapd.firstboot.service to match
-	SnapFirstBootStamp = filepath.Join(rootdir, snappyDir, "firstboot", "stamp")
-
 	SnapBinariesDir = filepath.Join(SnapMountDir, "bin")
 	SnapServicesDir = filepath.Join(rootdir, "/etc/systemd/system")
 	SnapBusPolicyDir = filepath.Join(rootdir, "/etc/dbus-1/system.d")