Changeset 2548

Timestamp:

11/28/07 12:45:23 (5 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:

• 02-install-tools.bm (modified) (1 diff)
• boot-tools.bm (modified) (2 diffs)
• debian/changelog (modified) (1 diff)
• parsix-installer (modified) (5 diffs)

pkg/main/parsix-installer/trunk/02-install-tools.bm

@@ -85 +85 @@
                 # TODO: Remove hack from here
                 perl -pi -e "s/insmod/modprobe/g" $TARGET_MNT_POINT/etc/init.d/live-autoconfig
-                [ -e $TARGET_MNT_POINT/etc/default/kde-services-knoppix ] && perl -pi -e 's/^#//g' $TARGET_MNT_POINT/etc/default/kde-services-knoppix
-                [ -e $TARGET_MNT_POINT/etc/default/kde-services-kanotix ] && perl -pi -e 's/^#//g' $TARGET_MNT_POINT/etc/default/kde-services-kanotix
         fi
         

pkg/main/parsix-installer/trunk/boot-tools.bm

@@ -252 +252 @@
                 if [ "$device" != "$HD_CHOICE" ]; then
                         if [ "$kindOf" = "linux" ]; then
-                                # Do not re-mount in X mode, HAL did it before
-                                if [ "$DIALOG" == "dialog" ]; then
-                                     mount $device $TempDir >/dev/null 2>/dev/null
-                                fi
-                                if [ $? -eq 0 ] ; then
+                                # mount probed partitions
+                                mount $device $TempDir >/dev/null 2>/dev/null
+                                if [ $? -eq 0 ] ; then
                                         if [ -r "$mounted_grub_file" ]; then
                                                 found=0
@@ -282 +280 @@
                                                 done < "$mounted_grub_file"
                                         fi
-                                     # No need to unmount in X mode
-                                     if [ "$DIALOG" == "dialog" ]; then
-                                        umount $TempDir
-                                     fi
+                                     # unmount probed partitions
+                                     umount $TempDir
                                 fi
                         elif [ "$kindOf" = "chain" ]; then

pkg/main/parsix-installer/trunk/debian/changelog

@@ +1 @@
+parsix-installer (0.81.2.5) unstable; urgency=low
+
+  * Store installation configuration in .pi-config file
+  * Store installation logs in parsix-installer.log
+  * Fixed a bug in appendGrubForOtherOS
+  * Some code clean-ups
+
+ -- Alan Baghumian <alan@technotux.org>  Wed, 28 Nov 2007 15:05:39 +0330
+
 parsix-installer (0.81.2.4) unstable; urgency=low
 

pkg/main/parsix-installer/trunk/parsix-installer

@@ -20 +20 @@
 
 VERSION="0.81.2"
-CONFIG_FILE="$HOME/.knofig"
-LOG="$HOME/.knofig_log"
+CONFIG_FILE="$HOME/.pi-config"
+LOG="$HOME/parsix-installer.log"
 
 TARGET_MNT_POINT="/media/hdinstall" # TR1 in old installer
@@ -53 +53 @@
         grep -q squashfs /proc/mounts && ROOT_MIN_RAW=$(($ROOT_MIN_RAW*270/100)) #fix status bar for squashfs
 fi
-ROOT_MIN_CORR=$[ROOT_MIN_RAW*115/100] # + 15% Filesystem overhead
+ROOT_MIN_CORR=$[ROOT_MIN_RAW*120/100] # + 20% Filesystem overhead
 ROOT_MIN=$(($ROOT_MIN_CORR*1024))
 
@@ -797 +797 @@
 done
 
-#################### Create a .knofig-File for the installer ####################
+#################### Create a .pi-config-File for the installer ####################
 ROOT_FSTYPE="$(egrep -v "^([\s]*[^/].*|)$" ./etc/fstab | awk '{if($2=="/"){print $3}}')"
 if ! grep -q "x:1000:1000:" ./etc/passwd; then
@@ -810 +810 @@
 [ "$BOOT_WHERE" ] && CONFIG_BOOT_WHERE="$BOOT_WHERE" || CONFIG_BOOT_WHERE="mbr"
 
-cat <<END >$HOME/.knofig
+cat <<END >$HOME/.pi-config
 REGISTERED=' 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'
 
@@ -877 +877 @@
 
 echo 10
-
-#################### Check knofig ####################
-if which kanotix-check-knofig >/dev/null; then
-    kanotix-check-knofig $HOME/.knofig
-    ERROR=$?
-    if [ $ERROR -ne 0 ]; then
-        $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
-        if [ ! $? -eq 0 ]; then
-                msgbox $"Update process aborted." 10 50
-                exit 0
-        fi
-    fi
-fi
 
 #################### Starting Timer ####################