Revision 3903b7f1

b/common.sh.in
213 213
  $KPARTX -d -p- $1
214 214
}
215 215

  
216
setup_fstab() {
217
    local target=$1
218
    get_os_type
219
    cat > $target/etc/fstab <<EOF
220
# /etc/fstab: static file system information.
221
#
222
# <file system>   <mount point>   <type>  <options>       <dump>  <pass>
223
UUID=$root_uuid   /               ext3    defaults        0       1
224
proc              /proc           proc    defaults        0       0
225
EOF
226

  
227
[ -n "$boot_dev" -a -n "$boot_uuid" ] && cat >> $target/etc/fstab <<EOF
228
UUID=$boot_uuid   /boot           ext3    defaults        1       2
229
EOF
230

  
231
[ -n "$swap_dev" -a -n "$swap_uuid" ] && cat >> $target/etc/fstab <<EOF
232
UUID=$swap_uuid   swap            swap    defaults        0       0
233
EOF
234

  
235
# OS Specific fstabs
236
[ "$OS_TYPE" = "redhat" ] && cat >> $target/etc/fstab <<EOF
237
tmpfs             /dev/shm        tmpfs   defaults        0       0
238
devpts            /dev/pts        devpts  gid=5,mode=620  0       0
239
sysfs             /sys            sysfs   defaults        0       0
240
EOF
241

  
242
[ "$OS_TYPE" = "gentoo" ] && cat >> $target/etc/fstab <<EOF
243
shm               /dev/shm        tmpfs   nodev,nosuid,noexec 0   0
244
EOF
245
}
246

  
216 247
cleanup() {
217 248
  if [ ${#CLEANUP[*]} -gt 0 ]; then
218 249
    LAST_ELEMENT=$((${#CLEANUP[*]}-1))
b/create
63 63

  
64 64
    if [ "${IMAGE_TYPE}" = "tarball" -o "${IMAGE_TYPE}" = "dump" ] ; then
65 65
        mkfs_disk0
66
        root_uuid="$($VOL_ID $root_dev)"
67
        [ -n "$boot_dev" ] && boot_uuid="$($VOL_ID $boot_dev)"
68
        [ -n "$swap_dev" ] && swap_uuid="$($VOL_ID $swap_dev)"
66 69
    fi
67 70

  
68 71
    TARGET=`mktemp -d` || exit 1
......
88 91
        fi
89 92
    fi
90 93

  
94
    if [ "${IMAGE_TYPE}" = "tarball" -o "${IMAGE_TYPE}" = "dump" ] ; then
95
        setup_fstab $TARGET
96
    fi
97

  
91 98
    RUN_PARTS=`which run-parts`
92 99

  
93 100
    if [ -n "$RUN_PARTS" -a -n "$CUSTOMIZE_DIR" -a -d "$CUSTOMIZE_DIR" ]; then
b/import
39 39
swap_dev=$(map_partition $filesystem_dev swap)
40 40

  
41 41
mkfs_disk0
42
root_uuid="$($VOL_ID $root_dev)"
43
[ -n "$boot_dev" ] && boot_uuid="$($VOL_ID $boot_dev)"
44
[ -n "$swap_dev" ] && swap_uuid="$($VOL_ID $swap_dev)"
42 45

  
43 46
TARGET=`mktemp -d` || exit 1
44 47
CLEANUP+=("rmdir $TARGET")
......
54 57
    ( cd ${TARGET}/boot ; restore -r -y -f ${DUMPDIR}/boot.dump )
55 58
fi
56 59

  
60
setup_fstab $TARGET
61

  
57 62
rm -f $TARGET/etc/udev/rules.d/z*_persistent-net.rules
58 63

  
59 64
if [ -n "$CUSTOMIZE_DIR" -a -d "$CUSTOMIZE_DIR" -a -x "$CUSTOMIZE_DIR/grub" ] ; then

Also available in: Unified diff