Merge pull request #3 from Shells-com/master

merge shells master

Author: Bernhard Landauer

README.md

@@ -14,7 +14,7 @@ For list of currently available builds, take a look at [official_images.txt](htt
 
 # Submit/maintain your distribution
 
-Shells wants to help Linux community as much as it can, so if you would like to see your own distribution on the list, submit PR with it and we will gladly merge it. Be sure to read about some simple rules around how to build images for Shells at [os_requirements.txt](https://github.com/Shells-com/linux-scripts/blob/master/os_requirements.txt).
+Shells wants to help Linux community as much as it can, so if you would like to see your own distribution on the list, submit PR with it and we will gladly merge it. Be sure to read about some simple rules around how to build images for Shells at [os_requirements.md](https://github.com/Shells-com/linux-scripts/blob/master/os_requirements.md).
 
 # Testing
 

os_requirements.md

@@ -0,0 +1,33 @@
+If you want to submit and/or maintain distribution of your choice for official Shells build, you must meet the following criteria:
+
+* Make sure image is ready for Shells infrastructure (look for example into other OS build scripts here in repository).
+* No password for users (we disable the passwords, enabled passwordless sudo and passwordless polkit auth in firstrun script, so keep that in mind).
+* Set user to autologin (we try to achieve this in firstrun script but if you see difference not applying for your OS, be sure to do it).
+* Disable power saving (screensavers, sleep, automatic logout etc).
+* Disable logout option.
+* Be sure to have in your image spice-vdagent and qemu-guest-agent.
+
+## Naming
+
+All images are typically named as `distribution-version-variation`. For
+example Ubuntu Focal with Ubuntu Desktop installed would be called
+`ubuntu-focal-ubuntu-desktop`. All images providing a desktop environment must
+end in `-desktop`.
+
+## Custom kernel
+
+By default Shells boots all images with the Shells kernel, which is a LTS
+vanilla kernel built by the Shells team. This kernel comes with an initrd that
+will perform a number of operations prior to booting the OS, such as ensuring
+the modules are installed for the running kernel, resizing the disk partition
+to use the whole disk, setup a swap partition, etc.
+
+You can however supply your own kernel but will need to ensure the following:
+
+* The image must be a 8GB or less BIOS-bootable bootable partition
+* On boot, you should check if the disk is larger than the partition(s) cover,
+  and resize the disk appropriately. If you have a swap partition you may
+  consider moving it toward the end of the disk.
+* Make sure you have the virtio modules enabled in your kernel, as well as
+  anything required to run qxl if doing an desktop image.
+

os_requirements.txt

@@ -18,7 +18,7 @@ manjaro_cfg() {
 	run pacman -Syu --noconfirm
 	run pacman-mirrors -f 15
 
-	run pacman -S --noconfirm base systemd-sysvcompat iputils inetutils iproute2 sudo qemu-guest-agent
+	run pacman -Syy --noconfirm base systemd-sysvcompat iputils inetutils iproute2 sudo qemu-guest-agent
 
 	# make sudo available without password (default for key auth)
 	echo "%shellsuser ALL=(ALL) NOPASSWD: ALL" > "$WORK/etc/sudoers.d/01-shells" & chmod 440 "$WORK/etc/sudoers.d/01-shells"

oscfg/manjaro.sh

@@ -154,9 +154,9 @@ add_firstrun() {
 		AFTER="systemd-networkd-wait-online.service"
 	fi
 
-	if [ -d "$WORK/lib/systemd/system" ]; then
+	if [ -d "$WORK/usr/lib/systemd/system" ]; then
 		# systemd method
-		cat >"$WORK/lib/systemd/system/cloud-firstrun.service" <<EOF
+		cat >"$WORK/usr/lib/systemd/system/cloud-firstrun.service" <<EOF
 [Unit]
 Description=Cloud firstrun handler
 ConditionFileIsExecutable=/.firstrun.sh

scripts/base.sh

@@ -22,7 +22,7 @@ ResultActive=yes
 EOF
 	elif [ -d "$WORK/etc/polkit-1/rules.d/" ]; then
 		cat >"$WORK/etc/polkit-1/rules.d/49-nopasswd_shells.rules" <<EOF
-#rules for all distros
+// rules for all distros
 polkit.addRule(function(action, subject) {
     if (subject.isInGroup("shellsuser")) {
         return polkit.Result.YES;