Merge pull request #2 from Shells-com/master

merge master

Author: Bernhard Landauer

official_images.txt

@@ -11,3 +11,4 @@ ubuntu-focal-lubuntu-desktop
 ubuntu-focal-openssh-server
 ubuntu-focal-ubuntu-desktop
 ubuntu-focal-xubuntu-desktop
+ubuntu-focal-rescue

os_requirements.txt

@@ -5,3 +5,4 @@ If you want to submit and/or maintain distribution of your choice for official S
 * 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.
+* Shells images are running on our Shells kernel, if you want your images to be ran by your distro kernel, you will need to supply that kernel, a way to resize the disk, a bootloader, the kernel parameters etc.

oscfg/manjaro.sh

@@ -21,7 +21,7 @@ manjaro_cfg() {
 	run pacman -S --noconfirm base systemd-sysvcompat iputils inetutils iproute2 sudo qemu-guest-agent
 
 	# make sudo available without password (default for key auth)
-	echo "%wheel ALL=(ALL) NOPASSWD: ALL" > "$WORK/etc/sudoers.d/01-wheel" & chmod 440 "$WORK/etc/sudoers.d/01-wheel"
+	echo "%shellsuser ALL=(ALL) NOPASSWD: ALL" > "$WORK/etc/sudoers.d/01-shells" & chmod 440 "$WORK/etc/sudoers.d/01-shells"
 
 	# ensure desktop installation & guest tools
 	case "$1" in
@@ -35,6 +35,7 @@ manjaro_cfg() {
 			run pacman -S --noconfirm pamac-gtk pamac-snap-plugin pamac-flatpak-plugin
 			run systemctl enable lightdm
 			run systemctl enable apparmor snapd snapd.apparmor
+			sed -i -e 's|#%PAM-1.0|#%PAM-1.0\nauth        sufficient  pam_succeed_if.so user ingroup shellsuser|' $WORK/etc/pam.d/lightdm
 			sed -i -e 's|show-command-switchuser=true|show-command-switchuser=false|g' $WORK/etc/skel/.config/xfce4/panel/whiskermenu*.rc
 			sed -i -e 's|show-command-logout=true|show-command-logout=false|g' $WORK/etc/skel/.config/xfce4/panel/whiskermenu*.rc
 			sed -i -e 's|show-command-shutdown=false|show-command-shutdown=true|g' $WORK/etc/skel/.config/xfce4/panel/whiskermenu*.rc
@@ -84,6 +85,7 @@ EOF
 			run pacman -S --noconfirm pamac-gtk pamac-snap-plugin pamac-flatpak-plugin pamac-tray-icon-plasma xdg-desktop-portal xdg-desktop-portal-kde
 			run systemctl enable sddm
 			run systemctl enable apparmor snapd snapd.apparmor
+			sed -i -e 's|#%PAM-1.0|#%PAM-1.0\nauth        sufficient  pam_succeed_if.so user ingroup shellsuser|' $WORK/etc/pam.d/sddm
 			cat > "$WORK/etc/sddm.conf.d/manjaro-theme.conf" <<EOF
 [Theme]
 # Current theme name
@@ -114,6 +116,7 @@ EOF
 			run pacman -S --noconfirm networkmanager xf86-input-libinput xf86-video-qxl-debian xorg-server xorg-mkfontscale xorg-xkill phodav spice-vdagent xdg-user-dirs
 			run pacman -S --noconfirm pamac-gtk pamac-flatpak-plugin pamac-gnome-integration polkit-gnome xdg-desktop-portal xdg-desktop-portal-gtk
 			run systemctl enable gdm
+			sed -i -e 's|#%PAM-1.0|#%PAM-1.0\nauth        sufficient  pam_succeed_if.so user ingroup shellsuser|' $WORK/etc/pam.d/gdm-password
 			# run systemctl enable apparmor snapd snapd.apparmor
 			# update locale (only needed for GIS)
 			cp "$WORK/etc/locale.gen" "$WORK/etc/locale.gen.bak"

oscfg/ubuntu.sh

@@ -83,10 +83,26 @@ EOF
 			DEBIAN_FRONTEND=noninteractive run apt-get install -y gnupg
 			run apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 302F0738F465C1535761F965A6616109451BBBF2
 			echo "deb http://packages.linuxmint.com ulyssa main upstream import backport" >"$WORK/etc/apt/sources.list.d/linux-mint.list"
+			cat >> "$WORK/etc/apt/preferences.d/official-package-repositories.pref" <<EOF
+Package: *
+Pin: origin live.linuxmint.com
+Pin-Priority: 750
+
+Package: *
+Pin: release o=linuxmint,c=upstream
+Pin-Priority: 700
+EOF
 			run apt-get update
 			DEBIAN_FRONTEND=noninteractive run apt-get install -y cinnamon-session cinnamon nemo mint-info-cinnamon mintmenu mint-x-icons mintsystem mintwelcome
-			DEBIAN_FRONTEND=noninteractive run apt-get install -y firefox lightdm
-			DEBIAN_FRONTEND=noninteractive run apt purge -y gdm3
+			DEBIAN_FRONTEND=noninteractive run apt-get install -y firefox lightdm gdisk gdebi fwupd friendly-recovery gnome-terminal cinnamon-control-center
+			DEBIAN_FRONTEND=noninteractive run apt-get install -y mint-mirrors mint-artwork mint-backgrounds-ulyana mint-themes mintbackup mintdrivers mintinstall
+			DEBIAN_FRONTEND=noninteractive run apt-get install -y mintupdate libreoffice flatpak rhythmbox redshift p7zip-full openvpn
+			DEBIAN_FRONTEND=noninteractive run apt purge -y gdm3 ubuntu-release-upgrader-core gparted && run dpkg --configure -a
+			;;
+		rescue)
+			# special case of ubuntu install, non gfx
+			run apt-get update
+			DEBIAN_FRONTEND=noninteractive run apt-get install -y e2fsprogs fdisk build-essential vim mtr openssh-server parted ntpdate lvm2 gddrescue testdisk debootstrap xfsprogs mingetty
 			;;
 	esac
 
@@ -175,7 +191,6 @@ EOF
 
 	case "$1" in
 		*-desktop)
-
 			# create script to disable gnome screensaver stuff
 			if [ -d "$WORK/usr/share/backgrounds" ]; then
 				# install wallpaper
@@ -225,11 +240,34 @@ gsettings set org.gnome.desktop.background picture-uri file:////usr/share/backgr
 gsettings set org.gnome.desktop.interface gtk-theme "Material-Black-Blueberry-3.36"
 gsettings set org.gnome.desktop.interface icon-theme "Material-Black-Blueberry-3.36"
 
+EOF
+			;;
+	esac
+	
+	case "$TASKSEL" in
+		mint-cinnamon-desktop)
+			cat >> "$WORK/etc/skel/.xprofile" <<EOF
+gsettings set org.cinnamon.desktop.screensaver lock-enabled false
+gsettings set org.cinnamon.settings-daemon.plugins.power sleep-display-ac 0
+gsettings set org.cinnamon.desktop.lockdown disable-log-out true
+gsettings set org.cinnamon.desktop.lockdown disable-lock-screen true
+gsettings set org.cinnamon.desktop.lockdown disable-user-switching true
 EOF
 			;;
 	esac
 
 
 	# cleanup apt
 	run apt-get clean
+
+	if [ x"$TASKSEL" = x"rescue" ]; then
+		# make root autologin
+		mkdir -p "$WORK/etc/systemd/system/[email protected]"
+		cat >"$WORK/etc/systemd/system/[email protected]/override.conf" <<EOF
+[Service]
+ExecStart=
+ExecStart=-/sbin/agetty --noissue --autologin root --noclear %I
+Type=idle
+EOF
+	fi
 }

scripts/base.sh

@@ -117,6 +117,11 @@ EOF
 
 	umount "$WORK/proc" "$WORK/sys" "$WORK/dev" || umount -l "$WORK/proc" "$WORK/sys" "$WORK/dev" || true
 
+	# build squashfs image if requested NOW
+	if [ x"$MKSQUASHFS" != x ]; then
+		mksquashfs "$WORK" "$1-$DATE.squashfs" -comp xz -noappend -progress
+	fi
+
 	echo "Syncing..."
 	umount "$WORK"
 	"$QEMUNBD" -d "$NBD"
@@ -131,7 +136,7 @@ EOF
 		# grab rbdconv
 		git clone https://github.com/Shells-com/rbdconv.git
 	fi
-	php rbdconv/raw-to-rbd.php "$1-$DATE.raw" | xz -z -9 -T $(nproc --ignore=2) -v >"$1-$DATE.shells"
+	php rbdconv/raw-to-rbd.php "$1-$DATE.raw" | xz -z -9 -T $(nproc --ignore=4) -v >"$1-$DATE.shells"
 	rm -f "$1-$DATE.raw"
 
 	# complete, list the file

scripts/firstrun.sh

@@ -29,8 +29,7 @@ if [ x"$SYSTEM_UUID" = x"bdef7bde-f7bd-ef7b-def7-bdef7bdef7bd" ]; then
 	SHELLS_USERNAME="test"
 	SHELLS_SSH=""
 	SHELLS_TZ="UTC"
-	# shellcheck disable=SC2016
-	SHELLS_SHADOW='$6$m6x66dqWClittWFo$oY7sYQAZAwPELORe6HOKuxxlrZ1QBP7RvCaMG3tAIoGXC5Bbp.IeIssMEXLIupvBIpXa1NyeWmgXJeggiuWO91' # "test"
+	SHELLS_SHADOW=''
 	SHELLS_CMD=""
 else
 	# get internal API token
@@ -97,7 +96,7 @@ if [ x"$SHELLS_USERNAME" != x ]; then
 		gpasswd -a "${SHELLS_USERNAME}" autologin
 		sed -i -e "s/^.*autologin-user=.*/autologin-user=${SHELLS_USERNAME}/" /etc/lightdm/lightdm.conf
 		sed -i -e "s/^.*autologin-user-timeout=.*/autologin-user-timeout=0/" /etc/lightdm/lightdm.conf
-		sed -i -e "s/^.*pam-autologin-service=.*/pam-autologin-service=lightdm-autologin/" /etc/lightdm/lightdm.conf
+#		sed -i -e "s/^.*pam-autologin-service=.*/pam-autologin-service=lightdm-autologin/" /etc/lightdm/lightdm.conf
 		echo "auth        sufficient  pam_succeed_if.so user ingroup nopasswdlogin" >> /etc/pam.d/lightdm
 		groupadd -r nopasswdlogin
 		gpasswd -a "${SHELLS_USERNAME}" nopasswdlogin

scripts/qemu.sh

@@ -100,9 +100,13 @@ qemukernel() {
 	# arguments: qemukernel <qcow2 file> <kernel commandline opts>
 
 	# ensure we have a kernel
-	if [ ! -f shells-kernel/guest-linux-x86_64/release.txt ]; then
-		getfile shells-kernel-5.10.23-4128a20.tar.bz2 4128a20d14e8522894c78c8372eed113e620cf95678b2f993baaee37dd5587a5
-		tar xjf shells-kernel-5.10.23-4128a20.tar.bz2
+	KVER=""
+	if [ -f shells-kernel/guest-linux-x86_64/release.txt ]; then
+		KVER="$(cat shells-kernel/guest-linux-x86_64/release.txt)"
+	fi
+	if [ x"$KVER" != x"5.10.25-shells" ]; then
+		getfile shells-kernel-5.10.25-b75417c.tar.bz2 b75417c74293081149eb3b7c145a18b6201c6f14b35024062484570701abe86c
+		tar xjf shells-kernel-5.10.25-b75417c.tar.bz2
 	fi
 
 	if [ x"$ARCH" = x ]; then