source: MondoRescue/branches/stable/mondo/src/restore-scripts/mondo/hack-fstab

Last change on this file was 1770, checked in by Bruno Cornec, 16 years ago
  • Better output for mindi-busybox revision
  • Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
  • strace useful for debug
  • fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
  • fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
  • fix typo in label-partitions-as-necessary which doesn't seem to work
  • Update to busybox 1.7.2
  • perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

  • next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
  • small optimization in mindi on keyboard handling (one single find instead of multiple)
  • better interaction for USB device when launching mindi manually
  • attempt to automatically guess block disk size for ramdisk
  • fix typos in bkphw
  • Fix the remaining problem with UUID support for swap partitions
  • Updates mondoarchive man page for USB support
  • Adds preliminary Hardware support to mindi (Proliant SSSTK)
  • Tries to add udev support also for rhel4
  • Fix UUID support which was still broken.
  • Be conservative in test for the start-nfs script
  • Update config file for mindi-busybox for 1.7.2 migration
  • Try to run around a busybox bug (1.2.2 pb on inexistant links)
  • Add build content for mindi-busybox in pb
  • Remove distributions content for mindi-busybox
  • Fix a warning on inexistant raidtab
  • Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
  • Create MONDO_CACHE and use it everywhere + creation at start
  • Really never try to eject a USB device
  • Fix a issue with &> usage (replaced with 1> and 2>)
  • Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
  • tty modes correct to avoid sh error messages
  • Use ext3 normally and not ext2 instead
  • USB device should be corrected after reading (take 1st part)
  • Adds a mount_USB_here function derived from mount_CDROM_here
  • usb detection place before /dev detection in device name at restore time
  • Fix when restoring from USB: media is asked in interactive mode
  • Adds USB support for mondorestore
  • mount_cdrom => mount_media
  • elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
  • untar-and-softlink => untar (+ interface change)
  • suppress useless softlinks creation/removal in boot process
  • avoids udevd messages on groups
  • Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
  • skip existing big file creation
  • seems to work correctly for USB mindi boot
  • Adds group and tty link to udev conf
  • Always load usb-torage (even 2.6) to initiate USB bus discovery
  • Better printing of messages
  • Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
  • Links were not correctly done as non relative for modules in mindi
  • exclusion of modules denied now works
  • Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
  • Fix bugs for DENY_MODS handling
  • Add device /dev/console for udev
  • ide-generic should now really be excluded
  • Fix a bug in major number for tty
  • If udev then adds modprobe/insmod to rootfs
  • tty0 is also cretaed with udev
  • ide-generic put rather in DENY_MODS
  • udevd remove from deplist s handled in mindi directly
  • better default for mindi when using --usb
  • Handles dynamically linked busybox (in case we want to use it soon ;-)
  • Adds fixed devices to create for udev
  • ide-generic should not be part of the initrd when using libata v2
  • support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
  • Improvement in udev support (do not use cl options not available in busybox)
  • Udev in mindi
    • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
    • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
    • add support for 64 bits udev
  • Try to render MyInsmod silent at boot time
  • Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
  • We also need vaft format support for USB boot
  • Adds libusual support (Ubuntu 7.10 needs it for USB)
  • Improve Ubuntu/Debian keyboard detection and support
  • pbinit adapted to new pb (0.8.10). Filtering of docs done in it
  • Suppress some mondo warnings and errors on USB again
  • Tries to fix lack of files in deb mindi package
  • Verify should now work for USB devices
  • More log/mesages improvement for USB support
  • - Supress g_erase_tmpdir_and_scratchdir
  • Improve some log messages for USB support
  • Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
  • Improve mindi-busybox build
  • In conformity with pb 0.8.9
  • Add support for Ubuntu 7.10 in build process
  • Add USB Key button to Menu UI (CD streamer removed)
  • Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
  • Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René Ribaud).
  • Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
  • Put mondorescue in conformity with new pb filtering rules
  • Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
  • Unmounting USB device before removal of temporary scratchdir
  • Stil refining USB copy back to mondo (one command was not executed)
  • No need to have the image subdor in the csratchdir when USB.
  • umount the USB partition before attempting to use it
  • Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

  • Property svn:keywords set to Id
  • Property svn:unix-mode set to 755
File size: 3.8 KB
Line 
1#!/bin/sh
2#
3# $Id: hack-fstab 1770 2007-11-06 10:01:53Z bruno $
4#
5# Recreate /etc/fstab from first mountlist analysis
6# and then complement wirh old fstab content.
7
8LogIt() {
9 echo "$1" >> /dev/stderr
10}
11
12
13AddFancyParams() {
14 local incoming device mountpoint format size original_fstab_line label uuid
15
16 incoming=`echo "$1" | tr -s '\t' ' '`
17 [ "$incoming" = "" ] && return
18 device=`echo "$incoming" | cut -d' ' -f1`
19 mountpoint=`echo "$incoming" | cut -d' ' -f2`
20 format=`echo "$incoming" | cut -d' ' -f3`
21 size=`echo "$incoming" | cut -d' ' -f4`
22 label=`echo "$incoming" | cut -d' ' -f5`
23 original_fstab_line=`grep " $mountpoint " $old_fstab | grep -v "#" | tr -s ' ' ' '`
24 if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
25 if [ "`echo "$original_fstab_line" | grep "LABEL="`" != "" ] ; then
26 device="LABEL=$label"
27 fi
28 if [ "`echo "$original_fstab_line" | grep "UUID="`" != "" ] ; then
29 device="UUID=$label"
30 fi
31 fi
32
33 echo -e -n "$device $mountpoint $format "
34
35 if [ "$original_fstab_line" != "" ] ; then
36 echo "$original_fstab_line" | cut -d' ' -f4- | tr -s ' ' ' '
37 else
38 echo -e "defaults 0 0"
39 fi
40}
41
42
43ProcessFstab() {
44 local incoming dev mountlist_entry blanklines new_i
45
46 read incoming
47 blanklines=0
48 while [ "$blanklines" -lt "5" ] ; do
49 if [ "$incoming" = "" ] ; then
50 blanklines=$(($blanklines+1))
51 read incoming
52 continue
53 fi
54 incoming=`echo "$incoming" | tr -s '\t' ' '`
55 if [ "`echo "$incoming" | grep -vE "LABEL=|UUID="`" ] ; then
56 dev=`echo "$incoming" | cut -d' ' -f1`
57 mountlist_entry=`grep "$dev " $old_mountlist`
58 if [ "$mountlist_entry" = "" ] ; then
59 echo "$incoming"
60 fi
61 fi
62 read incoming
63 done
64}
65
66
67HackIncomingIfLABELused() {
68 local incoming col1 col2 col_rest orig out result
69
70 # Keep LABEL or UUID if originally there in fstab
71 result=""
72 incoming=`echo "$1" | tr -s '\t' ' '`
73 col1=`echo "$incoming" | cut -d' ' -f1`
74 col2=`echo "$incoming" | cut -d' ' -f2`
75 col_rest=`echo "$incoming" | cut -d' ' -f3- | tr -s ' ' ' '`
76 orig="`grep " $col2 " $old_fstab | cut -d' ' -f1`"
77 if [ "`echo "$orig" | grep -E "LABEL=|UUID="`" != "" ] ; then
78 echo "orig = $orig" >> /dev/stderr
79 echo -e "$orig $col2 $col_rest" | tr -s ' ' ' '
80 fi
81}
82
83
84#HackIncomingIfLABELused "LABEL=/ / ext2 defaults 0,0,0"
85#exit 0
86
87
88
89ProcessMountlist() {
90 local incoming outstr res spc
91
92 read incoming
93 while [ "$incoming" != "" ] ; do
94 incoming=`echo "$incoming" | tr -s '\t' ' '`
95 res=`HackIncomingIfLABELused "$incoming"`
96 if [ ! "$res" ] ; then
97 outstr=`AddFancyParams "$incoming"`
98 else
99 outstr=`AddFancyParams "$res"`
100 fi
101 spc="`echo "$outstr" | tr -s '\t' ' '`"
102 if [ "$spc" != "" ] && [ "$spc" != " " ] && [ "`echo "$spc" | grep "raid raid"`" = "" ] ; then
103 echo "$spc"
104 fi
105 read incoming
106 done
107}
108
109# ----------------- main ---------------
110
111LogIt "hack-fstab --- starting"
112
113if [ "$#" -ne "4" ] ; then
114 LogIt "hack-fstab <old mountlist> <old fstab> <new mountlist> <new fstab>" 1
115 LogIt "NB: the new fstab file is outgoing; all other files are incoming." 1
116 exit 1
117fi
118
119LogIt "hack-fstab '$1' '$2' '$3' '$4'"
120
121old_mountlist=$1
122old_fstab=$2
123new_mountlist=$3
124outfile=$4
125
126> $outfile
127LogIt "Processing mountlist"
128ProcessMountlist < $new_mountlist >> $outfile
129LogIt "Processing fstab"
130ProcessFstab < $old_fstab >> $outfile
131if [ ! -e "$outfile.old" ] ; then
132 LogIt "Moving $outfile to $outfile.old" 1
133 mv $outfile $outfile.old
134else
135 LogIt "$outfile.old exists already - assuming it _is_ the old one & using it" 1
136fi
137cat $outfile.old | tr -s ' ' ' ' \
138| gawk '{printf "%-15s %-18s %-10s ",$1,$2,$3; for(i=4;i<=NF;i++) {printf "%s ",$i;};print "";};' \
139| sort -u > $outfile
140
141LogIt "Finished writing to outfile ($outfile)"
142LogIt "hack-fstab --- leaving"
143exit 0
Note: See TracBrowser for help on using the repository browser.