summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Dietrich2006-04-04 22:35:41 +0200
committerNico Dietrich2006-04-04 22:35:41 +0200
commit2641623f70ff1403e04014a49b5e26a49965ecd1 (patch)
tree5e9e9daceb734896a43095cd735cd7b07db45945
parentfix gdm, kdm (diff)
downloadcore-2641623f70ff1403e04014a49b5e26a49965ecd1.tar.gz
core-2641623f70ff1403e04014a49b5e26a49965ecd1.tar.xz
core-2641623f70ff1403e04014a49b5e26a49965ecd1.zip
now do really fix it!!
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@163 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--initrd/distro-specs/debian/functions-3.14
-rw-r--r--initrd/distro-specs/ubuntu/functions-5.104
-rwxr-xr-xinstaller/ld4-inst2
3 files changed, 5 insertions, 5 deletions
diff --git a/initrd/distro-specs/debian/functions-3.1 b/initrd/distro-specs/debian/functions-3.1
index 52087b4a..09e3aa49 100644
--- a/initrd/distro-specs/debian/functions-3.1
+++ b/initrd/distro-specs/debian/functions-3.1
@@ -193,7 +193,7 @@ config_xdm () {
# configure gdm as display manager
config_gdm () {
- ln -sf ../gdm /mnt/etc/${D_INITDIR}/rc3.d/K20gdm
+ ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/K20gdm
echo -e "\t/etc/${D_INITDIR}/gdm start >${LOGFILE} 2>&1\n\
\t( sleep 120; ln -sf /etc/${D_INITDIR}/gdm /etc/rc3.d/S01gdm \
>${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
@@ -204,7 +204,7 @@ config_gdm () {
# configure kdm as display manager
config_kdm () {
- ln -sf ../kdm /mnt/etc/${D_INITDIR}/rc3.d/K20kdm
+ ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/K20kdm
echo -e "\t/etc/${D_INITDIR}/kdm start >${LOGFILE} 2>&1\n\
\t( sleep 120; ln -sf /etc/${D_INITDIR}/kdm /etc/rc3.d/S01kdm \
>${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index bb281de4..c4bf6845 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -176,7 +176,7 @@ config_gdm () {
# start the display manager as early as possible, but avoid that is
# started twice during bootup - quickhack ...
#ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITDIR}/rc5.d/S01xdm
- ln -sf ../gdm /mnt/etc/${D_INITDIR}/rc3.d/K20gdm
+ ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/K20gdm
echo -e "\t/etc/${D_INITDIR}/gdm start >${LOGFILE} 2>&1\n\
\t( sleep 120; ln -sf /etc/${D_INITDIR}/gdm /etc/rc3.d/S01gdm \
>${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
@@ -187,7 +187,7 @@ config_gdm () {
# configure kdm as display manager
config_kdm () {
- ln -sf ../kdm /mnt/etc/${D_INITDIR}/rc3.d/K20kdm
+ ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/K20kdm
echo -e "\t/etc/${D_INITDIR}/kdm start >${LOGFILE} 2>&1\n\
\t( sleep 120; ln -sf /etc/${D_INITDIR}/kdm /etc/rc3.d/S01kdm \
>${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
diff --git a/installer/ld4-inst b/installer/ld4-inst
index dd053ea3..f709352e 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -128,7 +128,7 @@ configure() {
. .config
[ -z $overwrite_configs ] && overwrite_configs="y"
- ask "Overwrite server configs (Y) or write *.new files (n)? [Y/n] " overwrite_configs $overwrite_configs
+ ask "Overwrite server configs (y) or write *.new files (n)? " overwrite_configs $overwrite_configs
if [ "$overwrite_configs" = "no" -o "$overwrite_configs" = "n" -o \
"$overwrite_configs" = "N" -o "$overwrite_configs" = "No" ] ; then
overwrite_configs="no"