Changeset 2548


Ignore:
Timestamp:
11/28/07 12:45:23 (7 years ago)
Author:
alanbach-guest
Message:
  • Store installation configuration in .pi-config file, * Store installation logs in parsix-installer.log, * Fixed a bug in appendGrubForOtherOS, * Some code clean-ups
Location:
pkg/main/parsix-installer/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • pkg/main/parsix-installer/trunk/02-install-tools.bm

    r2487 r2548  
    8585                # TODO: Remove hack from here 
    8686                perl -pi -e "s/insmod/modprobe/g" $TARGET_MNT_POINT/etc/init.d/live-autoconfig 
    87                 [ -e $TARGET_MNT_POINT/etc/default/kde-services-knoppix ] && perl -pi -e 's/^#//g' $TARGET_MNT_POINT/etc/default/kde-services-knoppix 
    88                 [ -e $TARGET_MNT_POINT/etc/default/kde-services-kanotix ] && perl -pi -e 's/^#//g' $TARGET_MNT_POINT/etc/default/kde-services-kanotix 
    8987        fi 
    9088         
  • pkg/main/parsix-installer/trunk/boot-tools.bm

    r2487 r2548  
    252252                if [ "$device" != "$HD_CHOICE" ]; then 
    253253                        if [ "$kindOf" = "linux" ]; then 
    254                                 # Do not re-mount in X mode, HAL did it before 
    255                                 if [ "$DIALOG" == "dialog" ]; then 
    256                                      mount $device $TempDir >/dev/null 2>/dev/null 
    257                                 fi 
    258                                 if [ $? -eq 0 ] ; then 
     254                                # mount probed partitions 
     255                                mount $device $TempDir >/dev/null 2>/dev/null 
     256                                if [ $? -eq 0 ] ; then 
    259257                                        if [ -r "$mounted_grub_file" ]; then 
    260258                                                found=0 
     
    282280                                                done < "$mounted_grub_file" 
    283281                                        fi 
    284                                      # No need to unmount in X mode 
    285                                      if [ "$DIALOG" == "dialog" ]; then 
    286                                         umount $TempDir 
    287                                      fi 
     282                                     # unmount probed partitions 
     283                                     umount $TempDir 
    288284                                fi 
    289285                        elif [ "$kindOf" = "chain" ]; then 
  • pkg/main/parsix-installer/trunk/debian/changelog

    r2486 r2548  
     1parsix-installer (0.81.2.5) unstable; urgency=low 
     2 
     3  * Store installation configuration in .pi-config file 
     4  * Store installation logs in parsix-installer.log 
     5  * Fixed a bug in appendGrubForOtherOS 
     6  * Some code clean-ups 
     7 
     8 -- Alan Baghumian <alan@technotux.org>  Wed, 28 Nov 2007 15:05:39 +0330 
     9 
    110parsix-installer (0.81.2.4) unstable; urgency=low 
    211 
  • pkg/main/parsix-installer/trunk/parsix-installer

    r2487 r2548  
    2020 
    2121VERSION="0.81.2" 
    22 CONFIG_FILE="$HOME/.knofig" 
    23 LOG="$HOME/.knofig_log" 
     22CONFIG_FILE="$HOME/.pi-config" 
     23LOG="$HOME/parsix-installer.log" 
    2424 
    2525TARGET_MNT_POINT="/media/hdinstall" # TR1 in old installer 
     
    5353        grep -q squashfs /proc/mounts && ROOT_MIN_RAW=$(($ROOT_MIN_RAW*270/100)) #fix status bar for squashfs 
    5454fi 
    55 ROOT_MIN_CORR=$[ROOT_MIN_RAW*115/100] # + 15% Filesystem overhead 
     55ROOT_MIN_CORR=$[ROOT_MIN_RAW*120/100] # + 20% Filesystem overhead 
    5656ROOT_MIN=$(($ROOT_MIN_CORR*1024)) 
    5757 
     
    797797done 
    798798 
    799 #################### Create a .knofig-File for the installer #################### 
     799#################### Create a .pi-config-File for the installer #################### 
    800800ROOT_FSTYPE="$(egrep -v "^([\s]*[^/].*|)$" ./etc/fstab | awk '{if($2=="/"){print $3}}')" 
    801801if ! grep -q "x:1000:1000:" ./etc/passwd; then 
     
    810810[ "$BOOT_WHERE" ] && CONFIG_BOOT_WHERE="$BOOT_WHERE" || CONFIG_BOOT_WHERE="mbr" 
    811811 
    812 cat <<END >$HOME/.knofig 
     812cat <<END >$HOME/.pi-config 
    813813REGISTERED=' SYSTEM_MODULE SYSTEM_TYPE HD_MODULE HD_FORMAT HD_FSTYPE HD_CHOICE HD_MAP HD_IGNORECHECK SWAP_MODULE SWAP_AUTODETECT NAME_MODULE NAME_NAME USER_MODULE USER_NAME USERPASS_MODULE USERPASS_CRYPT ROOTPASS_MODULE ROOTPASS_CRYPT HOST_MODULE HOST_NAME SERVICES_MODULE SERVICES_START BOOT_MODULE BOOT_LOADER BOOT_DISK BOOT_WHERE INSTALL_READY' 
    814814 
     
    877877 
    878878echo 10 
    879  
    880 #################### Check knofig #################### 
    881 if which kanotix-check-knofig >/dev/null; then 
    882     kanotix-check-knofig $HOME/.knofig 
    883     ERROR=$? 
    884     if [ $ERROR -ne 0 ]; then 
    885         $DIALOG --backtitle "$BT" --title $"Update Warning" --defaultno --yesno $"ERROR: parsix-check-knofig returned $ERROR as error code!\nDo you want to force the update?" 0 0 
    886         if [ ! $? -eq 0 ]; then 
    887                 msgbox $"Update process aborted." 10 50 
    888                 exit 0 
    889         fi 
    890     fi 
    891 fi 
    892879 
    893880#################### Starting Timer #################### 
Note: See TracChangeset for help on using the changeset viewer.