diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-03-19 22:40:29 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-03-19 22:40:29 +0000 |
| commit | cacc5e8bf368bd1e53b1ff97d92db9cc8e22a9f4 (patch) | |
| tree | 08870b62ae447293fb348d7602771ae42bdffcc0 | |
| parent | 8897b42eea9ef7ff47fe5b20069a3fe59c27fc63 (diff) | |
| download | draklive-install-cacc5e8bf368bd1e53b1ff97d92db9cc8e22a9f4.tar draklive-install-cacc5e8bf368bd1e53b1ff97d92db9cc8e22a9f4.tar.gz draklive-install-cacc5e8bf368bd1e53b1ff97d92db9cc8e22a9f4.tar.bz2 draklive-install-cacc5e8bf368bd1e53b1ff97d92db9cc8e22a9f4.tar.xz draklive-install-cacc5e8bf368bd1e53b1ff97d92db9cc8e22a9f4.zip | |
do not hardcode first boot config files, copy them from /etc/draklive-install.d/sysconfig
| -rwxr-xr-x | draklive-install | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/draklive-install b/draklive-install index 19178fc..4736c4a 100755 --- a/draklive-install +++ b/draklive-install @@ -12,8 +12,6 @@ use common; push @::textdomains, 'draklive-install'; -my $live_user = "guest"; - { use diskdrake::interactive; package diskdrake::interactive; @@ -147,22 +145,8 @@ unlink(map { $::prefix . $_ } '/.autofsck', $live_user_desktop . '/draklive-install.desktop'); system('chroot', $::prefix, 'rpm', '-e', 'draklive-install'); -#- enable first boot wizard at system boot -output($::prefix . '/etc/sysconfig/firstboot', 'FIRSTBOOT=yes'); -#- enable drakx-finish-install at system boot -output($::prefix . '/etc/sysconfig/finish-install', qq( -FINISH_INSTALL=yes -LICENSE=no -LANGUAGE=no -KEYBOARD=no -TIMEZONE=no -NETWORK=yes -AUTHENTICATION=yes -USERS=yes -USER_RENAME_FROM=$live_user -USER_AUTOLOGIN_FIRST=yes -GLX=no -)); +#- copy sysconfig files for first boot +cp_f(glob('/etc/draklive-install.d/sysconfig/*'), $::prefix . '/etc/sysconfig'); #- allow mdkonline to be started again eval { rm_rf($::prefix . '/etc/skel/.MdkOnline', glob($::prefix . '/home/*/.MdkOnline')) }; |