From 0d9b6996dbb3bf130a21e01db5e61472d2bb98ce Mon Sep 17 00:00:00 2001 From: Davide Guidi Date: Mon, 16 Nov 2020 21:01:50 +0000 Subject: [PATCH 01/24] Fix time update issue on cosmo --- scripts/setup-user.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/setup-user.sh b/scripts/setup-user.sh index c27cb6b..eaf24c5 100755 --- a/scripts/setup-user.sh +++ b/scripts/setup-user.sh @@ -221,3 +221,5 @@ useradd --gid 9999 --no-create-home --home-dir /nonexistent --no-user-group --sy groupadd -g 100000 cosmo useradd -m -u 100000 -g 100000 -G audio,input,video,sudo,aid_system,aid_graphics,aid_input,aid_audio,aid_net_bt_admin,aid_net_bt,aid_inet,aid_net_raw,aid_net_admin -s /bin/bash cosmo echo cosmo:cosmo | chpasswd + +usermod systemd-timesync -a -G aid_inet From 0c6eb18cc62f4aacb18aa145dc6a0bd86841aeec Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Wed, 2 Dec 2020 11:59:01 +0000 Subject: [PATCH 02/24] Adding screenshot tool --- variants/kde-plasma.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/variants/kde-plasma.yaml b/variants/kde-plasma.yaml index 6ecf242..99d8184 100644 --- a/variants/kde-plasma.yaml +++ b/variants/kde-plasma.yaml @@ -32,6 +32,7 @@ actions: - xserver-xorg - xserver-xorg-input-evdev - codi-app + - kde-spectacle - action: run chroot: true From e059a9b1b5757dd3fad50618c16f0266b1d70570 Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Wed, 2 Dec 2020 11:59:33 +0000 Subject: [PATCH 03/24] Removing expired key --- scripts/add-gemian-repos.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/add-gemian-repos.sh b/scripts/add-gemian-repos.sh index fc5cbe4..ca3e9ec 100755 --- a/scripts/add-gemian-repos.sh +++ b/scripts/add-gemian-repos.sh @@ -17,4 +17,3 @@ echo "Pin: origin gemian-buster.thinkglobally.org" >> /etc/apt/preferences.d/gem echo "Pin-Priority: 2000" >> /etc/apt/preferences.d/gemian.pref curl https://gemian.thinkglobally.org/archive-key.asc | apt-key add - -curl http://gemian-buster.thinkglobally.org/gemian-buster-key.asc | apt-key add - From b6ebaf95ae90b05c8777f6db2159c43dbf91f46a Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Sun, 13 Dec 2020 18:11:17 +0000 Subject: [PATCH 04/24] Adding avahi --- gemian-common.yaml | 2 +- scripts/setup-user.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gemian-common.yaml b/gemian-common.yaml index 283d793..3bf6e5a 100644 --- a/gemian-common.yaml +++ b/gemian-common.yaml @@ -15,7 +15,7 @@ actions: - action: apt description: Installing additional Debian packages - packages: [ curl, gnupg, net-tools, openssh-server, sudo ] + packages: [ curl, gnupg, net-tools, openssh-server, sudo, avahi-daemon ] - action: run chroot: true diff --git a/scripts/setup-user.sh b/scripts/setup-user.sh index eaf24c5..03351fa 100755 --- a/scripts/setup-user.sh +++ b/scripts/setup-user.sh @@ -223,3 +223,4 @@ useradd -m -u 100000 -g 100000 -G audio,input,video,sudo,aid_system,aid_graphics echo cosmo:cosmo | chpasswd usermod systemd-timesync -a -G aid_inet +usermod avahi -a -G aid_inet From 9319320f84c06408335e133781676d63fd6ef590 Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Wed, 23 Dec 2020 16:31:42 +0000 Subject: [PATCH 05/24] These are now built into the kernel --- overlay/cosmopda/etc/modules-load.d/cosmocom-connectivity.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/overlay/cosmopda/etc/modules-load.d/cosmocom-connectivity.conf b/overlay/cosmopda/etc/modules-load.d/cosmocom-connectivity.conf index 65a7d3a..7e7ffc7 100644 --- a/overlay/cosmopda/etc/modules-load.d/cosmocom-connectivity.conf +++ b/overlay/cosmopda/etc/modules-load.d/cosmocom-connectivity.conf @@ -1,4 +1,2 @@ -wlan_drv_gen3 -bt_drv gps_drv fmradio_drv From ef86a9d087dca1de2d6f67dc27781738cf834ed8 Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Tue, 29 Dec 2020 12:51:59 +0000 Subject: [PATCH 06/24] Adding mobile broadband provider info to default builds --- gemian-common.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gemian-common.yaml b/gemian-common.yaml index 3bf6e5a..8995602 100644 --- a/gemian-common.yaml +++ b/gemian-common.yaml @@ -43,6 +43,7 @@ actions: - xkb-data - xserver-xorg-video-hwcomposer - xss-lock + - mobile-broadband-provider-info - action: run chroot: true From 9c8121cc8e45328cba71113487978ba416b6255d Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Tue, 29 Dec 2020 12:52:21 +0000 Subject: [PATCH 07/24] Adding bluebinder to cosomo builds --- cosmopda.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cosmopda.yaml b/cosmopda.yaml index a4017e8..f048f85 100644 --- a/cosmopda.yaml +++ b/cosmopda.yaml @@ -20,7 +20,7 @@ actions: - action: apt description: Installing Cosmo Communicator-specific packages - packages: [ droid-hal-cosmopda ] + packages: [ droid-hal-cosmopda, bluebinder ] - action: run description: Generate /usr/share/kernel/linux-boot.img for Cosmo Communicator From 36f1a1a891d2a9629e411f24cead5c864a5bac1a Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Mon, 4 Jan 2021 16:34:11 +0000 Subject: [PATCH 08/24] Adding some UI bits for bluetooth support --- variants/kde-plasma.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/variants/kde-plasma.yaml b/variants/kde-plasma.yaml index 99d8184..009d765 100644 --- a/variants/kde-plasma.yaml +++ b/variants/kde-plasma.yaml @@ -33,6 +33,11 @@ actions: - xserver-xorg-input-evdev - codi-app - kde-spectacle + - bluetooth + - rfkill + - bluedevil + - bluez-tools + - pulseaudio-module-bluetooth - action: run chroot: true From d7392f65765927e316f8df603340069a975104bb Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Mon, 4 Jan 2021 16:35:19 +0000 Subject: [PATCH 09/24] Migrated to lxc-android, gemian-system, stopped persistent journaling and removed root password setting (use sudo) --- cosmopda.yaml | 7 +++---- gemian-common.yaml | 10 +++++++++- geminipda.yaml | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/cosmopda.yaml b/cosmopda.yaml index f048f85..86c555f 100644 --- a/cosmopda.yaml +++ b/cosmopda.yaml @@ -20,7 +20,7 @@ actions: - action: apt description: Installing Cosmo Communicator-specific packages - packages: [ droid-hal-cosmopda, bluebinder ] + packages: [ bluebinder ] - action: run description: Generate /usr/share/kernel/linux-boot.img for Cosmo Communicator @@ -29,12 +29,11 @@ actions: - action: run chroot: true - command: echo cosmopda > /etc/hostname + command: echo cosmocom > /etc/hostname - action: run chroot: true - description: Setting password on root user (useful for testing, remove later) - command: echo root:root | chpasswd + command: echo "127.0.0.1 cosmocom" >> /etc/hosts - action: run chroot: true diff --git a/gemian-common.yaml b/gemian-common.yaml index 8995602..705e0f5 100644 --- a/gemian-common.yaml +++ b/gemian-common.yaml @@ -43,7 +43,10 @@ actions: - xkb-data - xserver-xorg-video-hwcomposer - xss-lock - - mobile-broadband-provider-info + - bash-completion + - system-image + - lxc-android + - locales - action: run chroot: true @@ -64,3 +67,8 @@ actions: chroot: true description: Setting Gemian users script: scripts/setup-user.sh + + - action: run + chroot: true + description: Removing /var/log/journal to avoid persisant journaling + command: rm -rf /var/log/journal/ diff --git a/geminipda.yaml b/geminipda.yaml index 4512c9f..4fdcf3f 100644 --- a/geminipda.yaml +++ b/geminipda.yaml @@ -14,7 +14,7 @@ actions: - action: apt description: Installing Gemini PDA-specific packages - packages: [ droid-hal-cosmopda gemian-system initramfs-tools-halium gemian-modular-kernel ] + packages: [ droid-hal-cosmopda initramfs-tools-halium gemian-modular-kernel ] - action: run chroot: true From 8464779d0211625bccdf9751de374e068bc8b8c8 Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Mon, 4 Jan 2021 23:15:12 +0000 Subject: [PATCH 10/24] Removing most likely target for build failure --- gemian-common.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gemian-common.yaml b/gemian-common.yaml index 705e0f5..df5c054 100644 --- a/gemian-common.yaml +++ b/gemian-common.yaml @@ -68,7 +68,3 @@ actions: description: Setting Gemian users script: scripts/setup-user.sh - - action: run - chroot: true - description: Removing /var/log/journal to avoid persisant journaling - command: rm -rf /var/log/journal/ From 45f1833df6383a77ee24472f8808f25bf468ca76 Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Mon, 4 Jan 2021 23:29:58 +0000 Subject: [PATCH 11/24] Miss-reading the error, system-image -> gemian-system --- gemian-common.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gemian-common.yaml b/gemian-common.yaml index df5c054..5214cab 100644 --- a/gemian-common.yaml +++ b/gemian-common.yaml @@ -44,7 +44,7 @@ actions: - xserver-xorg-video-hwcomposer - xss-lock - bash-completion - - system-image + - gemian-system - lxc-android - locales @@ -68,3 +68,7 @@ actions: description: Setting Gemian users script: scripts/setup-user.sh + - action: run + chroot: true + description: Removing /var/log/journal to avoid persisant journaling + command: rm -rf /var/log/journal/ From 6c456ac83cc11a8c23ab9f77741ac304cfff3207 Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Wed, 6 Jan 2021 19:09:49 +0000 Subject: [PATCH 12/24] Fix for target-device setting --- cosmopda.yaml | 8 ++++++-- gemian-common.yaml | 6 +----- geminipda.yaml | 8 +++++++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/cosmopda.yaml b/cosmopda.yaml index 86c555f..04ae36d 100644 --- a/cosmopda.yaml +++ b/cosmopda.yaml @@ -1,4 +1,4 @@ -{{- $image := or .image "gemian-cosmopda.tgz" -}} +{{- $image := or .image "gemian-cosmocom.tgz" -}} {{- $output := or .output "tarball" -}} {{- $variant := or .variant "mate" -}} @@ -20,7 +20,11 @@ actions: - action: apt description: Installing Cosmo Communicator-specific packages - packages: [ bluebinder ] + target-device: mt6771 + packages: + - bluebinder + - gemian-system + - lxc-android - action: run description: Generate /usr/share/kernel/linux-boot.img for Cosmo Communicator diff --git a/gemian-common.yaml b/gemian-common.yaml index 5214cab..08aa4b8 100644 --- a/gemian-common.yaml +++ b/gemian-common.yaml @@ -15,7 +15,7 @@ actions: - action: apt description: Installing additional Debian packages - packages: [ curl, gnupg, net-tools, openssh-server, sudo, avahi-daemon ] + packages: [ curl, gnupg, net-tools, openssh-server, sudo, avahi-daemon, locales, bash-completion ] - action: run chroot: true @@ -43,10 +43,6 @@ actions: - xkb-data - xserver-xorg-video-hwcomposer - xss-lock - - bash-completion - - gemian-system - - lxc-android - - locales - action: run chroot: true diff --git a/geminipda.yaml b/geminipda.yaml index 4fdcf3f..bbbd045 100644 --- a/geminipda.yaml +++ b/geminipda.yaml @@ -14,7 +14,13 @@ actions: - action: apt description: Installing Gemini PDA-specific packages - packages: [ droid-hal-cosmopda initramfs-tools-halium gemian-modular-kernel ] + target-device: mt6797 + packages: + - droid-hal-cosmopda + - initramfs-tools-halium + - gemian-modular-kernel + - gemian-system + - lxc-android - action: run chroot: true From de065b80abf0588c1db04ebc2f78fc6c19b24602 Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Wed, 6 Jan 2021 22:15:51 +0000 Subject: [PATCH 13/24] Expand size to ensure disk image is big enough --- cosmopda.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cosmopda.yaml b/cosmopda.yaml index 04ae36d..8c3ae74 100644 --- a/cosmopda.yaml +++ b/cosmopda.yaml @@ -88,7 +88,8 @@ actions: {{ if eq $output "image" }} - action: image-file imagename: {{ $image }} - imagesize: 3221225472 + imagesize: 6000000000 + fs: ext4 fsname: "gemian" From 0635d74697920ae7a994292f98ee97d5950fa406 Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Sun, 10 Jan 2021 15:33:57 +0000 Subject: [PATCH 14/24] Adding media-hub - needed by camera app and requires a reboot for the service to start --- cosmopda.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cosmopda.yaml b/cosmopda.yaml index 8c3ae74..984ba5c 100644 --- a/cosmopda.yaml +++ b/cosmopda.yaml @@ -23,6 +23,7 @@ actions: target-device: mt6771 packages: - bluebinder + - media-hub - gemian-system - lxc-android From 4d5dc59e666ef81c9fb3c7d45d1d7dc019114aa7 Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Tue, 12 Jan 2021 14:41:31 +0000 Subject: [PATCH 15/24] Add permissions for camera-app video support --- scripts/setup-user.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/setup-user.sh b/scripts/setup-user.sh index 03351fa..fec2500 100755 --- a/scripts/setup-user.sh +++ b/scripts/setup-user.sh @@ -224,3 +224,5 @@ echo cosmo:cosmo | chpasswd usermod systemd-timesync -a -G aid_inet usermod avahi -a -G aid_inet +sudo usermod pulse -a -G aid_media +sudo usermod cosmo -a -G aid_media From 8557ae44ab37ad9e4623a30645fb68c05c344c9b Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Thu, 14 Jan 2021 11:46:19 +0000 Subject: [PATCH 16/24] Adding dependency upon the kernel --- cosmopda.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cosmopda.yaml b/cosmopda.yaml index 984ba5c..b63d6f1 100644 --- a/cosmopda.yaml +++ b/cosmopda.yaml @@ -26,6 +26,7 @@ actions: - media-hub - gemian-system - lxc-android + - cosmo-linux-kernel - action: run description: Generate /usr/share/kernel/linux-boot.img for Cosmo Communicator From 378c3693122483fc60d8cc090dbd6a0dec08fa85 Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Sat, 16 Jan 2021 23:56:40 +0000 Subject: [PATCH 17/24] Adding lxcfs and uidmap as these are pulled in by apt on the command line but not when installed via debos Moved journal removal to later in the process as it was still present on the built image --- cosmopda.yaml | 7 +++++++ gemian-common.yaml | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cosmopda.yaml b/cosmopda.yaml index b63d6f1..62fbf4b 100644 --- a/cosmopda.yaml +++ b/cosmopda.yaml @@ -26,6 +26,8 @@ actions: - media-hub - gemian-system - lxc-android + - lxcfs + - uidmap - cosmo-linux-kernel - action: run @@ -81,6 +83,11 @@ actions: description: Removing xserver-xorg-input-libinput as it does not work with touchscreen yet command: apt remove xserver-xorg-input-libinput + - action: run + chroot: true + description: Removing /var/log/journal to avoid persisant journaling + command: rm -rf /var/log/journal/ + {{ if eq $output "tarball" }} - action: pack file: {{ $image }} diff --git a/gemian-common.yaml b/gemian-common.yaml index 08aa4b8..39b7d53 100644 --- a/gemian-common.yaml +++ b/gemian-common.yaml @@ -64,7 +64,3 @@ actions: description: Setting Gemian users script: scripts/setup-user.sh - - action: run - chroot: true - description: Removing /var/log/journal to avoid persisant journaling - command: rm -rf /var/log/journal/ From c56a391b95d001f0e5f26bc7cf689dbdf8974fa5 Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Sun, 28 Feb 2021 12:30:39 +0000 Subject: [PATCH 18/24] Removing cosmo only component from image --- geminipda.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/geminipda.yaml b/geminipda.yaml index bbbd045..0bd5f7c 100644 --- a/geminipda.yaml +++ b/geminipda.yaml @@ -16,7 +16,6 @@ actions: description: Installing Gemini PDA-specific packages target-device: mt6797 packages: - - droid-hal-cosmopda - initramfs-tools-halium - gemian-modular-kernel - gemian-system From 5608097f28b1afd3bd1202b13bc3a601d69ab23f Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Sun, 28 Feb 2021 12:31:11 +0000 Subject: [PATCH 19/24] Adding camera app --- gemian-common.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gemian-common.yaml b/gemian-common.yaml index 39b7d53..14d6495 100644 --- a/gemian-common.yaml +++ b/gemian-common.yaml @@ -43,6 +43,7 @@ actions: - xkb-data - xserver-xorg-video-hwcomposer - xss-lock + - camera-app - action: run chroot: true From 0129806fa12c95c65c64a2834afe0be18d293b5c Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Thu, 25 Mar 2021 19:55:03 +0000 Subject: [PATCH 20/24] Fix physical width to the actual mm size of the screen --- overlay/common/etc/X11/xorg.conf.d/20-hwcomposer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/common/etc/X11/xorg.conf.d/20-hwcomposer.conf b/overlay/common/etc/X11/xorg.conf.d/20-hwcomposer.conf index 51ecf35..4d1882a 100644 --- a/overlay/common/etc/X11/xorg.conf.d/20-hwcomposer.conf +++ b/overlay/common/etc/X11/xorg.conf.d/20-hwcomposer.conf @@ -1,6 +1,6 @@ Section "Monitor" Identifier "Monitor0" - DisplaySize 135 68 # In millimeters + DisplaySize 136 68 # In millimeters - see physical_height/width in kernel sources (aeon_ssd2092_fhd_dsi_solomon.c - Cosmo) EndSection Section "Device" From 272f4157d7955c5e04bee4f9475648120c6c141d Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Mon, 29 Mar 2021 19:53:57 +0100 Subject: [PATCH 21/24] Fixes for default and new user group memberships --- overlay/common/etc/adduser.conf | 2 +- scripts/setup-user.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/overlay/common/etc/adduser.conf b/overlay/common/etc/adduser.conf index 948d2f5..ae028a1 100644 --- a/overlay/common/etc/adduser.conf +++ b/overlay/common/etc/adduser.conf @@ -74,7 +74,7 @@ SKEL_IGNORE_REGEX="dpkg-(old|new|dist|save)" # new users to other groups. # This is the list of groups that new non-system users will be added to # Default: -EXTRA_GROUPS="audio video sudo aid_system aid_graphics aid_input aid_audio aid_net_bt_admin aid_net_bt aid_inet aid_inet_raw aid_inet_admin" +EXTRA_GROUPS="audio input video sudo dialout aid_media aid_system aid_graphics aid_input aid_audio aid_net_bt_admin aid_net_bt aid_inet aid_inet_raw aid_inet_admin" # If ADD_EXTRA_GROUPS is set to something non-zero, the EXTRA_GROUPS # option above will be default behavior for adding new, non-system users diff --git a/scripts/setup-user.sh b/scripts/setup-user.sh index fec2500..53c2841 100755 --- a/scripts/setup-user.sh +++ b/scripts/setup-user.sh @@ -219,10 +219,9 @@ groupadd --gid 9999 aid_nobody useradd --gid 9999 --no-create-home --home-dir /nonexistent --no-user-group --system --shell /usr/sbin/nologin --uid 9999 aid_nobody groupadd -g 100000 cosmo -useradd -m -u 100000 -g 100000 -G audio,input,video,sudo,aid_system,aid_graphics,aid_input,aid_audio,aid_net_bt_admin,aid_net_bt,aid_inet,aid_net_raw,aid_net_admin -s /bin/bash cosmo +useradd -m -u 100000 -g 100000 -G audio,input,video,sudo,dialout,aid_media,aid_system,aid_graphics,aid_input,aid_audio,aid_net_bt_admin,aid_net_bt,aid_inet,aid_net_raw,aid_net_admin -s /bin/bash cosmo echo cosmo:cosmo | chpasswd usermod systemd-timesync -a -G aid_inet usermod avahi -a -G aid_inet sudo usermod pulse -a -G aid_media -sudo usermod cosmo -a -G aid_media From 6b7419da67b0fef3d349c21204773cebd2836c9f Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Wed, 7 Apr 2021 22:29:12 +0100 Subject: [PATCH 22/24] Disable hibernation to remove it from the menus offered to users Enable locking --- overlay/common/etc/skel/.config/kscreenlockerrc | 4 ++-- overlay/common/etc/sleep.conf.d/gemian.conf | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 overlay/common/etc/sleep.conf.d/gemian.conf diff --git a/overlay/common/etc/skel/.config/kscreenlockerrc b/overlay/common/etc/skel/.config/kscreenlockerrc index c578cbc..1d78603 100644 --- a/overlay/common/etc/skel/.config/kscreenlockerrc +++ b/overlay/common/etc/skel/.config/kscreenlockerrc @@ -2,5 +2,5 @@ update_info=kscreenlocker.upd:0.1-autolock [Daemon] -Autolock=false -LockOnResume=false +Autolock=true +LockOnResume=true diff --git a/overlay/common/etc/sleep.conf.d/gemian.conf b/overlay/common/etc/sleep.conf.d/gemian.conf new file mode 100644 index 0000000..68afdbe --- /dev/null +++ b/overlay/common/etc/sleep.conf.d/gemian.conf @@ -0,0 +1,7 @@ +[Sleep] +AllowSuspend=yes +AllowHibernation=no +AllowSuspendThenHibernate=no +AllowHybridSleep=no +SuspendMode=suspend +SuspendState=mem freeze From f529769bf1bff0b1dde8277c272bb3c437655852 Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Wed, 7 Apr 2021 22:52:21 +0100 Subject: [PATCH 23/24] Adding more groups --- overlay/common/etc/adduser.conf | 2 +- scripts/setup-user.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/overlay/common/etc/adduser.conf b/overlay/common/etc/adduser.conf index ae028a1..a6e50db 100644 --- a/overlay/common/etc/adduser.conf +++ b/overlay/common/etc/adduser.conf @@ -74,7 +74,7 @@ SKEL_IGNORE_REGEX="dpkg-(old|new|dist|save)" # new users to other groups. # This is the list of groups that new non-system users will be added to # Default: -EXTRA_GROUPS="audio input video sudo dialout aid_media aid_system aid_graphics aid_input aid_audio aid_net_bt_admin aid_net_bt aid_inet aid_inet_raw aid_inet_admin" +EXTRA_GROUPS="audio input video sudo dialout aid_media aid_system aid_graphics aid_input aid_radio aid_audio aid_wakelock aid_net_bt_admin aid_net_bt aid_inet aid_inet_raw aid_inet_admin" # If ADD_EXTRA_GROUPS is set to something non-zero, the EXTRA_GROUPS # option above will be default behavior for adding new, non-system users diff --git a/scripts/setup-user.sh b/scripts/setup-user.sh index 53c2841..4b2da3c 100755 --- a/scripts/setup-user.sh +++ b/scripts/setup-user.sh @@ -219,7 +219,7 @@ groupadd --gid 9999 aid_nobody useradd --gid 9999 --no-create-home --home-dir /nonexistent --no-user-group --system --shell /usr/sbin/nologin --uid 9999 aid_nobody groupadd -g 100000 cosmo -useradd -m -u 100000 -g 100000 -G audio,input,video,sudo,dialout,aid_media,aid_system,aid_graphics,aid_input,aid_audio,aid_net_bt_admin,aid_net_bt,aid_inet,aid_net_raw,aid_net_admin -s /bin/bash cosmo +useradd -m -u 100000 -g 100000 -G audio,input,video,sudo,dialout,aid_media,aid_system,aid_graphics,aid_input,aid_radio,aid_wakelock,aid_audio,aid_net_bt_admin,aid_net_bt,aid_inet,aid_net_raw,aid_net_admin -s /bin/bash cosmo echo cosmo:cosmo | chpasswd usermod systemd-timesync -a -G aid_inet From 01e9fb00530b6642bd70dc011517b9cb3479e63c Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Thu, 8 Apr 2021 16:43:36 +0100 Subject: [PATCH 24/24] Fix for running on jenkins --- cosmopda.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cosmopda.yaml b/cosmopda.yaml index 62fbf4b..460786f 100644 --- a/cosmopda.yaml +++ b/cosmopda.yaml @@ -102,6 +102,10 @@ actions: fs: ext4 fsname: "gemian" + - action: run + description: Allow jenkins user to access file + command: chown jenkins.jenkins {{ $image }} + - action: filesystem-deploy setup-fstab: false setup-kernel-cmdline: false