Changeset 1755 in MondoRescue
- Timestamp:
- Oct 31, 2007, 1:11:44 AM (16 years ago)
- Location:
- branches/2.2.5
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.5/mindi/mindi
r1737 r1755 961 961 local res currline partition all_partitions ap_orig remaining i j 962 962 963 grep -vx " *#.*" $MY_FSTAB | grep -vx " *none.*" | $AWK '/^\/dev\/[imhs]d||^LABEL \=\/|^UUID=/ && !/fdd|cdr|zip|floppy/ {print $1}'963 grep -vx " *#.*" $MY_FSTAB | grep -vx " *none.*" | $AWK '/^\/dev\/[imhs]d||^LABEL=\/|^UUID=/ && !/fdd|cdr|zip|floppy/ {print $1}' 964 964 [ -e "/etc/raidtab" ] && $AWK '/^ *device/ {print $2}' /etc/raidtab 965 965 return … … 1251 1251 done 1252 1252 [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`" 1253 printf " %-15s %-15s %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABELUUID | tee -a $LOGFILE1253 printf " %-15s %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL/UUID | tee -a $LOGFILE 1254 1254 useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1" 1255 1255 for c_p in $all_partitions ; do … … 1503 1503 fi 1504 1504 fi 1505 if [ "$redhat_label" ]; then 1506 label="$redhat_label" 1507 else if [ "$uuid" ]; then 1508 label="$uuid" 1509 fi 1505 1510 partition_format="`echo "$partition_format" | cut -d',' -f1`"; # in case user has ext3,ext2 or something dumb like that 1506 1511 [ "$partition_format" = "auto" ] && partition_format="`mount | grep -w $current_partition | $AWK '{print$5;}'`"; # in case user uses 'auto' (dumb!) 1507 unofficial_outstring=`printf "\t%-15s %-15s %-15s %7s %-15s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" $uuid`1512 unofficial_outstring=`printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$label"` 1508 1513 if [ "$current_partition" = "" ] ; then 1509 1514 echo "Unknown partition (outstring = $unofficial_outstring)" >> $LOGFILE … … 1512 1517 partition_mountpt=raid 1513 1518 partition_format=raid 1514 printf "\t%-15s %-15s %-15s %7s %-15s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" $uuid| tee -a $LOGFILE1515 printf "%s %s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$ redhat_label" $uuid>> $mountlist1519 printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$label" | tee -a $LOGFILE 1520 printf "%s %s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$label" >> $mountlist 1516 1521 else 1517 1522 echo "Unknown mountpoint (outstring = $unofficial_outstring)" >> $LOGFILE … … 1528 1533 partition_format="vfat" 1529 1534 fi 1530 printf "\t%-15s %-15s %-15s %7s %-15s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" $uuid| tee -a $LOGFILE1531 printf "%s %s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" $uuid>> $mountlist1535 printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$label" | tee -a $LOGFILE 1536 printf "%s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$label" >> $mountlist 1532 1537 fi 1533 1538 done -
branches/2.2.5/mondo/src/restore-scripts/mondo/hack-fstab
r1546 r1755 20 20 format=`echo "$incoming" | cut -d' ' -f3` 21 21 size=`echo "$incoming" | cut -d' ' -f4` 22 label=`echo "$incoming" | cut -d' ' -f5` 23 uuid=`echo "$incoming" | cut -d' ' -f6` 22 label=`echo "$incoming" | cut -d' ' -f5` 24 23 original_fstab_line=`grep " $mountpoint " $old_fstab | grep -v "#" | tr -s ' ' ' '` 25 24 if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then … … 28 27 fi 29 28 if [ "`echo "$original_fstab_line" | grep "UUID="`" != "" ] ; then 30 device="UUID=$ uuid"29 device="UUID=$label" 31 30 fi 32 31 fi -
branches/2.2.5/mondo/src/restore-scripts/mondo/label-partitions-as-necessary
r1314 r1755 11 11 label=`echo "$1" | awk '{print $1}' | cut -d'=' -f2` 12 12 format=`echo "$1" | awk '{print $3}'` 13 mountpt=`awk '{print $1,$5}' $mountlist | grep " $label$" | awk '{print $1}'` 13 14 14 15 if [ "`echo "$1" | grep -E 'LABEL='`" != "" ] ; then 15 16 opttun="-L" 16 mountpt=`awk '{print $1,$5}' $mountlist | grep " $label$" | awk '{print $1}'`17 17 elif [ "`echo "$1" | grep -E 'UUID='`" != "" ] ; then 18 18 opttun="-U" 19 mountpt=`awk '{print $1,$6}' $mountlist | grep " $label$" | awk '{print $1}'`20 19 else 21 20 # Nothing to do … … 35 34 if [ "$opttun" = "-U" ]; then 36 35 echo "Unable yet to identify swap with UUID" 36 echo "You'll have to modify your /etc/fstab after reboot" 37 echo "Replace the UUID found on the swap line by the one" 38 echo "given by the command vol_id -u $mountpt" 39 echo "And ask Ubuntu guys to deliver a mswap command with" 40 echo "a -U option to update the UUID to what we want !!!" 41 42 sleep 5 37 43 else 38 44 command="mkswap $opttun $label $mountpt"
Note:
See TracChangeset
for help on using the changeset viewer.