From 38dc17044637a29ab90707030c342f6a2df28e29 Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 30 Mar 2022 09:17:24 -0400 Subject: [PATCH 1/2] desktop backgound repair debian it seems the backgrounds on debian side of builder where never updated . I just fixed the background issues for cinnamon desktop --- .../cinnamon/armbian/create_desktop_package.sh | 12 ++++++------ .../buster/environments/cinnamon/debian/postinst | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/desktop/buster/environments/cinnamon/armbian/create_desktop_package.sh b/config/desktop/buster/environments/cinnamon/armbian/create_desktop_package.sh index 0f5216cfe2..63b8cb05b5 100755 --- a/config/desktop/buster/environments/cinnamon/armbian/create_desktop_package.sh +++ b/config/desktop/buster/environments/cinnamon/armbian/create_desktop_package.sh @@ -1,11 +1,11 @@ -# install lightdm greeter +# install default lightdm greeter settings cp -R "${SRC}"/packages/blobs/desktop/lightdm "${destination}"/etc/armbian # install default desktop settings mkdir -p "${destination}"/etc/skel cp -R "${SRC}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel -#install cinnamon desktop bar icons +# install cinnamon desktop bar icons mkdir -p "${destination}"/usr/share/icons/armbian cp "${SRC}"/packages/blobs/desktop/desktop-icons/*.png "${destination}"/usr/share/icons/armbian @@ -13,15 +13,15 @@ cp "${SRC}"/packages/blobs/desktop/desktop-icons/*.png "${destination}"/usr/shar mkdir -p "${destination}"/usr/share/backgrounds/armbian/ cp "${SRC}"/packages/blobs/desktop/desktop-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/armbian -# install wallpapers +# install lightdm wallpapers mkdir -p "${destination}"/usr/share/backgrounds/armbian-lightdm/ cp "${SRC}"/packages/blobs/desktop/lightdm-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/armbian-lightdm -# install logo for login screen +# install startup icons mkdir -p "${destination}"/usr/share/pixmaps/armbian cp "${SRC}"/packages/blobs/desktop/icons/armbian.png "${destination}"/usr/share/pixmaps/armbian -#generate wallpaper list for background changer +# generate wallpaper list for background changer mkdir -p "${destination}"/usr/share/cinnamon-background-properties cat < "${destination}"/usr/share/cinnamon-background-properties/armbian.xml @@ -111,7 +111,7 @@ cat < "${destination}"/usr/share/cinnamon-background-properties/armbian.xm #ffffff #000000 - + Armbian purplepunk-resultado /usr/share/backgrounds/armbian/armbian-4k-purplepunk.jpg zoom diff --git a/config/desktop/buster/environments/cinnamon/debian/postinst b/config/desktop/buster/environments/cinnamon/debian/postinst index 3acc8f0402..76fa00f95d 100755 --- a/config/desktop/buster/environments/cinnamon/debian/postinst +++ b/config/desktop/buster/environments/cinnamon/debian/postinst @@ -1,8 +1,8 @@ # overwrite stock lightdm greeter configuration if [ -d /etc/armbian/lightdm ]; then cp -R /etc/armbian/lightdm /etc/; fi -if [ -f /etc/lightdm/slick-greeter.conf ]; then sed -i 's/armbian03-Dre0x-Minum-dark-blurred-3840x2160.jpg/armbian-4k-neon-gray-penguin-gauss.jpg/g' /etc/lightdm/slick-greeter.conf; fi +#if [ -f /etc/lightdm/slick-greeter.conf ]; then sed -i 's/armbian03-Dre0x-Minum-dark-blurred-3840x2160.jpg/armbian-4k-neon-gray-penguin-gauss.jpg/g' /etc/lightdm/slick-greeter.conf; fi -# Disable Pulseaudio timer scheduling which does not work with sndhdmi driver +# disable Pulseaudio timer scheduling which does not work with sndhdmi driver if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& tsched=0/g" -i /etc/pulse/default.pa; fi ##dconf desktop settings @@ -60,7 +60,7 @@ secondary-click-time=1.2 [org/cinnamon/desktop/background] picture-options='zoom' -picture-uri='file:///usr/share/backgrounds/armbian/armbian-4k-neon-gray-penguin.jpg' +picture-uri='file:///usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg' primary-color='#456789' secondary-color='#FFFFFF' @@ -83,7 +83,7 @@ autorun-never=false [org/cinnamon/desktop/screensaver] picture-options='zoom' -picture-uri='file:///usr/share/backgrounds/armbian-lightdm/armbian-4k-neon-gray-gauss.jpg.jpg' +picture-uri='file:///usr/share/backgrounds/armbian-lightdm/armbian03-Dre0x-Minum-dark-3840x2160' primary-color='#456789' secondary-color='#FFFFFF' From 04a5ce76c2d70cffa02c0ffb28e85d7b3a2c9b21 Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 30 Mar 2022 09:35:19 -0400 Subject: [PATCH 2/2] fix broken line --- config/desktop/buster/environments/cinnamon/debian/postinst | 1 - 1 file changed, 1 deletion(-) diff --git a/config/desktop/buster/environments/cinnamon/debian/postinst b/config/desktop/buster/environments/cinnamon/debian/postinst index 76fa00f95d..7ed98a06ee 100755 --- a/config/desktop/buster/environments/cinnamon/debian/postinst +++ b/config/desktop/buster/environments/cinnamon/debian/postinst @@ -1,6 +1,5 @@ # overwrite stock lightdm greeter configuration if [ -d /etc/armbian/lightdm ]; then cp -R /etc/armbian/lightdm /etc/; fi -#if [ -f /etc/lightdm/slick-greeter.conf ]; then sed -i 's/armbian03-Dre0x-Minum-dark-blurred-3840x2160.jpg/armbian-4k-neon-gray-penguin-gauss.jpg/g' /etc/lightdm/slick-greeter.conf; fi # disable Pulseaudio timer scheduling which does not work with sndhdmi driver if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& tsched=0/g" -i /etc/pulse/default.pa; fi