diff options
author | Freemor <freemor@freemor.ca> | 2018-11-23 17:15:39 -0400 |
---|---|---|
committer | Freemor <freemor@freemor.ca> | 2018-11-23 17:15:39 -0400 |
commit | ff368b7f4dd180b8f9fa04fd1cb32726de98a0fd (patch) | |
tree | c1f38e5b183f1c6d9818b49bf646f66e5aa0eb01 /pcr-testing | |
parent | c0f527d18c9ef4d30bac6a91189284362ce5026c (diff) | |
download | abslibre-ff368b7f4dd180b8f9fa04fd1cb32726de98a0fd.tar.gz abslibre-ff368b7f4dd180b8f9fa04fd1cb32726de98a0fd.tar.bz2 abslibre-ff368b7f4dd180b8f9fa04fd1cb32726de98a0fd.zip |
Updated [plymouth] to address #2067
- Added parabola-logo.png
- Updated referrences to arch-logo.png to parabola-logo.png
- v0.9.3 -> 0.9.4
- removed a patch that seemed not to be necessary any more.
Diffstat (limited to 'pcr-testing')
18 files changed, 613 insertions, 0 deletions
diff --git a/pcr-testing/plymouth/PKGBUILD b/pcr-testing/plymouth/PKGBUILD new file mode 100644 index 000000000..a6d5a9150 --- /dev/null +++ b/pcr-testing/plymouth/PKGBUILD @@ -0,0 +1,140 @@ +# Maintainer: David P. <megver83@parabola.nu> +# Contributor: Luke Shumaker <lukeshu@parabola.nu> +# Contributor: Freemor <freemor@freemor.ca> +# Maintainer (AUR:plymouth-nosystemd): Chris Cromer <chris@cromer.cl> +# Maintainer (AUR:plymouth): Sebastian Lau <lauseb644@gmail.com> +# Contributor (AUR:plymouth): Damian01w <damian01w@gmail.com> +# Contributor (AUR:plymouth): Padfoot <padfoot@exemail.com.au> + +pkgbase=plymouth +pkgname=(plymouth plymouth-nosystemd) +pkgver=0.9.4 +pkgrel=1 +pkgdesc="A graphical boot splash screen with kernel mode-setting support" +url="http://www.freedesktop.org/wiki/Software/Plymouth/" +arch=('i686' 'x86_64' 'armv7h') +license=('GPL') + +depends=('libdrm' 'pango' 'libudev') +makedepends=('docbook-xsl') +optdepends=('ttf-dejavu') +backup=('etc/plymouth/plymouthd.conf') + +options=('!libtool' '!emptydirs') + +source=("http://www.freedesktop.org/software/${pkgbase}/releases/${pkgbase}-${pkgver}.tar.xz" + 'plymouth.encrypt_hook' + 'plymouth.encrypt_install' + 'plymouth.initcpio_hook' + 'plymouth.initcpio_install' + 'sd-plymouth.initcpio_install' + 'parabola-logo.png' + + 'gdm-plymouth.service' + 'lxdm-plymouth.service' + 'lightdm-plymouth.service' + 'slim-plymouth.service' + 'sddm-plymouth.service' + 'plymouth-deactivate.service' + 'plymouth-start.service' + 'plymouth-start.path' + + 'plymouth-quit.service.in.patch' + 'plymouth-update-initrd.patch') +sha1sums=('644d14c842075a38ae7dcf0325be32628ae6f04f' + '7e27ca6140424efb82fd1c962a301dc07ffa2133' + '798f7916cfaff2a3501f3da1f54c2ae4714d6d26' + 'c492081c0ce4418db48c943639e24c2ca10ad735' + 'c0e4bfffa3b8761dd12101f93359c8cd3c62d8fa' + '68f3beecfba9f3d9323dc70f077d7d4e5bfbbde8' + 'c22f7198a56c2a9ba687b4b59f732b37db67a0f9' + '78b854fb3939fd9f54e59bbda08b046f1b3649c4' + '59ad64c616eec35c87ac34c68e79ca0df0276f7c' + '9d15546767d0128c863258b8d06f12258e3d1e18' + '55b5b54c7a972fb974eb759cfbd2d3a55225f189' + '4e18b05e35f70a3c76b66ac7b4706936b64ffb93' + '7e01cb2811de735b358290b71c3db028f4bfcf1f' + '621121aef7ece1027ff349d66209f34cf30d4695' + 'a6a32472e05c564a0d701e0cf9a12004bf6293c1' + '9cb560bf8c27bae22e58c5d593af93147eea74d1' + '5d0eb611bcbe318bed38e0f434299c01adbd88dd') + +prepare() { + cd "$srcdir/${pkgbase}-${pkgver}" + patch -p1 -i $srcdir/plymouth-update-initrd.patch + patch -p1 -i $srcdir/plymouth-quit.service.in.patch +} + +_build() { + mkdir -p "$srcdir/$1" + cd "$srcdir/$1" + shift + + ../"${pkgbase}-${pkgver}"/configure \ + --prefix=/usr \ + --exec-prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --sbindir=/usr/bin \ + --enable-drm \ + --enable-tracing \ + --enable-pango \ + --enable-gtk=no \ + --with-release-file=/etc/os-release \ + --with-background-color=0x000000 \ + --with-background-start-color-stop=0x000000 \ + --with-background-end-color-stop=0x4D4D4D \ + --without-rhgb-compat-link \ + --without-system-root-install \ + "$@" + + make +} + +_package() { + cd "$srcdir/$1" + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/parabola-logo.png" "$pkgdir/usr/share/plymouth/parabola-logo.png" + + install -Dm644 "$srcdir/plymouth.encrypt_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth-encrypt" + install -Dm644 "$srcdir/plymouth.encrypt_install" "$pkgdir/usr/lib/initcpio/install/plymouth-encrypt" + install -Dm644 "$srcdir/plymouth.initcpio_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth" + install -Dm644 "$srcdir/plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/plymouth" + + install -Dm644 "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf" +} + +build() { + _build build-systemd --enable-systemd-integration + _build build-nosystemd --disable-systemd-integration +} + +package_plymouth() { + depends+=('systemd-sysvcompat') + + _package build-systemd + + install -Dm644 "$srcdir/sd-plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/sd-plymouth" + + # TODO: Some of these override units installed by `make install`. + # What's wrong with the upstream unit files? We should patch them, + # rather than overriding them completely. + install -Dm644 -t "$pkgdir/usr/lib/systemd/system" -- \ + "$srcdir/plymouth-deactivate.service" \ + "$srcdir/plymouth-start.service" \ + "$srcdir/plymouth-start.path" \ + "$srcdir"/{gdm,sddm,lxdm,slim,lightdm}-plymouth.service + + install -Dm644 "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf" +} + +package_plymouth-nosystemd() { + pkgdesc+=' (for non-systemd systems)' + conflicts+=("$pkgbase" 'systemd-sysvcompat') + provides+=("$pkgbase=$pkgver") + + _package build-nosystemd +} diff --git a/pcr-testing/plymouth/gdm-plymouth.service b/pcr-testing/plymouth/gdm-plymouth.service new file mode 100644 index 000000000..e1bd77b4d --- /dev/null +++ b/pcr-testing/plymouth/gdm-plymouth.service @@ -0,0 +1,16 @@ +[Unit] +Description=GNOME Display Manager +Conflicts=getty@tty1.service plymouth-quit.service +Wants=plymouth-deactivate.service +After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service + +[Service] +ExecStart=/usr/bin/gdm +Restart=always +IgnoreSIGPIPE=no +BusName=org.gnome.DisplayManager +StandardOutput=syslog +StandardError=inherit + +[Install] +Alias=display-manager.service diff --git a/pcr-testing/plymouth/lightdm-plymouth.service b/pcr-testing/plymouth/lightdm-plymouth.service new file mode 100644 index 000000000..a845498fd --- /dev/null +++ b/pcr-testing/plymouth/lightdm-plymouth.service @@ -0,0 +1,13 @@ +[Unit] +Description=Light Display Manager +Conflicts=getty@tty1.service plymouth-quit.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/usr/bin/lightdm +Restart=always +IgnoreSIGPIPE=no +BusName=org.freedesktop.DisplayManager + +[Install] +Alias=display-manager.service diff --git a/pcr-testing/plymouth/lightdm.service b/pcr-testing/plymouth/lightdm.service new file mode 100644 index 000000000..b2fcd8292 --- /dev/null +++ b/pcr-testing/plymouth/lightdm.service @@ -0,0 +1,15 @@ +[Unit] +Description=Light Display Manager +Documentation=man:lightdm(1) +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/usr/bin/lightdm +Restart=always +IgnoreSIGPIPE=no +BusName=org.freedesktop.DisplayManager + +[Install] +Alias=display-manager.service + diff --git a/pcr-testing/plymouth/lxdm-plymouth.service b/pcr-testing/plymouth/lxdm-plymouth.service new file mode 100644 index 000000000..33e0ea741 --- /dev/null +++ b/pcr-testing/plymouth/lxdm-plymouth.service @@ -0,0 +1,13 @@ +[Unit] +Description=LXDE Display Manager +Conflicts=getty@tty1.service plymouth-quit.service +Wants=plymouth-deactivate.service +After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service + +[Service] +ExecStart=/usr/sbin/lxdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/pcr-testing/plymouth/parabola-logo.png b/pcr-testing/plymouth/parabola-logo.png Binary files differnew file mode 100644 index 000000000..1a653b9f4 --- /dev/null +++ b/pcr-testing/plymouth/parabola-logo.png diff --git a/pcr-testing/plymouth/plymouth-deactivate.service b/pcr-testing/plymouth/plymouth-deactivate.service new file mode 100644 index 000000000..2c6f34954 --- /dev/null +++ b/pcr-testing/plymouth/plymouth-deactivate.service @@ -0,0 +1,9 @@ +[Unit] +Description=Deactivate Plymouth Boot Screen +After=rc-local.service plymouth-start.service systemd-user-sessions.service +Before=getty@tty1.service + +[Service] +ExecStart=/usr/bin/plymouth deactivate +Type=oneshot +TimeoutSec=20 diff --git a/pcr-testing/plymouth/plymouth-quit.service.in.patch b/pcr-testing/plymouth/plymouth-quit.service.in.patch new file mode 100644 index 000000000..ec3435cea --- /dev/null +++ b/pcr-testing/plymouth/plymouth-quit.service.in.patch @@ -0,0 +1,14 @@ +diff -aur plymouth-0.8.8.src/systemd-units/plymouth-quit.service.in plymouth-0.8.8.patch/systemd-units/plymouth-quit.service.in +--- plymouth-0.8.8.src/systemd-units/plymouth-quit.service.in 2012-09-27 02:50:53.000000000 +1000 ++++ plymouth-0.8.8.patch/systemd-units/plymouth-quit.service.in 2014-02-11 16:36:58.813194805 +1100 +@@ -1,8 +1,9 @@ + [Unit] + Description=Terminate Plymouth Boot Screen + After=rc-local.service plymouth-start.service systemd-user-sessions.service ++Before=getty@tty1.service + + [Service] +-ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit ++ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit --retain-splash + Type=oneshot + TimeoutSec=20 diff --git a/pcr-testing/plymouth/plymouth-start.path b/pcr-testing/plymouth/plymouth-start.path new file mode 100644 index 000000000..6a8c957a0 --- /dev/null +++ b/pcr-testing/plymouth/plymouth-start.path @@ -0,0 +1,10 @@ +[Unit] +Description=Automatically Start Plymouth Boot Screen + +[Path] +PathExistsGlob=/sys/class/graphics/fb*/device/drm/ +Unit=plymouth-start.service + +[Install] +WantedBy=sysinit.target + diff --git a/pcr-testing/plymouth/plymouth-start.service b/pcr-testing/plymouth/plymouth-start.service new file mode 100644 index 000000000..fb58ad729 --- /dev/null +++ b/pcr-testing/plymouth/plymouth-start.service @@ -0,0 +1,18 @@ +[Unit] +Description=Show Plymouth Boot Screen +DefaultDependencies=no +Wants=systemd-ask-password-plymouth.path systemd-vconsole-setup.service +After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.service +Before=systemd-ask-password-plymouth.service +ConditionKernelCommandLine=!plymouth.enable=0 + +[Service] +ExecStart=/usr/bin/plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session +ExecStartPost=-/usr/bin/plymouth show-splash +Type=forking +RuntimeDirectory=plymouth +KillMode=none +SendSIGKILL=no + +[Install] +WantedBy=sysinit.target diff --git a/pcr-testing/plymouth/plymouth-update-initrd.patch b/pcr-testing/plymouth/plymouth-update-initrd.patch new file mode 100644 index 000000000..47d88a60d --- /dev/null +++ b/pcr-testing/plymouth/plymouth-update-initrd.patch @@ -0,0 +1,9 @@ +diff -aur plymouth-0.9.0.src/scripts/plymouth-update-initrd plymouth-0.9.0.patch/scripts/plymouth-update-initrd +--- plymouth-0.9.0.src/scripts/plymouth-update-initrd 2014-01-16 08:14:47.000000000 +1100 ++++ plymouth-0.9.0.patch/scripts/plymouth-update-initrd 2014-05-21 19:04:16.802594001 +1000 +@@ -1,2 +1,4 @@ + #!/bin/bash +-dracut -f ++find /etc/mkinitcpio.d/ -name \*.preset -a \! -name example.preset | while read p; do ++ mkinitcpio -p $p ++done diff --git a/pcr-testing/plymouth/plymouth.encrypt_hook b/pcr-testing/plymouth/plymouth.encrypt_hook new file mode 100644 index 000000000..a623debf5 --- /dev/null +++ b/pcr-testing/plymouth/plymouth.encrypt_hook @@ -0,0 +1,134 @@ +#!/bin/bash + +run_hook() { + modprobe -a -q dm-crypt >/dev/null 2>&1 + [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" + + # Get keyfile if specified + ckeyfile="/crypto_keyfile.bin" + if [ -n "$cryptkey" ]; then + IFS=: read ckdev ckarg1 ckarg2 <<EOF +$cryptkey +EOF + + if [ "$ckdev" = "rootfs" ]; then + ckeyfile=$ckarg1 + elif resolved=$(resolve_device "${ckdev}" ${rootdelay}); then + case ${ckarg1} in + *[!0-9]*) + # Use a file on the device + # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path + mkdir /ckey + mount -r -t "$ckarg1" "$resolved" /ckey + dd if="/ckey/$ckarg2" of="$ckeyfile" >/dev/null 2>&1 + umount /ckey + ;; + *) + # Read raw data from the block device + # ckarg1 is numeric: ckarg1=offset, ckarg2=length + dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 + ;; + esac + fi + [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." + fi + + if [ -n "${cryptdevice}" ]; then + DEPRECATED_CRYPT=0 + IFS=: read cryptdev cryptname cryptoptions <<EOF +$cryptdevice +EOF + else + DEPRECATED_CRYPT=1 + cryptdev="${root}" + cryptname="root" + fi + + warn_deprecated() { + echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated" + echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead." + } + + for cryptopt in ${cryptoptions//,/ }; do + case ${cryptopt} in + allow-discards) + cryptargs="${cryptargs} --allow-discards" + ;; + *) + echo "Encryption option '${cryptopt}' not known, ignoring." >&2 + ;; + esac + done + + if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then + if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + dopassphrase=1 + # If keyfile exists, try to use that + if [ -f ${ckeyfile} ]; then + if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then + dopassphrase=0 + else + echo "Invalid keyfile. Reverting to passphrase." + fi + fi + # Ask for a passphrase + if [ ${dopassphrase} -gt 0 ]; then + echo + echo "A password is required to access the ${cryptname} volume:" + plymouth ask-for-password --prompt="Password for ${cryptname} volume" --dont-pause-progress --number-of-tries=5 --command="/sbin/cryptsetup luksOpen --key-file=- ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}" + sleep 2 + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" + fi + else + err "Password succeeded, but ${cryptname} creation failed, aborting..." + exit 1 + fi + elif [ -n "${crypto}" ]; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + msg "Non-LUKS encrypted device found..." + if echo "$crypto" | awk -F: '{ exit(NF == 5) }'; then + err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" + err "Non-LUKS decryption not attempted..." + return 1 + fi + exe="cryptsetup create $cryptname $resolved $cryptargs" + IFS=: read c_hash c_cipher c_keysize c_offset c_skip <<EOF +$crypto +EOF + [ -n "$c_hash" ] && exe="$exe --hash '$c_hash'" + [ -n "$c_cipher" ] && exe="$exe --cipher '$c_cipher'" + [ -n "$c_keysize" ] && exe="$exe --key-size '$c_keysize'" + [ -n "$c_offset" ] && exe="$exe --offset '$c_offset'" + [ -n "$c_skip" ] && exe="$exe --skip '$c_skip'" + if [ -f "$ckeyfile" ]; then + exe="$exe --key-file $ckeyfile" + else + exe="$exe --verify-passphrase" + echo "" + echo "A password is required to access the ${cryptname} volume:" + fi + eval "$exe $CSQUIET" + + if [ $? -ne 0 ]; then + err "Non-LUKS device decryption failed. verify format: " + err " crypto=hash:cipher:keysize:offset:skip" + exit 1 + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" + fi + else + err "Password succeeded, but ${cryptname} creation failed, aborting..." + exit 1 + fi + else + err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified." + fi + fi + rm -f ${ckeyfile} +} diff --git a/pcr-testing/plymouth/plymouth.encrypt_install b/pcr-testing/plymouth/plymouth.encrypt_install new file mode 100644 index 000000000..b2d7cbc1a --- /dev/null +++ b/pcr-testing/plymouth/plymouth.encrypt_install @@ -0,0 +1,52 @@ +#!/bin/bash + +build() { + local mod + + add_module dm-crypt + if [[ $CRYPTO_MODULES ]]; then + for mod in $CRYPTO_MODULES; do + add_module "$mod" + done + else + add_all_modules '/crypto/' + fi + + add_binary "cryptsetup" + add_binary "dmsetup" + add_file "/usr/lib/udev/rules.d/10-dm.rules" + add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" + add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" + add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" + add_binary "/usr/lib/plymouth/label.so" + add_binary "/usr/lib/plymouth/text.so" + add_file "/usr/share/fonts/TTF/DejaVuSans.ttf" + add_file "/etc/fonts/fonts.conf" + add_file "/etc/fonts/conf.d/60-latin.conf" + + # cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1 + add_binary "/usr/lib/libgcc_s.so.1" + + add_runscript +} + +help() { + cat <<HELPEOF +This hook allows for an encrypted root device. Users should specify the device +to be unlocked using 'cryptdevice=device:dmname' on the kernel command line, +where 'device' is the path to the raw device, and 'dmname' is the name given to +the device after unlocking, and will be available as /dev/mapper/dmname. + +For unlocking via keyfile, 'cryptkey=device:fstype:path' should be specified on +the kernel cmdline, where 'device' represents the raw block device where the key +exists, 'fstype' is the filesystem type of 'device' (or auto), and 'path' is +the absolute path of the keyfile within the device. + +Without specifying a keyfile, you will be prompted for the password at runtime. +This means you must have a keyboard available to input it, and you may need +the keymap hook as well to ensure that the keyboard is using the layout you +expect. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/pcr-testing/plymouth/plymouth.initcpio_hook b/pcr-testing/plymouth/plymouth.initcpio_hook new file mode 100644 index 000000000..3d7ec1d17 --- /dev/null +++ b/pcr-testing/plymouth/plymouth.initcpio_hook @@ -0,0 +1,23 @@ +run_earlyhook(){ + # first trigger graphics subsystem + udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1 + # first trigger graphics and tty subsystem + udevadm trigger --action=add --subsystem-match=graphics --subsystem-match=drm --subsystem-match=tty >/dev/null 2>&1 + + udevadm settle --timeout=30 2>&1 + + /usr/bin/mknod /dev/fb c 29 &>/dev/null + /usr/bin/mkdir -p /dev/pts + /usr/bin/mount -t devpts -o noexec,nosuid,gid=5,mode=0620 devpts /dev/pts || true + /usr/bin/plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session +} + +run_hook() { + /usr/bin/plymouth --show-splash +} + +run_latehook(){ + /usr/bin/plymouth update-root-fs --new-root-dir=/new_root +} + +# vim: set ft=sh: diff --git a/pcr-testing/plymouth/plymouth.initcpio_install b/pcr-testing/plymouth/plymouth.initcpio_install new file mode 100644 index 000000000..c7bbc3dbc --- /dev/null +++ b/pcr-testing/plymouth/plymouth.initcpio_install @@ -0,0 +1,57 @@ +build() { + add_dir /dev/pts + add_dir /usr/share/plymouth/themes + add_dir /var/run/plymouth + + DATADIR="/usr/share" + PLYMOUTH_LOGO_FILE="${DATADIR}/plymouth/parabola-logo.png" + PLYMOUTH_THEME_NAME="$(/usr/bin/plymouth-set-default-theme)" + PLYMOUTH_MODULE_NAME="$(grep "ModuleName *= *" ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')" + PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)" + + add_binary /usr/bin/plymouthd + add_binary /usr/bin/plymouth + + add_file ${DATADIR}/plymouth/themes/text/text.plymouth + add_binary ${PLYMOUTH_PLUGIN_PATH}/text.so + add_file ${DATADIR}/plymouth/themes/details/details.plymouth + add_binary ${PLYMOUTH_PLUGIN_PATH}/details.so + + add_file "${PLYMOUTH_LOGO_FILE}" + add_file /etc/os-release + add_file /etc/plymouth/plymouthd.conf + add_file ${DATADIR}/plymouth/plymouthd.defaults + + if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then + echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr + exit 1 + fi + + add_binary ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so + + add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so + add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so + + if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then + add_full_dir ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} + fi + + add_file /usr/lib/udev/rules.d/70-uaccess.rules + add_file /usr/lib/udev/rules.d/71-seat.rules + + # suppress a warning in glib (which the label control uses) + # about uid 0 by building a dummy NSS stack (LP #649917) + add_file /etc/passwd + add_file /etc/nsswitch.conf + add_binary "$(readlink -e /lib/libnss_files.so.2)" + add_file /lib/libnss_files.so.2 + + add_runscript +} + +help() { + echo "This hook includes plymouth in the initramfs image." +} + +# vim: set ft=sh: +#EOF diff --git a/pcr-testing/plymouth/sd-plymouth.initcpio_install b/pcr-testing/plymouth/sd-plymouth.initcpio_install new file mode 100644 index 000000000..637f94ad5 --- /dev/null +++ b/pcr-testing/plymouth/sd-plymouth.initcpio_install @@ -0,0 +1,63 @@ +#!/bin/bash +# /etc/initcpio/install/sd-plymouth — mkinitcpio/systemd hook for plymouth + +build() { + add_dir /dev/pts + add_dir /usr/share/plymouth/themes + add_dir /run/plymouth + + DATADIR="/usr/share" +# PLYMOUTH_LOGO_FILE="${DATADIR}/plymouth/parabola-logo.png" + PLYMOUTH_THEME_NAME="$(/usr/bin/plymouth-set-default-theme)" + PLYMOUTH_MODULE_NAME="$(grep "ModuleName *= *" ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')" + PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)" + + add_binary /usr/bin/plymouthd + add_binary /usr/bin/plymouth + + add_file ${DATADIR}/plymouth/themes/text/text.plymouth + add_binary ${PLYMOUTH_PLUGIN_PATH}/text.so + add_file ${DATADIR}/plymouth/themes/details/details.plymouth + add_binary ${PLYMOUTH_PLUGIN_PATH}/details.so + + add_file "${PLYMOUTH_LOGO_FILE}" + add_file /etc/os-release + add_file /etc/plymouth/plymouthd.conf + add_file ${DATADIR}/plymouth/plymouthd.defaults + + if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then + echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr + exit 1 + fi + + add_binary ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so + + add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so + add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so + + if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then + add_full_dir ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} + fi + + add_udev_rule 70-uaccess.rules + add_udev_rule 71-seat.rules + + map add_systemd_unit \ + systemd-ask-password-plymouth.path \ + systemd-ask-password-plymouth.service \ + plymouth-halt.service \ + plymouth-kexec.service \ + plymouth-poweroff.service \ + plymouth-quit-wait.service \ + plymouth-quit.service \ + plymouth-read-write.service \ + plymouth-reboot.service \ + plymouth-start.service \ + plymouth-switch-root.service +} + +help() { + cat <<HELPEOF +This hook includes plymouth in a systemd-based initramfs image. +HELPEOF +} diff --git a/pcr-testing/plymouth/sddm-plymouth.service b/pcr-testing/plymouth/sddm-plymouth.service new file mode 100644 index 000000000..5c08c3a1b --- /dev/null +++ b/pcr-testing/plymouth/sddm-plymouth.service @@ -0,0 +1,13 @@ +[Unit] +Description=Simple Desktop Display Manager +Documentation=man:sddm(1) man:sddm.conf(5) +Conflicts=getty@tty1.service +Wants=plymouth-deactivate.service +After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service + +[Service] +ExecStart=/usr/bin/sddm +Restart=always + +[Install] +Alias=display-manager.service diff --git a/pcr-testing/plymouth/slim-plymouth.service b/pcr-testing/plymouth/slim-plymouth.service new file mode 100644 index 000000000..6ee9a6b4c --- /dev/null +++ b/pcr-testing/plymouth/slim-plymouth.service @@ -0,0 +1,14 @@ +[Unit] +Description=SLiM Simple Login Manager +Conflicts=getty@tty1.service plymouth-quit.service +Wants=plymouth-deactivate.service +After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service + +[Service] +ExecStart=/usr/bin/slim -nodaemon +Restart=always +IgnoreSIGPIPE=no +StandardOutput=syslog + +[Install] +Alias=display-manager.service |