OSDN Git Service

[change] : Compressor type to xz
authorhayao <shun819.mail@gmail.com>
Fri, 2 Oct 2020 10:35:27 +0000 (19:35 +0900)
committerhayao <shun819.mail@gmail.com>
Fri, 2 Oct 2020 10:35:27 +0000 (19:35 +0900)
allarch.sh
build.sh
default.conf

index b74192d..b5ef394 100755 (executable)
@@ -225,8 +225,8 @@ _usage () {
     echo "                                  Default: ${out_dir}"
     echo "    -p | --password <password>   Set a live user password"
     echo "                                  Default: ${password}"
-    echo "    -t | --comp-opts <options>   Set compressor-specific options. Specify \"reset\" to empty"
-    echo "                                  Default: -Xcompression-level 20"
+    echo "    -t | --comp-opts <options>   Set compressor-specific options."
+    echo "                                  Default: empty"
     echo "    -u | --user <username>       Set user name"
     echo "                                  Default: ${username}"
     echo "    -w | --work <work_dir>       Set the working directory"
index e91afc2..a03f5be 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -224,8 +224,8 @@ _usage () {
     echo "                                  Default: ${out_dir}"
     echo "    -p | --password <password>   Set a live user password"
     echo "                                  Default: ${password}"
-    echo "    -t | --comp-opts <options>   Set compressor-specific options. Specify \"reset\" to empty"
-    echo "                                  Default: -Xcompression-level 20"
+    echo "    -t | --comp-opts <options>   Set compressor-specific options."
+    echo "                                  Default: empty"
     echo "    -u | --user <username>       Set user name"
     echo "                                  Default: ${username}"
     echo "    -w | --work <work_dir>       Set the working directory"
@@ -1568,9 +1568,6 @@ msg_debug "Use the default configuration file (${defaultconfig})."
 # Set rebuild config file
 rebuildfile="${work_dir}/alteriso_config"
 
-# Default squashfs options
-if [[ "${sfs_comp_opt}" = "-Xcompression-level 20" && ! "${sfs_comp}" = "zstd" ]]; then sfs_comp_opt=""; fi
-
 set +eu
 
 # Check for a valid channel name
index 14e66d0..c5ee59f 100644 (file)
@@ -98,8 +98,8 @@ tarball=false
 
 # See the `mksquashfs` help for details on these items.
 # This variable overrides each build option "-c" or "-t".
-sfs_comp="zstd"
-sfs_comp_opt="-Xcompression-level 20"
+sfs_comp="xz"
+sfs_comp_opt=""
 
 
 # If set to true, include alteriso_info in iso root.