rename base-18 to core18

Makefile

@@ -29,9 +29,9 @@ install:
 		rm -f $(DESTDIR)/tmp/$$(basename $$f); \
 	done;
 	# only generate manifest file for lp build
-	if [ -e /build/base-18 ]; then \
+	if [ -e /build/core18 ]; then \
 		echo $$f; \
-		cp $(DESTDIR)/usr/share/snappy/dpkg.list /build/base-18/base-18-$$(date +%Y%m%d%H%M)_$(DPKG_ARCH).manifest; \
+		cp $(DESTDIR)/usr/share/snappy/dpkg.list /build/core18/core18-$$(date +%Y%m%d%H%M)_$(DPKG_ARCH).manifest; \
 	fi;
 
 .PHONY: check

README.md

@@ -1,4 +1,4 @@
-# Base 18 snap for snapd
+# Core18 snap for snapd
 
 This is a base snap for snapd that is based on Ubuntu 18.04
 

hooks/02-spread-support.chroot

@@ -1,7 +1,7 @@
 #!/bin/sh -x
 set -e
 
-# XXX: This is just for testing. This MUST NOT be a part of released base-18
+# XXX: This is just for testing. This MUST NOT be a part of released core18
 # snap. Before we have a way to inject the test support user into the image
 # this hack will do.
 

snapcraft.yaml

@@ -1,4 +1,4 @@
-name: base-18
+name: core18
 version: very-unstable
 summary: Runtime environment based on Ubuntu 18.04
 description: |

spread.yaml

@@ -1,6 +1,6 @@
-project: base-18
+project: core18
 environment:
-    PROJECT_PATH: /tmp/base-18
+    PROJECT_PATH: /tmp/core18
     LANG: "$(echo ${LANG:-C.UTF-8})"
     LANGUAGE: "$(echo ${LANGUAGE:-en})"
 backends:
@@ -14,10 +14,10 @@ backends:
             echo "Discard called"
             make -C tests/lib background-stop
         systems:
-            - base-18-amd64:
+            - core18-amd64:
                 username: ubuntu
                 password: ubuntu
-path: /tmp/base-18
+path: /tmp/core18
 exclude:
     - "*.raw"
     - "*.snap"
@@ -36,5 +36,5 @@ restore: |
     true
 suites:
     tests/main/:
-        summary: Tests for base-18 snap.
+        summary: Tests for core18 snap.
 # vim:ts=4:sw=4:et

tests/lib/.gitignore

@@ -1,4 +1,4 @@
-base-18/
+core18/
 core-snap/
 core_*.assert
 initrd

tests/lib/Makefile

@@ -5,12 +5,12 @@ QEMU_CMD = qemu-system-x86_64 \
 	-m 1500 \
 	-netdev user,id=mynet0,hostfwd=tcp::8022-:22,hostfwd=tcp::8090-:80 \
 	-device virtio-net-pci,netdev=mynet0 \
-	-drive file=base-18/image.raw,format=raw \
+	-drive file=core18/image.raw,format=raw \
 	-vga qxl \
 	-snapshot \
 	-kernel kernel \
 	-initrd initrd \
-	-append "root=LABEL=writable snap_core=base-18_very-unstable_amd64.snap snap_kernel=pc-kernel.snap ro net.ifnames=0 init=/lib/systemd/systemd console=tty1 systemd.debug-shell=1"
+	-append "root=LABEL=writable snap_core=core18_very-unstable_amd64.snap snap_kernel=pc-kernel.snap ro net.ifnames=0 init=/lib/systemd/systemd console=tty1 systemd.debug-shell=1"
 
 # Update (or build if missing) and boot the image
 .PHONY: update-and-boot
@@ -22,26 +22,26 @@ update-and-boot:
 # Update (or build if missing) the image.
 .PHONY: just-update
 .ONESHELL: just-update
-just-update: kernel initrd ../../base-18_very-unstable_amd64.snap
-	if [ ! -e base-18/image.raw ]; then
+just-update: kernel initrd ../../core18_very-unstable_amd64.snap
+	if [ ! -e core18/image.raw ]; then
 		# Create some files and directories so that they are all owned by us.
-		mkdir -p base-18/p1
-		mkdir -p base-18/p2
-		mkdir -p base-18/p3
-		touch base-18/image.raw
-		touch base-18/image.script
-		sudo ./create-image base-18
+		mkdir -p core18/p1
+		mkdir -p core18/p2
+		mkdir -p core18/p3
+		touch core18/image.raw
+		touch core18/image.script
+		sudo ./create-image core18
 	fi
-	# Update (this puts the kernel and new base-18 snap inside)
-	sudo ./mount-image base-18
-	sudo cp ../../base-18_very-unstable_amd64.snap base-18/p3/system-data/var/lib/snapd/snaps/
-	sudo cp --dereference pc-kernel.snap base-18/p3/system-data/var/lib/snapd/snaps/
-	sudo ./umount-image base-18
+	# Update (this puts the kernel and new core18 snap inside)
+	sudo ./mount-image core18
+	sudo cp ../../core18_very-unstable_amd64.snap core18/p3/system-data/var/lib/snapd/snaps/
+	sudo cp --dereference pc-kernel.snap core18/p3/system-data/var/lib/snapd/snaps/
+	sudo ./umount-image core18
 
 # Just boot the image
 .PHONY: just-boot
 .ONESHELL: just-boot
-just-boot: kernel initrd base-18/image.raw
+just-boot: kernel initrd core18/image.raw
 	$(QEMU_CMD)
 
 # Start the image in the background. This is relevant for spread.
@@ -69,7 +69,7 @@ clean:
 	rm -f kernel
 	rm -f pc-kernel_*.assert
 	rm -f pc-kernel_*.snap
-	rm -rf base-18
+	rm -rf core18
 	rm -rf kernel-snap
 	rm -rf core-snap
 	rm -f core.snap

tests/lib/README.md

@@ -1,4 +1,4 @@
-This directory contains support scripts boot-testing the base-18 snap.
+This directory contains support scripts boot-testing the core18 snap.
 The test is very crude as you have to do it interactively.
 
 After booting move to VT7 by clicking on the qemu window and pressing alt+right