diff --git a/PKGBUILD b/PKGBUILD index c501be6..311e03c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: Erik Dubois +# Maintainer: zj <1052308357@qq.com> pkgname=bbt-calamares-config _destname1="/etc" pkgver=25.12 -pkgrel=04 +pkgrel=16 pkgdesc="calamares for bbt" arch=('any') url="https://yuyujing.cn" @@ -13,7 +13,7 @@ conflicts=('alci-calamares-config-dev' 'alci-calamares-config-pure' 'alci-calama provides=("${pkgname}") options=(!strip !emptydirs) source=("bbt-calamares-config.zip") -sha256sums=('SKIP') +sha256sums=('9c9e31f3671cbc9a3ff64cdb07af28626f68023713ccc7e7878357eada0ba1a3') package() { install -dm755 ${pkgdir}${_destname1} cp -r ${srcdir}/${pkgname}${_destname1}/* ${pkgdir}${_destname1} diff --git a/bbt-calamares-config/etc/calamares/modules/partition.conf b/bbt-calamares-config/etc/calamares/modules/partition.conf index a05edcb..6338cb4 100644 --- a/bbt-calamares-config/etc/calamares/modules/partition.conf +++ b/bbt-calamares-config/etc/calamares/modules/partition.conf @@ -157,7 +157,7 @@ defaultFileSystemType: "ext4" # If not specified at all, uses *defaultFileSystemType* without a # warning (this matches traditional no-choice-available behavior best). # availableFileSystemTypes: ["ext4","ext3","btrfs","jfs","xfs","f2fs"] -availableFileSystemTypes: ["ext4"] +availableFileSystemTypes: ["ext4","xfs"] # Show/hide LUKS related functionality in automated partitioning modes. # Disable this if you choose not to deploy early unlocking support in GRUB2 diff --git a/bbt-calamares-config/etc/calamares/modules/post-install-config.conf b/bbt-calamares-config/etc/calamares/modules/post-install-config.conf index 0e329b3..3d42b7f 100644 --- a/bbt-calamares-config/etc/calamares/modules/post-install-config.conf +++ b/bbt-calamares-config/etc/calamares/modules/post-install-config.conf @@ -11,12 +11,6 @@ script: - "- teamviewer --passwd 'Bbt123!@#'" - "- ${ROOT}/usr/local/bin/change-servername_s2" - "- /bin/bash ${ROOT}/home/smart/smart-organizer-service-install.sh" - - "- mv ${ROOT}/usr/bin/dcpomatic2_create ${ROOT}/usr/bin/dcpomatic2_create_original" - - "- cp ${ROOT}/home/smart/dcpomatic2_create ${ROOT}/usr/bin/dcpomatic2_create" - - "- mv ${ROOT}/usr/bin/ffmpeg ${ROOT}/usr/bin/ffmpeg.bin" - - "- cp ${ROOT}/home/smart/ffmpeg ${ROOT}/usr/bin/ffmpeg" - - "- chmod 755 ${ROOT}/usr/bin/ffmpeg" - - "- chmod 755 ${ROOT}/usr/bin/dcpomatic2_create" - "- rm -rf ${ROOT}/media/cinema/.*" - "- rm -rf ${ROOT}/media/kdm/.*"