From cf766763f26ad0bb8e001a9ecf65b00f4c766e3c Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 23 Mar 2010 17:54:32 -0400 Subject: [PATCH] [daemon] Ship default configuration files This commit adds plymouthd.defaults and plymouthd.conf. The former is for distributions to override, and the latter is for administrators to change. --- scripts/plymouth-populate-initrd.in | 4 ++++ src/plymouthd.conf | 3 +++ src/plymouthd.defaults | 8 ++++++++ 3 files changed, 15 insertions(+) create mode 100644 src/plymouthd.conf create mode 100644 src/plymouthd.defaults diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in index 0214ee3c..7f0c3416 100755 --- a/scripts/plymouth-populate-initrd.in +++ b/scripts/plymouth-populate-initrd.in @@ -7,6 +7,8 @@ [ -z "$PLYMOUTH_PLUGIN_PATH" ] && PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)" [ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@logofile@" [ -z "$PLYMOUTH_THEME_NAME" ] && PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme) +[ -z "$PLYMOUTH_CONFDIR" ] && PLYMOUTH_CONFDIR="@PLYMOUTH_CONF_DIR@" +[ -z "$PLYMOUTH_POLICYDIR" ] && PLYMOUTH_POLICYDIR="@PLYMOUTH_POLICY_DIR@" if [ -z "$PLYMOUTH_POPULATE_SOURCE_FUNCTIONS" ]; then @@ -78,6 +80,8 @@ inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR inst ${PLYMOUTH_PLUGIN_PATH}/details.so $INITRDDIR inst ${PLYMOUTH_LOGO_FILE} $INITRDDIR inst @RELEASE_FILE@ $INITRDDIR +inst ${PLYMOUTH_POLICYDIR}/plymouthd.defaults $INITRDDIR +inst ${PLYMOUTH_CONFDIR}/plymouthd.conf $INITRDDIR if [ -z "$PLYMOUTH_THEME_NAME" ]; then echo "No default plymouth plugin is set" > /dev/stderr diff --git a/src/plymouthd.conf b/src/plymouthd.conf new file mode 100644 index 00000000..66a92d21 --- /dev/null +++ b/src/plymouthd.conf @@ -0,0 +1,3 @@ +# Administrator customizations go in this file +#[Daemon] +#Theme=fade-in diff --git a/src/plymouthd.defaults b/src/plymouthd.defaults new file mode 100644 index 00000000..a1654918 --- /dev/null +++ b/src/plymouthd.defaults @@ -0,0 +1,8 @@ +# Distribution defaults. Changes to this file will get overwritten during +# upgrades. +[Daemon] +Theme=fade-in +Foo=bar + +[z] +ffoo=yo -- 2.47.2