diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-30 21:28:06 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-30 21:28:06 +0000 |
commit | 55f6557907c5da1c346503b244c0660b6268d9c5 (patch) | |
tree | e0c79f583fc5e9c49907696f1bb32887a206e747 /perl-install | |
parent | 30fdc0a5bb735530b1155b5fe125fe4571af2d0e (diff) | |
download | drakx-backup-do-not-use-55f6557907c5da1c346503b244c0660b6268d9c5.tar drakx-backup-do-not-use-55f6557907c5da1c346503b244c0660b6268d9c5.tar.gz drakx-backup-do-not-use-55f6557907c5da1c346503b244c0660b6268d9c5.tar.bz2 drakx-backup-do-not-use-55f6557907c5da1c346503b244c0660b6268d9c5.tar.xz drakx-backup-do-not-use-55f6557907c5da1c346503b244c0660b6268d9c5.zip |
add drakx-finish-install
Diffstat (limited to 'perl-install')
-rw-r--r-- | perl-install/Makefile | 2 | ||||
-rw-r--r-- | perl-install/Makefile.config | 2 | ||||
-rw-r--r-- | perl-install/Makefile.drakxtools | 4 | ||||
-rw-r--r-- | perl-install/drakxtools.spec | 24 | ||||
-rwxr-xr-x | perl-install/standalone/finish-install | 1 |
5 files changed, 30 insertions, 3 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index 419bc212d..ed38c719b 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/drakxtools.spec b/perl-install/drakxtools.spec index 4fa2d9959..559ed4734 100644 --- a/perl-install/drakxtools.spec +++ b/perl-install/drakxtools.spec @@ -1,7 +1,7 @@ Summary: The drakxtools (XFdrake, diskdrake, keyboarddrake, mousedrake...) Name: drakxtools Version: 10.1 -Release: 27.1.101mdk +Release: 27.1.102mdk Url: http://www.mandrakelinux.com/en/drakx.php3 Source0: %name-%version.tar.bz2 License: GPL @@ -42,6 +42,11 @@ Group: System/Configuration/Other Requires: %{name}-newt = %version-%release, perl-Net_SSLeay >= 1.22-1mdk, perl-Authen-PAM >= 0.14-1mdk, perl-CGI >= 2.91-1mdk PreReq: rpm-helper +%package -n drakx-finish-install +Summary: First boot configuration +Group: System/Configuration/Other +Requires: %{name} = %version-%release + %package -n harddrake Summary: Main Hardware Configuration/Information Tool Group: System/Configuration/Hardware @@ -157,6 +162,14 @@ This add the capability to be runned behind a web server to the drakx tools. See package %name +%description -n drakx-finish-install +For OEM-like duplications, it allows at first boot: +- network configuration +- creating users +- setting root password +- choosing authentication + + %description -n harddrake The harddrake service is a hardware probing tool run at system boot time to determine what hardware has been added or removed from the @@ -337,6 +350,12 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_datadir/harddrak %_iconsdir/mini/harddrake.png %_iconsdir/harddrake.png +%files -n drakx-finish-install +%defattr(-,root,root) +%config(noreplace) %_sysconfdir/sysconfig/finish-install +%_sysconfdir/X11/xsetup.d/finish-install.xsetup +%_sbindir/finish-install + %files http -f %{name}-http.list %defattr(-,root,root) %dir %_sysconfdir/drakxtools_http @@ -347,6 +366,9 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_datadir/harddrak %config(noreplace) %_sysconfdir/logrotate.d/drakxtools-http %changelog +* Tue Nov 30 2004 Pixel <pixel@mandrakesoft.com> 10.1-27.1.102mdk +- new package drakx-finish-install + * Wed Nov 10 2004 Thierry Vignaud <tvignaud@mandrakesoft.com> 10.1-27.1.101mdk - drakconnect: o security fix: let ifcfg files be readable only by root when a WEP 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); |