Changeset 5773


Ignore:
Timestamp:
09/06/09 20:27:51 (4 years ago)
Author:
alanbach-guest
Message:
  • Fixed another bug in separated /home partition after the recent updates
    • Fixed inserting swap information upon fstab update
Location:
pkg/kev/main/parsix-installer/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • pkg/kev/main/parsix-installer/trunk/01-fstab.bm

    r5771 r5773  
    7878                [ -n "$USBDEVS" ] && PERLREGEX="${USBDEVS// /|}" || PERLREGEX=".\*" 
    7979                perl -pi -e 'if (! m#^/dev/('$PERLREGEX')#) { s#^/dev/(cciss/c[0-7].*|[sh]d.*)noauto(.*)$#/dev/${1}auto${2}# }' $TARGET_MNT_POINT/etc/fstab 
    80         fi 
    81  
    82         # Add swap devices 
    83         grep -v ^$ $TMPDIR/fstab >> $TARGET_MNT_POINT/etc/fstab 
     80        fi       
    8481 
    8582        # Add CD-Roms 
    … …  
    114111        rm -f $TARGET_MNT_POINT/etc/fstab.new 
    115112        awk '{if (/^[ \t]*#/) print; else printf "%-15s %-15s %-7s %-15s %-7s %s\n",$1,$2,$3,$4,$5,$6}' $TARGET_MNT_POINT/etc/fstab > $TARGET_MNT_POINT/etc/fstab.new 
    116         mv -f $TARGET_MNT_POINT/etc/fstab.new $TARGET_MNT_POINT/etc/fstab 
    117  
     113        mv -f $TARGET_MNT_POINT/etc/fstab.new $TARGET_MNT_POINT/etc/fstab         
    118114} 

  • pkg/kev/main/parsix-installer/trunk/01-hd.bm

    r5772 r5773  
    110110    sleep 1 
    111111   
    112     if [ "$SEP_HOME" == "yes" ] 
     112    if [ "$SEP_HOME" = "Yes" ] 
    113113    then 
    114114         # Format /home partition, need to inform users? 
    … …  
    194194 
    195195  # Default value for seperate /home is no 
    196   SEP_HOME="no" 
     196  SEP_HOME="No" 
    197197 
    198198  if [ $ROOT_PARTS_COUNT -gt 1 ] 
    199199  then 
    200       [ "$SEP_HOME" == "yes" ] && SH_YES_CB="on" || SH_NO_CB="off" 
    201       [ "$SEP_HOME" == "no" ] && SH_NO_CB="on" || SH_YES_CB="off"       
     200      [ "$SEP_HOME" = "Yes" ] && SH_YES_CB="on" || SH_NO_CB="off" 
     201      [ "$SEP_HOME" = "No" ] && SH_NO_CB="on" || SH_YES_CB="off"       
    202202 
    203203      radiolist $"Would you like to specify a separate /home partition?" $"Would you like to specify a separate /home partition?" "No" $"Whole system on a single partition" "$SH_NO_CB" "Yes" $"/home on a separated partition" "$SH_YES_CB"  
    … …  
    206206      SEP_HOME=$(cat $TMP) 
    207207 
    208       if [ "$SEP_HOME" == "yes" ] 
     208      if [ "$SEP_HOME" = "Yes" ] 
    209209      then 
    210210          HOME_PARTS=$(find_home_partitions "$HOME_CHOICE-$HD_CHOICE") 

  • pkg/kev/main/parsix-installer/trunk/02-swap.bm

    r2487 r5773  
    3838{ 
    3939  update_status $"Adding swap-devices to /etc/fstab ..." 
    40   #cp /etc/fstab $TARGET_MNT_POINT/etc/fstab 
    41  
    42   #if [ "$SWAP_AUTODETECT" = "no" ] 
    43   #then 
    44   #  cat /etc/fstab | grep -v "swap" > $TARGET_MNT_POINT/fstab 
    45   #  for i in $SWAP_CHOICES 
    46   #  do 
    47   #    echo "$i none swap defaults 0 0" >> $TARGET_MNT_POINT/fstab 
    48   #  done 
    49   #fi 
    50   #sleep 2 
    51   echo > $TARGET_MNT_POINT/etc/fstab 
    52   if [ "$SWAP_AUTODETECT" = "no" ] 
    53   then 
    54     for i in $SWAP_CHOICES 
    55     do 
    56       echo "$i none swap defaults 0 0" >> $TARGET_MNT_POINT/etc/fstab 
    57     done 
    58   fi 
     40  for i in $SWAP_CHOICES 
     41       do  
     42       printf "%-15s %-15s %-7s %-15s %-7s %s\n" "$i" "none" "swap" "sw" "0" "0" >> $TARGET_MNT_POINT/etc/fstab 
     43  done 
    5944} 
    6045 

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

    r5748 r5773  
    149149 
    150150        #TuxOnIce 
    151         SWAP=$(cat $TARGET_MNT_POINT/etc/fstab | grep swap | awk '{print $1}') 
    152         GRUB_CMDLINE="$GRUB_CMDLINE resume=swap:$SWAP" 
     151        #SWAP=$(cat $TARGET_MNT_POINT/etc/fstab | grep swap | awk '{print $1}') 
     152        GRUB_CMDLINE="$GRUB_CMDLINE resume=swap:$SWAP_CHOICES" 
    153153        #end TuxOnIce 
    154154 

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

    r5772 r5773  
     1parsix-installer (0.90.1.4) unstable; urgency=low 
     2 
     3  * Fixed another bug in separated /home partition after the recent updates 
     4  * Fixed inserting swap information upon fstab update 
     5 
     6 -- Alan Baghumian <alan@technotux.org>  Sun, 06 Sep 2009 11:25:59 -0700 
     7 
    18parsix-installer (0.90.1.3) unstable; urgency=low 
    29 

  • pkg/kev/main/parsix-installer/trunk/parsix-installer

    r5772 r5773  
    1919# 
    2020 
    21 VERSION="0.90.1.3" 
     21VERSION="0.90.1.4" 
    2222CONFIG_FILE="$HOME/.pi-config" 
    2323LOG="$HOME/parsix-installer.log" 
    … …  
    367367{ 
    368368        echo "" 
    369         INSTALL_LIST="module_hd_doaction module_swap_doaction update_fstab old_installer add_bootmanager final_cleanup" 
     369        INSTALL_LIST="module_hd_doaction update_fstab module_swap_doaction old_installer add_bootmanager final_cleanup" 
    370370        INSTALL_LIST_NUM=$[6-1] 
    371371        N=0; 
Note: See TracChangeset for help on using the changeset viewer.