X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=8dffd82b89c18a4fec5fd6616a5c6aa722ef35ac;hb=a018c3030b0ebd751d5667efd96c2fd32f2423e0;hp=f81c6af7d5914398ef976f0916afb06b604866e8;hpb=0a2a4d11ef323da19d0cebe2f5ec7b1be7bd15bc;p=automated-distro-installer

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index f81c6af..8dffd82 100755
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -190,15 +190,15 @@ fi
 
 
 if [[ ! $DISTRO ]]; then
-    if ifclass STABLE_BOOTSTRAP; then
+    if ifclass VOL_STABLE_BOOTSTRAP; then
         DISTRO=debianstable_bootstrap
-    elif ifclass STRETCH64; then
+    elif ifclass VOL_STRETCH; then
         DISTRO=debiantesting
-    elif ifclass STABLE; then
+    elif ifclass VOL_STABLE; then
         DISTRO=debianstable
-    elif ifclass XENIAL64; then
+    elif ifclass VOL_XENIAL; then
         DISTRO=ubuntuxenial
-    elif ifclass BELENOS64; then
+    elif ifclass VOL_BELENOS; then
         DISTRO=trisquelbelenos
     else
         echo "PARTITIONER ERROR: no distro class/var set" >&2
@@ -363,9 +363,6 @@ if [[ $DISTRO != debianstable_bootstrap ]]; then
     cd /mnt
 
     btrfs subvolume create root_$DISTRO
-    [[ -e nocow ]] || btrfs subvolume create nocow
-    chown root:1000 nocow
-    chattr +C nocow
 
     mkdir -p /mnt/root_$DISTRO/boot
     # could set default subvol like this, but no reason to.
@@ -418,10 +415,9 @@ BOOT_DEVICE="${short_devs[@]}"
 ROOT_PARTITION=$first_boot_dev
 EOF
 else
-    # note, fai creates the mountpoints like /nocow
+    # note, fai creates the mountpoints listed here
     cat > /tmp/fai/fstab <<EOF
 $first_root_crypt  /  btrfs  noatime,subvol=root_$DISTRO  0 0
-$first_root_crypt  /nocow  btrfs  noatime,subvol=nocow  0 0
 $first_root_crypt  /mnt/root  btrfs  noatime,subvolid=0  0 0
 $first_boot_dev  /boot  btrfs  noatime,subvol=$boot_vol  0 0
 EOF