From: Ray Strode <rstrode@redhat.com>
Date: Tue, 23 Mar 2010 21:54:32 +0000 (-0400)
Subject: [daemon] Ship default configuration files
X-Git-Tag: 0.8.0~16^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fconfig-file;p=thirdparty%2Fplymouth.git

[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.
---

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