summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-11-30 21:27:34 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-11-30 21:27:34 +0000
commit93e6ed646886358366a43f4624fa9156d33d3b4f (patch)
tree0ce13db851f140170bd278d69945fc9d3831caa4
parentdc4f67af8cf03f0fdd450399f29a42319d603971 (diff)
downloaddrakx-93e6ed646886358366a43f4624fa9156d33d3b4f.tar
drakx-93e6ed646886358366a43f4624fa9156d33d3b4f.tar.gz
drakx-93e6ed646886358366a43f4624fa9156d33d3b4f.tar.bz2
drakx-93e6ed646886358366a43f4624fa9156d33d3b4f.tar.xz
drakx-93e6ed646886358366a43f4624fa9156d33d3b4f.zip
add drakx-finish-install
-rw-r--r--perl-install/Makefile2
-rw-r--r--perl-install/Makefile.config2
-rw-r--r--perl-install/Makefile.drakxtools4
-rwxr-xr-xperl-install/standalone/finish-install1
-rwxr-xr-xperl-install/standalone/finish-install.xsetup16
5 files changed, 23 insertions, 2 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index d5a9b8402..c4878b86d 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -8,7 +8,7 @@ include Makefile.config
POFILES = $(shell ls share/po/*.po)
MOFILES = $(POFILES:%.po=%.mo)
-DISTFILES = *.pm $(PMS_DIRS) Makefile Makefile.config ddcprobe drakxtools.spec serial_probe share/po share/diskdrake.rc $(STANDALONEPMS) standalone/icons standalone/man/C/* pixmaps pixmaps/langs standalone/interactive_http rpcinfo-flushed.c standalone/service_harddrake.sh
+DISTFILES = *.pm $(PMS_DIRS) Makefile Makefile.config ddcprobe drakxtools.spec serial_probe share/po share/diskdrake.rc $(STANDALONEPMS) standalone/icons standalone/man/C/* pixmaps pixmaps/langs standalone/interactive_http rpcinfo-flushed.c standalone/service_harddrake.sh standalone/finish-install.xsetup
OTHERS = $(OTHERDIRS) $(OTHERFILES)
OTHERDIRS = tools/ddcprobe tools/serial_probe
OTHERFILES = tools/rpcinfo-flushed.c
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index e93a43c70..9fa6980c6 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -5,7 +5,7 @@ TMPDIR = /tmp
SO_FILES = c/blib/arch/auto/c/c.so
PMS_DIRS = Newt Xconfig c xf86misc diskdrake harddrake interactive modules network partition_table printer resize_fat sbus_probing security fs
PMS = *.pm $(PMS_DIRS:%=%/*.pm) commands install2
-STANDALONEPMS_ = XFdrake adduserdrake autosetupprintqueues diskdrake drakTermServ drakautoinst drakauth drakbackup drakboot drakbug drakbug_report drakclock drakconnect drakedm drakfirewall drakfloppy drakfont drakgw drakhelp drakperm drakproxy drakpxe drakroam draksec draksound draksplash drakupdate_fstab drakups drakvpn drakxservices drakxtv fileshareset harddrake2 keyboarddrake listsupportedprinters localedrake logdrake lsnetdrake mousedrake net_applet net_monitor printerdrake scannerdrake service_harddrake service_harddrake_confirm bootloader-config
+STANDALONEPMS_ = XFdrake adduserdrake autosetupprintqueues diskdrake drakTermServ drakautoinst drakauth drakbackup drakboot drakbug drakbug_report drakclock drakconnect drakedm drakfirewall drakfloppy drakfont drakgw drakhelp drakperm drakproxy drakpxe drakroam draksec draksound draksplash drakupdate_fstab drakups drakvpn drakxservices drakxtv fileshareset harddrake2 finish-install keyboarddrake listsupportedprinters localedrake logdrake lsnetdrake mousedrake net_applet net_monitor printerdrake scannerdrake service_harddrake service_harddrake_confirm bootloader-config
STANDALONEPMS = $(STANDALONEPMS_:%=standalone/%)
ALLPMS = $(PMS) $(STANDALONEPMS) share/advertising/*.pl share/compssUsers.pl*
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 8cc520414..623ae8cdd 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -48,6 +48,10 @@ install:
install -d $(PREFIX)/etc/security
echo 'RESTRICT=yes' > $(PREFIX)/etc/security/fileshare.conf
+ install -D standalone/finish-install.xsetup $(PREFIX)/etc/X11/xsetup.d/finish-install.xsetup
+ install -d $(PREFIX)/etc/sysconfig
+ echo 'FINISH_INSTALL=yes' > $(PREFIX)/etc/sysconfig/finish-install
+
for i in $(HAVEINST_DIRS); do \
$(MAKE) -C $$i install PREFIX=$(PREFIX) SUDO= DATADIR=$(DATADIR) NAME=$(NAME) ; \
done
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 352885b8b..0bc5d6e89 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -50,5 +50,6 @@ sub ask_users() {
eval { ask_network() };
eval { ask_authentication() };
eval { ask_users() };
+setVarsInSh('/etc/sysconfig/finish-install', { FINISH_INSTALL => 'no' });
$in->exit(0);
diff --git a/perl-install/standalone/finish-install.xsetup b/perl-install/standalone/finish-install.xsetup
new file mode 100755
index 000000000..f08bc02d1
--- /dev/null
+++ b/perl-install/standalone/finish-install.xsetup
@@ -0,0 +1,16 @@
+#!/bin/sh
+# (c) 2004 Mandrakesoft SA
+
+# to be sourced
+if [ -f /etc/sysconfig/finish-install -a -x /usr/sbin/finish-install ]; then
+ . /etc/sysconfig/finish-install
+ if [ "$FINISH_INSTALL" = yes ]; then
+ if [ -r /etc/sysconfig/i18n ]; then
+ . /etc/sysconfig/i18n
+ export LANGUAGE LC_ADDRESS LC_COLLATE LC_NAME LC_NUMERIC LC_MEASUREMENT LC_TIME \
+ LANG LC_IDENTIFICATION LC_MESSAGES LC_CTYPE LC_TELEPHONE LC_MONETARY LC_PAPER
+ fi
+ xsetroot -cursor_name left_ptr
+ /usr/sbin/finish-install
+ fi
+fi