Author: hawk Date: Tue Mar 21 15:26:52 2006 New Revision: 7256 Modified: bootdisk/trunk/batch-installer/ui/ui-wizard Log: - more specific DMA information - don't set install type LAST while we weren't installing yet
Modified: bootdisk/trunk/batch-installer/ui/ui-wizard ============================================================================== --- bootdisk/trunk/batch-installer/ui/ui-wizard (original) +++ bootdisk/trunk/batch-installer/ui/ui-wizard Tue Mar 21 15:26:52 2006 @@ -152,7 +152,7 @@ <item id=ide-generic checked=0>$(nls "Generic IDE driver") </menu><br> <check id=ide_dma checked=$dma> -$(nls "Try to enable DMA for IDE devices") +$(nls "Try to enable DMA for IDE devices during installation") <br><br> $ok_cancel EOF @@ -880,20 +880,13 @@ pkgsets=`cat $pkgsetsdir/.list` if [ "$last_pkg_set" = "" ] ; then - # if /etc/installer.pkgs contains basic pkgset, we can select it - # or mini-iso, otherwise config was loaded from disk or created - # using some other way and we shouldn't touch it unless explicitly - # told to. + # if /etc/installer.pkgs contains basic pkgset, or mini-iso we + # may preselect it, otherwise config was loaded from disk or created + # using some other way and we shouldn't touch it if [ $(md5 $pkgsetsdir/base) = $(md5 $pkgsfile) ] ; then - if test -f /tmp/is-mini-iso ; then - last_pkg_set=$pkgsetsdir/MINI-ISO - else - last_pkg_set=$pkgsetsdir/base - fi - else - last_pkg_set=$pkgsetsdir/LAST - cp $pkgsfile $last_pkg_set - pkgsets="$pkgsets LAST" + last_pkg_set=$pkgsetsdir/base + elif [ $(md5 $pkgsetsdir/MINI-ISO) = $(md5 $pkgsfile) ] ; then + last_pkg_set=$pkgsetsdir/MINI-ISO fi fi echo "<meta active=pkg_set>" _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit