diff --git a/alterator-install2-server.spec b/alterator-install2-server.spec index 2a7100f..22d4f6c 100644 --- a/alterator-install2-server.spec +++ b/alterator-install2-server.spec @@ -1,11 +1,11 @@ Name: alterator-install2-server -Version: 0.9.3 +Version: 10 Release: alt1 Summary: Server installer stage2 License: GPL Group: System/Configuration/Other -Packager: Alexey Gladkov +Packager: Eugene Prokopiev Source: %name-%version.tar @@ -98,6 +98,9 @@ Server installer common files %_datadir/alterator/maps/* %changelog +* Wed Oct 17 2007 Eugene Prokopiev 10-alt1 +- fake custom version for installer/ovz + * Sat Jul 21 2007 Dmitry V. Levin 0.9.3-alt1 - Updated langlist files to match reality. - install2: Fixed gen_xorgconf wording. diff --git a/backend3/savesettings.in b/backend3/savesettings.in index 9f7acb3..1882bb1 100755 --- a/backend3/savesettings.in +++ b/backend3/savesettings.in @@ -153,7 +153,7 @@ save_portmap() { local conf="$destdir/etc/sysconfig/portmap" [ -f "$conf" ] || return 0 sed -i 's,#\(PORTMAP_ARGS="-l".*\),\1,' "$conf" - exec_chroot chkconfig portmap on + exec_chroot chkconfig portmap off } save_mdadm() { diff --git a/bin/install2-cleanup.in b/bin/install2-cleanup.in index fb82728..c22c5bc 100755 --- a/bin/install2-cleanup.in +++ b/bin/install2-cleanup.in @@ -98,7 +98,8 @@ exec_chroot() } # Remove installer specific packages from installed system -list="$(exec_chroot rpmquery -a alterator-autoinstall alterator-install* installer-group-*)" +#list="$(exec_chroot rpmquery -a alterator-autoinstall alterator-install* installer-group-*)" +list="$(exec_chroot rpmquery -a alterator* installer-group-* guile16)" action 'Removing installer specific packages from installed system' \ exec_chroot rpmi -e -- $list diff --git a/data/install3/lilo.conf.template b/data/install3/lilo.conf.template index 076bbb6..366ecc9 100644 --- a/data/install3/lilo.conf.template +++ b/data/install3/lilo.conf.template @@ -2,22 +2,11 @@ boot=" " vga="normal" map="/boot/map" lba32 -prompt -timeout="100" -install="menu" -default="ALTLinux" +default="linux" append="panic=30" image="/boot/vmlinuz" - label="ALTLinux" + label="linux" initrd="/boot/initrd.img" root=" " read-only - -image="/boot/vmlinuz" - label="failsafe" - initrd="/boot/initrd.img" - root=" " - addappend="failsafe" - vga="normal" - read-only diff --git a/profile.d/install2 b/profile.d/install2 index c2d2560..c810dd4 100644 --- a/profile.d/install2 +++ b/profile.d/install2 @@ -1,2 +1,2 @@ -(acc-type "system" acc-modules "/install2/1;/install2/2;/install2/3;/install2/4;/install3/1;/install3/2;/install3/3;/install3/4;/install3/5;/install3/6;/install3/7" acc-caption "Installer" acc-translation "alterator-install2") +(acc-type "system" acc-modules "/install2/1;/install2/2;/install2/3;/install2/4;/install3/1;/install3/2;/install3/3" acc-caption "Installer" acc-translation "alterator-install2") diff --git a/ui/install3/finish.scm b/ui/install3/finish.scm index 3a17176..72dcafb 100644 --- a/ui/install3/finish.scm +++ b/ui/install3/finish.scm @@ -10,9 +10,6 @@ (spacer) (groupbox "" (label (format #f (_ "Log files from installation progress will be saved in ~A directory.") logfile) text-wrap #t) - (label (format #f (_ "System management server will be available after reboot at https://~A:8080") - (woo-get-option (woo-read-first "/net-general") 'hostname)) - text-wrap #t)) (spacer)) (frame:on-next (thunk (woo-write "/autoinstall" 'file profile)))