btrfsへのインストール時にサブボリュームにインストールするように

パッケージインストール時のnoconfirmを追加

install/initial/initial.sh

@@ -20,7 +20,7 @@ function install_zsh () {
         chsh -s /usr/bin/zsh
     fi
 
-    yay -S ttf-meslo-nerd-font-powerlevel10k
+    yay -S --noconfirm ttf-meslo-nerd-font-powerlevel10k
 
     curl --proto '=https' -fLsS https://rossmacarthur.github.io/install/crate.sh | bash -s -- --repo rossmacarthur/sheldon --to ~/.local/bin
     
@@ -33,7 +33,7 @@ function install_zsh () {
     echo 'eval "$(sheldon source)"' | tee -a "$HOME/.zshrc"
 
     sheldon add zsh-completions --github zsh-users/zsh-completions
-    sheldon add zsh-autocomplete --github marlonrichert/zsh-autocomplete
+    sheldon add zsh-autocomplete --github marlonrichert/zsh-autocomplete --tag 23.07.13
     sheldon add zsh-autosuggestions --github zsh-users/zsh-autosuggestions --use '{{ name }}.zsh'
     sheldon add zsh-syntax-highlighting --github zsh-users/zsh-syntax-highlighting
     sheldon add powerlevel10k --github romkatv/powerlevel10k
@@ -44,14 +44,14 @@ function setup_swapfile () {
     printf "Please enter swapfile capacity (example : ~ M)\n"
     read -r swapcap
     if [ "$1" == "btrfs" ]; then
-        sudo truncate -s 0 /swapfile
+        sudo truncate -s 0 /swap/swapfile
-        sudo chattr +C /swapfile
+        sudo chattr +C /swap/swapfile
-        sudo fallocate -l "$swapcap"M /swapfile
+        sudo fallocate -l "$swapcap"M /swap/swapfile
-        sudo chmod 600 /swapfile
+        sudo chmod 600 /swap/swapfile
-        sudo mkswap /swapfile
+        sudo mkswap /swap/swapfile
-        sudo swapon /swapfile
+        sudo swapon /swap/swapfile
         echo "#swapfile_autogenerated" | sudo tee -a /etc/fstab
-        echo "/swapfile none swap defaults 0 0" | sudo tee -a /etc/fstab
+        echo "/swap/swapfile none swap defaults 0 0" | sudo tee -a /etc/fstab
     else
         sudo dd if=/dev/zero of=/swapfile bs=1M count="$swapcap" status=progress
         sudo chmod 600 /swapfile
@@ -78,7 +78,7 @@ function install_yay () {
     sudo pacman -S --noconfirm git
     git clone https://aur.archlinux.org/yay.git
     cd yay || exit
-    makepkg -si
+    makepkg -si --noconfirm
     cd "$HOME" || exit
 }
 
@@ -94,6 +94,15 @@ function install_ca () {
     sudo trust anchor ./tx1310m3_CA.pem
 }
 
+function install_podman () {
+    sudo pacman -S --noconfirm podman podman-compose podman-docker aardvark-dns
+    echo 'export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/podman/podman.sock"' | sudo tee -a /etc/environment
+    mkdir ~/.config/containers
+    echo "unqualified-search-registries = [\"docker.io\"]" >> ~/.config/containers/registries.conf
+    systemctl --user enable podman.socket
+    sudo loginctl enable-linger $UID
+}
+
 printf "Do you want to the initial setup? (yes or no)\n"
 read -r temp
 
@@ -112,6 +121,7 @@ if [ "$temp" == "yes" ]; then
     install_fonts
     install_yay
     install_zsh
+    install_podman
     install_ca
 
     printf "Finished.\n"

install/initial/initial_server.sh

@@ -30,7 +30,7 @@ function install_zsh () {
     echo 'eval "$(sheldon source)"' | tee -a "$HOME/.zshrc"
 
     sheldon add zsh-completions --github zsh-users/zsh-completions
-    sheldon add zsh-autocomplete --github marlonrichert/zsh-autocomplete
+    sheldon add zsh-autocomplete --github marlonrichert/zsh-autocomplete --tag 23.07.13
     sheldon add zsh-autosuggestions --github zsh-users/zsh-autosuggestions --use '{{ name }}.zsh'
     sheldon add zsh-syntax-highlighting --github zsh-users/zsh-syntax-highlighting
     sheldon add powerlevel10k --github romkatv/powerlevel10k
@@ -41,14 +41,14 @@ function setup_swapfile () {
     printf "Please enter swapfile capacity (example : ~ M)\n"
     read swapcap
     if [ "$1" == "btrfs" ]; then
-        sudo truncate -s 0 /swapfile
+        sudo truncate -s 0 /swap/swapfile
-        sudo chattr +C /swapfile
+        sudo chattr +C /swap/swapfile
-        sudo fallocate -l "$swapcap"M /swapfile
+        sudo fallocate -l "$swapcap"M /swap/swapfile
-        sudo chmod 600 /swapfile
+        sudo chmod 600 /swap/swapfile
-        sudo mkswap /swapfile
+        sudo mkswap /swap/swapfile
-        sudo swapon /swapfile
+        sudo swapon /swap/swapfile
         echo "#swapfile_autogenerated" | sudo tee -a /etc/fstab
-        echo "/swapfile none swap defaults 0 0" | sudo tee -a /etc/fstab
+        echo "/swap/swapfile none swap defaults 0 0" | sudo tee -a /etc/fstab
     else
         sudo dd if=/dev/zero of=/swapfile bs=1M count="$swapcap" status=progress
         sudo chmod 600 /swapfile
@@ -75,7 +75,7 @@ function install_yay () {
     sudo pacman -S --noconfirm git
     git clone https://aur.archlinux.org/yay.git
     cd yay
-    makepkg -si
+    makepkg -si --noconfirm
     cd "$HOME"
 }
 
@@ -85,7 +85,7 @@ function install_fonts () {
 }
 
 function install_podman () {
-    sudo pacman -S podman podman-compose podman-docker aardvark-dns
+    sudo pacman -S --noconfirm podman podman-compose podman-docker aardvark-dns
     echo 'export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/podman/podman.sock"' | sudo tee -a /etc/environment
     mkdir ~/.config/containers
     echo "unqualified-search-registries = [\"docker.io\"]" >> ~/.config/containers/registries.conf

install/linux/linux.sh

@@ -1,23 +1,23 @@
 #!/bin/bash
 loadkeys jp106
 #キーボードを日本語配列へ変更
-printf "Please enter your username\n\n"
+printf "\nPlease enter your username\n"
 read -r home_username
-printf "Please enter your password\n\n"
+printf "Please enter your password\n"
 read -sr home_password
-printf "Please enter Hostname\n\n"
+printf "Please enter Hostname\n"
 read -r hostname1
 
 fdisk -l
 #ディスク一覧表示
-printf "\nWhat disk do you want to install to? example:/dev/sda \n\n"
+printf "\nWhat disk do you want to install to? example:/dev/sda \n"
 read -r installdisk
-printf "\nChoose the file system to use for your root partition. (ext4, btrfs)\n\n"
+printf "Choose the file system to use for your root partition. (ext4, btrfs)\n"
 read -r filesystem
-printf "\nChoose the kernel you want to use. (linux, zen, lts)\n\n"
+printf "Choose the kernel you want to use. (linux, zen, lts)\n"
 read -r kernel
 #インストールするディスクを入力
-printf "%s (%s) is selected as the disk to install. Are you sure you want to perform the partition operation? (yes or no) \n\n" "$installdisk" "$filesystem"
+printf "%s (%s) is selected as the disk to install. Are you sure you want to perform the partition operation? (yes or no) \n" "$installdisk" "$filesystem"
 read -r check1
 #インストールするディスクを確認
 if [ "$check1" == "yes" ]; then
@@ -40,13 +40,24 @@ if [ "$check1" == "yes" ]; then
     mkfs.vfat -F32 "$d1"
     if [ "$filesystem" == "ext4" ]; then
         mkfs.ext4 "$d2"
+        mount "$d2" /mnt
     elif [ "$filesystem" == "btrfs" ]; then
         mkfs.btrfs -f "$d2"
+        mount "$d2" /mnt
+        btrfs subvolume create /mnt/@
+        btrfs subvolume create /mnt/@home
+        btrfs subvolume create /mnt/@swap
+        umount "$d2"
+        mount "$d2" /mnt -o subvol=@
+        mkdir /mnt/home
+        mkdir /mnt/swap
+        mount "$d2" /mnt/home -o subvol=@home
+        mount "$d2" /mnt/swap -o subvol=@swap
     else
         mkfs.ext4 "$d2"
+        mount "$d2" /mnt
     fi
     #フォーマット
-    mount "$d2" /mnt
     mkdir /mnt/boot
     mount "$d1" /mnt/boot
     #マウント
@@ -98,4 +109,4 @@ if [ "$check1" == "yes" ]; then
     printf "\n\nInstallation is complete. Please reboot.\n"
 else
    printf "Installation canceled. \n"
-fi
+fi