Magellan Linux

Diff of /trunk/installer/include/prepare_fstab.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1045 by niro, Sun May 30 18:29:43 2010 UTC revision 1046 by niro, Sun May 30 23:08:38 2010 UTC
# Line 8  source ${INSTALLER_DIR}/include/hwdetect Line 8  source ${INSTALLER_DIR}/include/hwdetect
8  KNOWN_DISKS="ROOT BOOT SWAP HOME TMP USER VAR SVR OPT"  KNOWN_DISKS="ROOT BOOT SWAP HOME TMP USER VAR SVR OPT"
9    
10  # root device  # root device
11  sed -i "s:^/dev/ROOT.*:$(get_uuid ${PARTITION_DISK_ROOT})\t/\t\t${PARTITION_FS_ROOT}\t\tdefaults,noatime\t0 0:" ${INSTALL_ROOT}/etc/fstab  sed -i "s:^/dev/ROOT.*:UUID=$(get_uuid ${PARTITION_DISK_ROOT})\t/\t\t${PARTITION_FS_ROOT}\t\tdefaults,noatime\t0 0:" ${INSTALL_ROOT}/etc/fstab
12  # swap device  # swap device
13  sed -i "s:^/dev/SWAP.*:$(get_uuid ${PARTITION_DISK_SWAP})\tswap\t\tswap\t\tpri=1\t\t\t0 0:" ${INSTALL_ROOT}/etc/fstab  sed -i "s:^/dev/SWAP.*:UUID=$(get_uuid ${PARTITION_DISK_SWAP})\tswap\t\tswap\t\tpri=1\t\t\t0 0:" ${INSTALL_ROOT}/etc/fstab
14    
15  # boot  # boot
16  if [[ -z ${PARTITION_DISK_BOOT} ]]  if [[ -z ${PARTITION_DISK_BOOT} ]]
# Line 18  then Line 18  then
18   # delete the entry   # delete the entry
19   sed -i 's/\/dev\/ROOT.*/d' ${INSTALL_ROOT}/etc/fstab   sed -i 's/\/dev\/ROOT.*/d' ${INSTALL_ROOT}/etc/fstab
20  else  else
21   sed -i "s:^/dev/BOOT.*:$(get_uuid ${PARTITION_DISK_BOOT})\t/boot\t\t${PARTITION_FS_BOOT}\t\tnoauto,noatime\t1 1:" ${INSTALL_ROOT}/etc/fstab   sed -i "s:^/dev/BOOT.*:UUID=$(get_uuid ${PARTITION_DISK_BOOT})\t/boot\t\t${PARTITION_FS_BOOT}\t\tnoauto,noatime\t1 1:" ${INSTALL_ROOT}/etc/fstab
22  fi  fi
23    
24  # then all other  # then all other
# Line 42  do Line 42  do
42   then   then
43   if [[ -z $(grep [[:space:]]${dest}[[:space:]] ${INSTALL_ROOT}/etc/fstab) ]]   if [[ -z $(grep [[:space:]]${dest}[[:space:]] ${INSTALL_ROOT}/etc/fstab) ]]
44   then   then
45   echo "${disk_uuid}\t${dest}\t\t${disk_fs}\t\tdefaults,noatime\t0 0" >> ${INSTALL_ROOT}/etc/fstab   echo "UUID=${disk_uuid}\t${dest}\t\t${disk_fs}\t\tdefaults,noatime\t0 0" >> ${INSTALL_ROOT}/etc/fstab
46   else   else
47   sed -i "s:.*[[:space:]]${dest}[[:space:]].*:${disk_uuid}\t${dest}\t\t${disk_fs}\t\tdefaults,noatime\t0 0:" ${INSTALL_ROOT}/etc/fstab   sed -i "s:.*[[:space:]]${dest}[[:space:]].*:UUID=${disk_uuid}\t${dest}\t\t${disk_fs}\t\tdefaults,noatime\t0 0:" ${INSTALL_ROOT}/etc/fstab
48   fi   fi
49   fi   fi
50  done  done

Legend:
Removed from v.1045  
changed lines
  Added in v.1046