makechrootpkg: Unindent as suggested in 2fd5931
This commit is contained in:
parent
578a62f1e0
commit
2243a276e4
|
@ -112,27 +112,25 @@ sync_chroot() {
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if true; then # indent for rebasing/merging purposes
|
# Get a read lock on the root chroot to make
|
||||||
# Get a read lock on the root chroot to make
|
# sure we don't clone a half-updated chroot
|
||||||
# sure we don't clone a half-updated chroot
|
slock 8 "$chrootdir/root.lock" \
|
||||||
slock 8 "$chrootdir/root.lock" \
|
"Locking clean chroot [%s]" "$chrootdir/root"
|
||||||
"Locking clean chroot [%s]" "$chrootdir/root"
|
|
||||||
|
|
||||||
stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$chrootdir/root" "$copydir"
|
stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$chrootdir/root" "$copydir"
|
||||||
if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
|
if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
|
||||||
subvolume_delete_recursive "$copydir" ||
|
subvolume_delete_recursive "$copydir" ||
|
||||||
die "Unable to delete subvolume %s" "$copydir"
|
die "Unable to delete subvolume %s" "$copydir"
|
||||||
btrfs subvolume snapshot "$chrootdir/root" "$copydir" >/dev/null ||
|
btrfs subvolume snapshot "$chrootdir/root" "$copydir" >/dev/null ||
|
||||||
die "Unable to create subvolume %s" "$copydir"
|
die "Unable to create subvolume %s" "$copydir"
|
||||||
else
|
else
|
||||||
mkdir -p "$copydir"
|
mkdir -p "$copydir"
|
||||||
rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
|
rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
|
||||||
fi
|
|
||||||
stat_done
|
|
||||||
|
|
||||||
# Drop the read lock again
|
|
||||||
lock_close 8
|
|
||||||
fi
|
fi
|
||||||
|
stat_done
|
||||||
|
|
||||||
|
# Drop the read lock again
|
||||||
|
lock_close 8
|
||||||
|
|
||||||
# Update mtime
|
# Update mtime
|
||||||
touch "$copydir"
|
touch "$copydir"
|
||||||
|
|
Loading…
Reference in New Issue