Skip to content

Commit

Permalink
Use wipefs when available to clean up disk partitions
Browse files Browse the repository at this point in the history 
before creating filesystems there,
see #540
and #649 (comment)

Currently "when available" means that on has to manually add it
to the rear recovery system in in /etc/rear/local.conf via
REQUIRED_PROGS=( "${REQUIRED_PROGS[@]}" wipefs )

Making wipefs automatically available to the rear recovery system
when it is available in the original system is a next step.
  • Loading branch information
@jsmeix
jsmeix committed Nov 19, 2015
1 parent ddfed6f commit 997d4b3
Showing 1 changed file with 73 additions and 41 deletions.
114 changes: 73 additions & 41 deletions usr/share/rear/layout/prepare/GNU/Linux/13_include_filesystem_code.sh
View file
@@ -1,25 +1,43 @@
# Code to recreate filesystems.

create_fs() {
local fs device mp fstype uuid label options
device=${1#fs:}
## mp: mount point
read fs device mp fstype uuid label options < <( grep "^fs.* $device " "$LAYOUT_FILE" )
function create_fs () {
Log "Begin create_fs( $@ )"

local fs device mountpoint fstype uuid label options
device=${1#fs:}
read fs device mountpoint fstype uuid label options < <( grep "^fs.* $device " "$LAYOUT_FILE" )
label=${label#label=}
uuid=${uuid#uuid=}

#need to wait for udev device creation
cat >> "$LAYOUT_CODE" <<EOF
my_udevsettle
EOF
# Wait until udev had created the disk partition device node before creating a filesystem there:
( echo "# Wait until udev had created '$device' before creating a filesystem there:"
echo "my_udevsettle"
) >> "$LAYOUT_CODE"

# If available use wipefs as a generic way to cleanup disk partitions
# before creating a filesystem on a disk partition,
# see https://github.com/rear/rear/issues/540
# and https://github.com/rear/rear/issues/649#issuecomment-148725865
local has_wipefs="" wipefs_command="" wipefs_info_message=""
if has_binary wipefs ; then
has_wipefs="yes"
wipefs_command="wipefs -a $device"
wipefs_info_message="Using wipefs to cleanup '$device' before creating filesystem."
Debug "$wipefs_info_message"
echo "# $wipefs_info_message" >> "$LAYOUT_CODE"
fi

# Tell what will be done:
local create_filesystem_info_message="Creating filesystem of type '$fstype' with mount point '$mountpoint' on '$device'."
Debug "$create_filesystem_info_message"
echo "LogPrint '$create_filesystem_info_message'" >> "$LAYOUT_CODE"

# Actually do it:
case "$fstype" in
(ext*)
# File system parameters.
# File system parameters:
local blocksize="" reserved_blocks="" max_mounts="" check_interval="" default_mount_options=""
local fragmentsize="" bytes_per_inode=""

local option name value
for option in $options ; do
name=${option%=*}
Expand Down Expand Up @@ -53,63 +71,73 @@ EOF
;;
esac
done
cat >> "$LAYOUT_CODE" <<EOF
LogPrint "Creating $fstype-filesystem $mp on $device"
mkfs -t ${fstype}${blocksize}${fragmentsize}${bytes_per_inode} $device >&2
EOF

# If available use wipefs to cleanup disk partition:
test "$has_wipefs" && echo "$wipefs_command" >> "$LAYOUT_CODE"
# Actually create the filesystem:
echo "mkfs -t ${fstype}${blocksize}${fragmentsize}${bytes_per_inode} $device >&2" >> "$LAYOUT_CODE"
# Adjust tunable filesystem parameters on ext2/ext3/ext4 filesystems:
local tunefs="tune2fs"
# On RHEL 5, tune2fs does not work on ext4.
if [ "$fstype" = "ext4" ] && has_binary tune4fs; then
tunefs="tune4fs"
fi

# Set the label:
if [ -n "$label" ] ; then
echo "$tunefs -L $label $device >&2" >> "$LAYOUT_CODE"
fi
# Set the UUID:
if [ -n "$uuid" ] ; then
echo "$tunefs -U $uuid $device >&2" >> "$LAYOUT_CODE"
fi

# Set the other tunable filesystem parameters:
tune2fsopts="${reserved_blocks}${max_mounts}${check_interval}${default_mount_options}"
if [ -n "$tune2fsopts" ] ; then
echo "$tunefs $tune2fsopts $device >&2" >> "$LAYOUT_CODE"
fi
;;
(xfs)
cat >> "$LAYOUT_CODE" <<EOF
LogPrint "Creating $fstype-filesystem $mp on $device"
mkfs.xfs -f $device
EOF
# If available use wipefs to cleanup disk partition:
test "$has_wipefs" && echo "$wipefs_command" >> "$LAYOUT_CODE"
# Actually create the filesystem:
echo "mkfs.xfs -f $device" >> "$LAYOUT_CODE"
# Set the label:
if [ -n "$label" ] ; then
echo "xfs_admin -L $label $device >&2" >> "$LAYOUT_CODE"
fi
# Set the UUID:
if [ -n "$uuid" ] ; then
echo "xfs_admin -U $uuid $device >&2" >> "$LAYOUT_CODE"
fi
;;
(reiserfs)
cat >> "$LAYOUT_CODE" <<EOF
LogPrint "Creating $fstype-filesystem $mp on $device"
mkfs -t $fstype -q $device
EOF
# If available use wipefs to cleanup disk partition:
test "$has_wipefs" && echo "$wipefs_command" >> "$LAYOUT_CODE"
# Actually create the filesystem:
echo "mkfs -t $fstype -q $device" >> "$LAYOUT_CODE"
# Set the label:
if [ -n "$label" ] ; then
echo "reiserfstune --label $label $device >&2" >> "$LAYOUT_CODE"
fi
# Set the UUID:
if [ -n "$uuid" ] ; then
echo "reiserfstune --uuid $uuid $device >&2" >> "$LAYOUT_CODE"
fi
;;
(btrfs)
cat >> "$LAYOUT_CODE" <<EOF
LogPrint "Creating $fstype-filesystem $mp on $device"
# if $device is already mounted, skip
# see https://bugzilla.novell.com/show_bug.cgi?id=878870 (adding -f [force] option to mkfs for btrfs)
mount | grep -q $device || mkfs -t $fstype -f $device
EOF
# If available use wipefs to cleanup disk partition:
test "$has_wipefs" && echo "mount | grep -q $device || $wipefs_command" >> "$LAYOUT_CODE"
# Actually create the filesystem provided the disk partition is not already mounted.
# User -f [force] to force overwriting an existing btrfs on that disk partition
# when the disk was already used before, see https://bugzilla.novell.com/show_bug.cgi?id=878870
( echo "# if $device is already mounted, skip"
echo "# force overwriting existing btrfs when the disk was already used before"
echo "mount | grep -q $device || mkfs -t $fstype -f $device"
) >> "$LAYOUT_CODE"
# Set the label:
if [ -n "$label" ] ; then
echo "mount | grep -q $device || btrfs filesystem label $device $label >&2" >> "$LAYOUT_CODE"
fi
# Set the UUID:
if [ -n "$uuid" ] ; then
# Problem with btrfs is that UUID cannot be set during mkfs! So, we must map it and
# change later the /etc/fstab, /boot/grub/menu.lst, etc.
Expand All @@ -132,11 +160,12 @@ EOF
fi
;;
(vfat)
cat >> "$LAYOUT_CODE" <<EOF
LogPrint "Creating $fstype-filesystem $mp on $device"
EOF
# If available use wipefs to cleanup disk partition:
test "$has_wipefs" && echo "$wipefs_command" >> "$LAYOUT_CODE"
# Actually create the filesystem with or without label:
if [ -n "$label" ] ; then
echo "$label" | grep -q '\b' # we substituted all " " with "\\b" in savelayout (\\b becomes \b by reading label)
# we substituted all " " with "\\b" in savelayout (\\b becomes \b by reading label)
echo "$label" | grep -q '\b'
if [ $? -eq 0 ] ; then
label2="$(echo $label | sed -e 's/\\b/ /g')" # replace \b with a " "
label="$label2"
Expand All @@ -145,6 +174,7 @@ EOF
else
echo "mkfs.vfat $device" >> "$LAYOUT_CODE"
fi
# Set the UUID:
if [ -n "$uuid" ]; then
# The UUID label of vfat is changed by recreating the fs, we must swap it.
cat >> "$LAYOUT_CODE" <<EOF
Expand All @@ -156,14 +186,16 @@ EOF
fi
;;
(*)
cat >> "$LAYOUT_CODE" <<EOF
LogPrint "Creating filesystem ($fstype) $mp on $device"
mkfs -t $fstype $device >&2
EOF
# If available use wipefs to cleanup disk partition:
test "$has_wipefs" && echo "$wipefs_command" >> "$LAYOUT_CODE"
# Actually create the filesystem:
echo "mkfs -t $fstype $device >&2" >> "$LAYOUT_CODE"
;;
esac

# call the mount_fs function with argument $1 (device)
# Call the mount_fs function with argument $1 (device):
mount_fs ${1}

Log "End create_fs( $@ )"
}

0 comments on commit 997d4b3

Please sign in to comment.