Merge remote-tracking branch 'origin/pr/161'

diff --combined chroot-script
index a27dd58,0d95d67..b0737ca
--- 1/chroot-script
--- 2/chroot-script
+++ b/chroot-script
@@@ -75,8 -75,8 +75,8 @@@ askpass() 
  
  # define chroot mirror {{{
  chrootmirror() {
-   if [ -n "$KEEP_SRC_LIST" ] ; then
-     echo "KEEP_SRC_LIST has been set, skipping chrootmirror stage."
+   if [ "$KEEP_SRC_LIST" = "yes" ] ; then
+     echo "KEEP_SRC_LIST has been enabled, skipping chrootmirror stage."
      return
    fi
  
@@@ -129,8 -129,8 +129,8 @@@
  
  # remove local chroot mirror {{{
  remove_chrootmirror() {
-   if [ -n "$KEEP_SRC_LIST" ] ; then
-     echo "KEEP_SRC_LIST has been set, skipping remove_chrootmirror stage."
+   if [ "$KEEP_SRC_LIST" = "yes" ] ; then
+     echo "KEEP_SRC_LIST has been enabled, skipping remove_chrootmirror stage."
      return
    fi
  
@@@ -481,15 -481,7 +481,15 @@@ createfstab()
  EOF
  
    if [ -n "$TARGET_UUID" ] ; then
 -    echo "/dev/disk/by-uuid/${TARGET_UUID} /  auto    defaults,errors=remount-ro 0   1" >> /etc/fstab
 +    local rootfs_mount_options=",errors=remount-ro"
 +    case "${FILESYSTEM}" in
 +      f2fs)
 +        # errors=remount-ro is unsupported, see https://github.com/grml/grml-debootstrap/issues/163
 +        rootfs_mount_options=""
 +        ;;
 +    esac
 +
 +    echo "/dev/disk/by-uuid/${TARGET_UUID} /  auto    defaults${rootfs_mount_options} 0   1" >> /etc/fstab
    else
      echo "Warning: couldn't identify target UUID for rootfs, your /etc/fstab might be incomplete."
    fi