diff --git a/fedora.sh b/fedora.sh index b76ca48..225cd4c 100755 --- a/fedora.sh +++ b/fedora.sh @@ -68,3 +68,61 @@ if [[ "${1}" == '--dracut' ]]; then --force \ --regenerate-all fi + +if [[ "${1}" == '--zfs-install' ]]; then + if [[ "${encryption}" == 'yes' ]]; then + cat << EOF | tee /etc/dracut.conf.d/zol.conf &> /dev/null +nofsck="yes" +add_dracutmodules+=" zfs " +omit_dracutmodules+=" btrfs " +install_items+=" /etc/zfs/keys/${hostname,,}.key " +EOF + else + cat </etc/dracut.conf.d/zol.conf +nofsck="yes" +add_dracutmodules+=" zfs " +omit_dracutmodules+=" btrfs " +EOF + fi + + if [[ "${VERSION_ID}" -lt '41' ]]; then + dnf \ + config-manager \ + --disable \ + updates + else + dnf \ + config-manager \ + setopt \ + updates.enabled=0 + fi + + dnf \ + install \ + -y \ + https://dl.fedoraproject.org/pub/fedora/linux/releases/${VERSION_ID}/Everything/x86_64/os/Packages/k/kernel-devel-$(uname -r).rpm + + dnf \ + --releasever=${VERSION_ID} \ + install \ + -y \ + https://zfsonlinux.org/fedora/zfs-release-${ZOL_FEDORA_VER}$(rpm --eval "%{dist}").noarch.rpm + + dnf \ + install \ + -y \ + zfs \ + zfs-dracut + + if [[ "${VERSION_ID}" -lt '41' ]]; then + dnf \ + config-manager \ + --enable \ + updates + else + dnf \ + config-manager \ + setopt \ + updates.enabled=1 + fi +fi diff --git a/install.sh b/install.sh index 9e90542..254a68e 100755 --- a/install.sh +++ b/install.sh @@ -35,61 +35,7 @@ if [[ ! -f "/etc/mtab" ]]; then fi if [[ "${ID}" == 'fedora' ]]; then - if [[ "${encryption}" == 'yes' ]]; then - cat << EOF | tee /etc/dracut.conf.d/zol.conf &> /dev/null -nofsck="yes" -add_dracutmodules+=" zfs " -omit_dracutmodules+=" btrfs " -install_items+=" /etc/zfs/keys/${hostname,,}.key " -EOF - else - cat </etc/dracut.conf.d/zol.conf -nofsck="yes" -add_dracutmodules+=" zfs " -omit_dracutmodules+=" btrfs " -EOF - fi - - if [[ "${VERSION_ID}" -lt '41' ]]; then - dnf \ - config-manager \ - --disable \ - updates - else - dnf \ - config-manager \ - setopt \ - updates.enabled=0 - fi - - dnf \ - install \ - -y \ - https://dl.fedoraproject.org/pub/fedora/linux/releases/${VERSION_ID}/Everything/x86_64/os/Packages/k/kernel-devel-$(uname -r).rpm - - dnf \ - --releasever=${VERSION_ID} \ - install \ - -y \ - https://zfsonlinux.org/fedora/zfs-release-${ZOL_FEDORA_VER}$(rpm --eval "%{dist}").noarch.rpm - - dnf \ - install \ - -y \ - zfs \ - zfs-dracut - - if [[ "${VERSION_ID}" -lt '41' ]]; then - dnf \ - config-manager \ - --enable \ - updates - else - dnf \ - config-manager \ - setopt \ - updates.enabled=1 - fi + "${baseDir}/fedora.sh" --zfs-install fi if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then