Merge pull request #12 from tteck/dev

clean up ZFS automatic installation
Special thanks to @alexdelprete
This commit is contained in:
tteckster 2022-01-17 22:51:12 -05:00 committed by GitHub
commit 0b073ecdf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 12 deletions

View File

@ -141,14 +141,13 @@ fi
HOSTNAME=homeassistant HOSTNAME=homeassistant
TEMPLATE_STRING="local:vztmpl/${TEMPLATE}" TEMPLATE_STRING="local:vztmpl/${TEMPLATE}"
if [ "$STORAGE_TYPE" == "zfspool" ]; then if [ "$STORAGE_TYPE" == "zfspool" ]; then
pct create $CTID $TEMPLATE_STRING -arch $ARCH -features fuse=1,keyctl=1,mknod=1,nesting=1 \ CT_FEATURES="fuse=1,keyctl=1,mknod=1,nesting=1"
-hostname $HOSTNAME -net0 name=eth0,bridge=vmbr0,ip=dhcp -onboot 1 -cores 2 -memory 2048 \
-ostype $OSTYPE -rootfs $ROOTFS,size=$DISK_SIZE -storage $STORAGE >/dev/null
else else
pct create $CTID $TEMPLATE_STRING -arch $ARCH -features nesting=1 \ CT_FEATURES="nesting=1"
fi
pct create $CTID $TEMPLATE_STRING -arch $ARCH -features $CT_FEATURES \
-hostname $HOSTNAME -net0 name=eth0,bridge=vmbr0,ip=dhcp -onboot 1 -cores 2 -memory 2048 \ -hostname $HOSTNAME -net0 name=eth0,bridge=vmbr0,ip=dhcp -onboot 1 -cores 2 -memory 2048 \
-ostype $OSTYPE -rootfs $ROOTFS,size=$DISK_SIZE -storage $STORAGE >/dev/null -ostype $OSTYPE -rootfs $ROOTFS,size=$DISK_SIZE -storage $STORAGE >/dev/null
fi
LXC_CONFIG=/etc/pve/lxc/${CTID}.conf LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
cat <<EOF >> $LXC_CONFIG cat <<EOF >> $LXC_CONFIG
lxc.cgroup2.devices.allow: a lxc.cgroup2.devices.allow: a

View File

@ -141,15 +141,13 @@ fi
HOSTNAME=homeassistant HOSTNAME=homeassistant
TEMPLATE_STRING="local:vztmpl/${TEMPLATE}" TEMPLATE_STRING="local:vztmpl/${TEMPLATE}"
if [ "$STORAGE_TYPE" == "zfspool" ]; then if [ "$STORAGE_TYPE" == "zfspool" ]; then
pct create $CTID $TEMPLATE_STRING -arch $ARCH -features fuse=1,keyctl=1,mknod=1,nesting=1 \ CT_FEATURES="fuse=1,keyctl=1,mknod=1,nesting=1"
-hostname $HOSTNAME -net0 name=eth0,bridge=vmbr0,ip=dhcp -onboot 1 -cores 2 -memory 2048 \
-ostype $OSTYPE -rootfs $ROOTFS,size=$DISK_SIZE -storage $STORAGE >/dev/null
else else
pct create $CTID $TEMPLATE_STRING -arch $ARCH -features nesting=1 \ CT_FEATURES="nesting=1"
-hostname $HOSTNAME -net0 name=eth0,bridge=vmbr0,ip=dhcp -onboot 1 -cores 2 -memory 2048 \
-ostype $OSTYPE -rootfs $ROOTFS,size=$DISK_SIZE -storage $STORAGE >/dev/null
fi fi
LXC_CONFIG=/etc/pve/lxc/${CTID}.conf pct create $CTID $TEMPLATE_STRING -arch $ARCH -features $CT_FEATURES \
-hostname $HOSTNAME -net0 name=eth0,bridge=vmbr0,ip=dhcp -onboot 1 -cores 2 -memory 2048 \
-ostype $OSTYPE -rootfs $ROOTFS,size=$DISK_SIZE -storage $STORAGE >/dev/nullLXC_CONFIG=/etc/pve/lxc/${CTID}.conf
cat <<EOF >> $LXC_CONFIG cat <<EOF >> $LXC_CONFIG
lxc.cgroup2.devices.allow: a lxc.cgroup2.devices.allow: a
lxc.cap.drop: lxc.cap.drop: