From: Ian Kelling Date: Sun, 31 Jan 2016 23:26:06 +0000 (-0800) Subject: make /a a bind mount, makes shorter full paths, simpler X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=2cd748b8c9e7cb0d8555df1f18aa443ff5a149bd;p=automated-distro-installer make /a a bind mount, makes shorter full paths, simpler --- diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes index b39132a..6989eb9 100755 --- a/fai/config/class/50-host-classes +++ b/fai/config/class/50-host-classes @@ -8,7 +8,7 @@ # use a list of classes for our demo machine case $HOSTNAME in demohost) - echo "FAIBASE DEBIAN DESKTOP STABLE TWO_DISK" ;; + echo "FAIBASE DEBIAN DESKTOP TWO_DISK" ;; x2) echo "FAIBASE DEBIAN DESKTOP ONE_DISK" ;; tp) diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index 31f07ec..0b406ec 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -74,6 +74,11 @@ create_subvols() { for x in q home root; do btrfs subvolume list . | grep "$x$" >/dev/null || btrfs subvolume create $x done + for x in root/a q/a; do + mkdir -p $x + chown 1000:1000 $x + chmod 755 $x + done btrfs subvolume set-default \ $(btrfs subvolume list . | grep 'root$' | awk '{print $2}') . chattr -Rf +C root @@ -154,6 +159,7 @@ fi cat > /tmp/fai/fstab <