Commit 6f8d6408 authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/devel' into bugfix/17011-disable-gdm-debug-logs

parents 9fab9914 2f42bc49
...@@ -23,7 +23,7 @@ AMNESIA_APPEND="live-media=removable nopersistence noprompt timezone=Etc/UTC blo ...@@ -23,7 +23,7 @@ AMNESIA_APPEND="live-media=removable nopersistence noprompt timezone=Etc/UTC blo
AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63 --id 42 --verbose" AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63 --id 42 --verbose"
# Kernel version # Kernel version
KERNEL_VERSION='5.2.0-2' KERNEL_VERSION='5.2.0-3'
KERNEL_SOURCE_VERSION=$( KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \ echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms' | perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
......
...@@ -95,5 +95,22 @@ Change_gid () { ...@@ -95,5 +95,22 @@ Change_gid () {
fi fi
} }
# Free the GID 122, we need for tails-persistence-setup # Temporarily give these users and groups a UID/GID that's out of the way,
Change_gid Debian-gdm 200 # to avoid collisions
Change_uid pulse 1070
Change_uid speech-dispatcher 1080
Change_uid saned 1090
Change_uid colord 1100
Change_uid hplip 1110
Change_uid Debian-gdm 1120
Change_uid usbmux 1500
# Finally, give these users and groups the desired UID/GID
Change_uid pulse 107
Change_uid speech-dispatcher 108
Change_uid saned 109
Change_uid colord 110
Change_uid hplip 111
Change_uid Debian-gdm 112
Change_uid usbmux 150
Change_gid Debian-gdm 200
#!/bin/sh
set -e
echo 'Updating /etc/gimp/2.0/sessionrc'
# This increases the width of the left dock by 5 pixels, in order to fix #16807
sed -i --regexp-extended 's/^(\s*)\(left-docks-width "188"\)$/\1(left-docks-width "193")/' \
/etc/gimp/2.0/sessionrc
...@@ -17,6 +17,6 @@ esac ...@@ -17,6 +17,6 @@ esac
. /usr/share/initramfs-tools/hook-functions . /usr/share/initramfs-tools/hook-functions
manual_add_modules mmc_core mmc_block sdhci-pci sdhci manual_add_modules mmc_core mmc_block cqhci sdhci-pci sdhci
exit 0 exit 0
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment