iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
various fixes
[automated-distro-installer]
/
fai
/
config
/
hooks
/
partition.DEFAULT
diff --git
a/fai/config/hooks/partition.DEFAULT
b/fai/config/hooks/partition.DEFAULT
index f81c6af7d5914398ef976f0916afb06b604866e8..c4f26ea811bc21e1dbcf00f6907a026f67f67e41 100755
(executable)
--- a/
fai/config/hooks/partition.DEFAULT
+++ b/
fai/config/hooks/partition.DEFAULT
@@
-363,9
+363,6
@@
if [[ $DISTRO != debianstable_bootstrap ]]; then
cd /mnt
btrfs subvolume create root_$DISTRO
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.
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
ROOT_PARTITION=$first_boot_dev
EOF
else
- # note, fai creates the mountpoints li
ke /nocow
+ # note, fai creates the mountpoints li
sted here
cat > /tmp/fai/fstab <<EOF
$first_root_crypt / btrfs noatime,subvol=root_$DISTRO 0 0
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
$first_root_crypt /mnt/root btrfs noatime,subvolid=0 0 0
$first_boot_dev /boot btrfs noatime,subvol=$boot_vol 0 0
EOF