summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Janczyk2006-11-07 19:14:32 +0100
committerMichael Janczyk2006-11-07 19:14:32 +0100
commitb83602efaf930549408ff0a828b2c01c3820e052 (patch)
treeade4a035d8caf2db943610e1d0213c4e0438ff6f
parentChanged paths to fit the new structure in mkdxsinitrd (diff)
downloadcore-b83602efaf930549408ff0a828b2c01c3820e052.tar.gz
core-b83602efaf930549408ff0a828b2c01c3820e052.tar.xz
core-b83602efaf930549408ff0a828b2c01c3820e052.zip
Just to ensure integrity (old boot.local via dhcp-variable will be
deprecated soon) git-svn-id: http://svn.openslx.org/svn/openslx/trunk@503 95ad53e4-c205-0410-b2fa-d234c58c8868
-rwxr-xr-xinitramfs/initrd-stuff/bin/servconfig8
-rw-r--r--theming/openslx/displaymanager/kdmrc2
2 files changed, 5 insertions, 5 deletions
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index 62457cfa..850c4fd4 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -164,11 +164,11 @@ initial_boot
config_distro
#############################################################################
-#
-# boot.local
+# boot.local (fixme: deprecated)
if [ -n "$bootlocal_script" ]; then
- echo -e "# entries added by $0:\n#\t$date\n\n\
-$bootlocal_script" >> /mnt/etc/${D_INITDIR}/boot.local
+ echo -e "# Option is deprecated and will be removed soon. Please put the \
+file to the ConfTGZ (rootfs/etc/${D_INITDIR}/boot.local)" >> \
+ /mnt/etc/${D_INITDIR}/boot.local
fi
#############################################################################
diff --git a/theming/openslx/displaymanager/kdmrc b/theming/openslx/displaymanager/kdmrc
index 8f3575ff..14d4b665 100644
--- a/theming/openslx/displaymanager/kdmrc
+++ b/theming/openslx/displaymanager/kdmrc
@@ -51,7 +51,7 @@ Language=
EchoMode=OneStar
ShowLog=false
UseTheme=true
-Theme=/var/lib/openslx/themes/kdm
+Theme=/var/lib/openslx/themes/displaymanager
UseBackground=false
BackgroundCfg=/etc/opt/kde3/share/config/kdm/backgroundrc