forked from mirrored-repos/manjaro-tools
Compare commits
9 commits
Author | SHA1 | Date | |
---|---|---|---|
5e29909aec | |||
|
99d8f267bf | ||
|
aec896c90c | ||
|
98eda6b062 | ||
|
8129e5d45a | ||
|
78765ee17c | ||
|
71f34308c6 | ||
|
e41edc365f | ||
|
0bb4097092 |
9 changed files with 16 additions and 38 deletions
3
Makefile
3
Makefile
|
@ -13,7 +13,8 @@ BIN_BASE = \
|
||||||
bin/manjaro-chroot \
|
bin/manjaro-chroot \
|
||||||
bin/fstabgen \
|
bin/fstabgen \
|
||||||
bin/signfile \
|
bin/signfile \
|
||||||
bin/chroot-run
|
bin/chroot-run \
|
||||||
|
bin/check-yaml
|
||||||
|
|
||||||
LIBS_BASE = \
|
LIBS_BASE = \
|
||||||
lib/util.sh \
|
lib/util.sh \
|
||||||
|
|
|
@ -131,6 +131,7 @@ usage() {
|
||||||
echo " [default: ${kernel}]"
|
echo " [default: ${kernel}]"
|
||||||
echo ' -l Create permalink'
|
echo ' -l Create permalink'
|
||||||
echo ' -m Set SquashFS image mode to persistence'
|
echo ' -m Set SquashFS image mode to persistence'
|
||||||
|
echo ' -n Disable multilib'
|
||||||
echo " -p <profile> Buildset or profile [default: ${build_list_iso}]"
|
echo " -p <profile> Buildset or profile [default: ${build_list_iso}]"
|
||||||
echo ' -o Enable office installer module'
|
echo ' -o Enable office installer module'
|
||||||
echo ' -q Query settings and pretend build'
|
echo ' -q Query settings and pretend build'
|
||||||
|
@ -150,7 +151,7 @@ usage() {
|
||||||
|
|
||||||
orig_argv=("$@")
|
orig_argv=("$@")
|
||||||
|
|
||||||
opts='p:a:b:r:t:k:g:d:cfzxmvqhilo'
|
opts='p:a:b:r:t:k:g:d:cfzxmnvqhilo'
|
||||||
|
|
||||||
while getopts "${opts}" arg; do
|
while getopts "${opts}" arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
|
@ -163,6 +164,7 @@ while getopts "${opts}" arg; do
|
||||||
g) gpgkey="$OPTARG" ;;
|
g) gpgkey="$OPTARG" ;;
|
||||||
k) kernel="$OPTARG" ;;
|
k) kernel="$OPTARG" ;;
|
||||||
m) persist=true ;;
|
m) persist=true ;;
|
||||||
|
n) no_multilib=true ;; # only exist if set here
|
||||||
p) build_list_iso="$OPTARG" ;;
|
p) build_list_iso="$OPTARG" ;;
|
||||||
q) pretend=true ;;
|
q) pretend=true ;;
|
||||||
r) chroots_iso="$OPTARG" ;;
|
r) chroots_iso="$OPTARG" ;;
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
MODULES="loop dm-snapshot"
|
MODULES=(loop dm-snapshot)
|
||||||
HOOKS="base udev miso_shutdown miso miso_loop_mnt miso_pxe_common miso_pxe_http miso_pxe_nbd miso_pxe_nfs miso_kms modconf block filesystems keyboard keymap"
|
HOOKS=(base udev miso_shutdown miso miso_loop_mnt miso_pxe_common miso_pxe_http miso_pxe_nbd miso_pxe_nfs miso_kms modconf block filesystems keyboard keymap)
|
||||||
COMPRESSION="xz"
|
COMPRESSION="xz"
|
||||||
|
|
|
@ -38,7 +38,7 @@ Architecture = auto
|
||||||
# We cannot check disk space from within a chroot environment
|
# We cannot check disk space from within a chroot environment
|
||||||
#CheckSpace
|
#CheckSpace
|
||||||
#VerbosePkgLists
|
#VerbosePkgLists
|
||||||
#ParallelDownloads = 5
|
ParallelDownloads = 4
|
||||||
|
|
||||||
# By default, pacman accepts packages signed by keys that its local keyring
|
# By default, pacman accepts packages signed by keys that its local keyring
|
||||||
# trusts (see pacman-key and its man page), as well as unsigned packages.
|
# trusts (see pacman-key and its man page), as well as unsigned packages.
|
||||||
|
@ -86,4 +86,3 @@ Include = /etc/pacman.d/mirrorlist
|
||||||
#[custom]
|
#[custom]
|
||||||
#SigLevel = Optional TrustAll
|
#SigLevel = Optional TrustAll
|
||||||
#Server = file:///home/custompkgs
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,7 @@ Architecture = auto
|
||||||
# We cannot check disk space from within a chroot environment
|
# We cannot check disk space from within a chroot environment
|
||||||
#CheckSpace
|
#CheckSpace
|
||||||
#VerbosePkgLists
|
#VerbosePkgLists
|
||||||
#ParallelDownloads = 5
|
ParallelDownloads = 4
|
||||||
|
|
||||||
# By default, pacman accepts packages signed by keys that its local keyring
|
# By default, pacman accepts packages signed by keys that its local keyring
|
||||||
# trusts (see pacman-key and its man page), as well as unsigned packages.
|
# trusts (see pacman-key and its man page), as well as unsigned packages.
|
||||||
|
|
|
@ -18,7 +18,7 @@ prepare_initcpio(){
|
||||||
|
|
||||||
prepare_initramfs(){
|
prepare_initramfs(){
|
||||||
cp ${DATADIR}/mkinitcpio.conf $1/etc/mkinitcpio-${iso_name}.conf
|
cp ${DATADIR}/mkinitcpio.conf $1/etc/mkinitcpio-${iso_name}.conf
|
||||||
local _kernver=$(cat $1/usr/lib/modules/*/version)
|
local _kernver=$(cat $1/usr/lib/modules/*/kernelbase | awk -F'-' '{print $1}')
|
||||||
if [[ -n ${gpgkey} ]]; then
|
if [[ -n ${gpgkey} ]]; then
|
||||||
su ${OWNER} -c "gpg --export ${gpgkey} >${USERCONFDIR}/gpgkey"
|
su ${OWNER} -c "gpg --export ${gpgkey} >${USERCONFDIR}/gpgkey"
|
||||||
exec 17<>${USERCONFDIR}/gpgkey
|
exec 17<>${USERCONFDIR}/gpgkey
|
||||||
|
|
|
@ -353,32 +353,6 @@ make_image_desktop() {
|
||||||
mount_fs_root "${path}"
|
mount_fs_root "${path}"
|
||||||
|
|
||||||
chroot_create "${path}" "${packages}"
|
chroot_create "${path}" "${packages}"
|
||||||
|
|
||||||
#TODO: tmp workaround to fix Steam fat-tarball download
|
|
||||||
# Grab the steam bootstrap for first boot
|
|
||||||
PKG_URL="https://steamdeck-packages.steamos.cloud/archlinux-mirror/jupiter-main/os/x86_64/steam-jupiter-stable-1.0.0.78-1.2-x86_64.pkg.tar.zst"
|
|
||||||
TMP_PKG="/tmp/package.pkg.tar.zst"
|
|
||||||
OUTPUT_FILE="/tmp/bootstraplinux_ubuntu12_32.tar.xz"
|
|
||||||
TARGET_FILE="${path}/usr/lib/steam/bootstraplinux_ubuntu12_32.tar.xz"
|
|
||||||
curl -o "$TMP_PKG" "$PKG_URL"
|
|
||||||
ZST_CHECKSUM=e94242167c5af25a87b6ffd92963fa8c15263b9a2838bcc0c3a36f918e5ba21c64984be20f718096ff1fed4ec52d49846239695b573db21e1c4ffce9cd493bc1
|
|
||||||
TMP_PKG_CHECKSUM=$(sha512sum ${TMP_PKG} | cut -d " " -f1)
|
|
||||||
if [[ "$ZST_CHECKSUM" == "$TMP_PKG_CHECKSUM" ]]; then
|
|
||||||
tar -I zstd -xvf "$TMP_PKG" usr/lib/steam/bootstraplinux_ubuntu12_32.tar.xz -O > "$OUTPUT_FILE"
|
|
||||||
else
|
|
||||||
msg "Download of ${PKG_URL} failed!"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
XZ_CHECKSUM=17b7011fe7ae13834aa1f722724abfc3829ef8632bbabec2ae6b53ef0a9b6f1fc4db61b32056c62401e5aeb001e0f00d9e20f8ea045347b91cbe84ad4d0a919b
|
|
||||||
BS_CHECKSUM=$(sha512sum ${OUTPUT_FILE} | cut -d " " -f1)
|
|
||||||
if [[ "$XZ_CHECKSUM" == "$BS_CHECKSUM" ]]; then
|
|
||||||
mv "$OUTPUT_FILE" "$TARGET_FILE"
|
|
||||||
else
|
|
||||||
msg "Extraction of ${TARGET_FILE} failed!"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
[[ -e "$TMP_PKG" ]] && rm "$TMP_PKG"
|
|
||||||
[[ -e "$OUTPUT_FILE" ]] && rm "$OUTPUT_FILE"
|
|
||||||
|
|
||||||
pacman -Qr "${path}" > "${path}/desktopfs-pkgs.txt"
|
pacman -Qr "${path}" > "${path}/desktopfs-pkgs.txt"
|
||||||
cp "${path}/desktopfs-pkgs.txt" ${iso_dir}/$(gen_iso_fn)-pkgs.txt
|
cp "${path}/desktopfs-pkgs.txt" ${iso_dir}/$(gen_iso_fn)-pkgs.txt
|
||||||
|
|
|
@ -392,12 +392,12 @@ write_settings_conf(){
|
||||||
echo " - machineid" >> "$conf" && write_machineid_conf
|
echo " - machineid" >> "$conf" && write_machineid_conf
|
||||||
echo " - fstab" >> "$conf"
|
echo " - fstab" >> "$conf"
|
||||||
if ${oem_used}; then
|
if ${oem_used}; then
|
||||||
msg2 "Skipping to set locale and keyboard modules."
|
msg2 "Skipping to set locale, keyboard and localecfg modules."
|
||||||
else
|
else
|
||||||
echo " - locale" >> "$conf"
|
echo " - locale" >> "$conf"
|
||||||
echo " - keyboard" >> "$conf"
|
echo " - keyboard" >> "$conf"
|
||||||
|
echo " - localecfg" >> "$conf"
|
||||||
fi
|
fi
|
||||||
echo " - localecfg" >> "$conf"
|
|
||||||
echo " - luksopenswaphookcfg" >> "$conf"
|
echo " - luksopenswaphookcfg" >> "$conf"
|
||||||
echo " - luksbootkeyfile" >> "$conf"
|
echo " - luksbootkeyfile" >> "$conf"
|
||||||
echo " - initcpiocfg" >> "$conf"
|
echo " - initcpiocfg" >> "$conf"
|
||||||
|
@ -411,7 +411,7 @@ write_settings_conf(){
|
||||||
else
|
else
|
||||||
echo " - users" >> "$conf"
|
echo " - users" >> "$conf"
|
||||||
fi
|
fi
|
||||||
#echo " - displaymanager" >> "$conf" && write_displaymanager_conf
|
echo " - displaymanager" >> "$conf" && write_displaymanager_conf
|
||||||
if ${mhwd_used}; then
|
if ${mhwd_used}; then
|
||||||
echo " - mhwdcfg" >> "$conf" && write_mhwdcfg_conf
|
echo " - mhwdcfg" >> "$conf" && write_mhwdcfg_conf
|
||||||
else
|
else
|
||||||
|
|
|
@ -409,6 +409,7 @@ load_profile_config(){
|
||||||
[[ -z ${snap_channel} ]] && snap_channel="stable"
|
[[ -z ${snap_channel} ]] && snap_channel="stable"
|
||||||
|
|
||||||
[[ -z ${multilib} ]] && multilib="true"
|
[[ -z ${multilib} ]] && multilib="true"
|
||||||
|
[[ ${no_multilib} == 'true' ]] && multilib="false"
|
||||||
|
|
||||||
[[ -z ${nonfree_mhwd} ]] && nonfree_mhwd="true"
|
[[ -z ${nonfree_mhwd} ]] && nonfree_mhwd="true"
|
||||||
|
|
||||||
|
@ -516,6 +517,7 @@ reset_profile(){
|
||||||
unset extra
|
unset extra
|
||||||
unset full_iso
|
unset full_iso
|
||||||
unset office_installer
|
unset office_installer
|
||||||
|
unset no_multilib
|
||||||
}
|
}
|
||||||
|
|
||||||
check_profile(){
|
check_profile(){
|
||||||
|
@ -834,7 +836,7 @@ create_chksums() {
|
||||||
init_profiles() {
|
init_profiles() {
|
||||||
_workdir='/usr/share/manjaro-tools'
|
_workdir='/usr/share/manjaro-tools'
|
||||||
if [[ -d ${_workdir}/iso-profiles ]]; then
|
if [[ -d ${_workdir}/iso-profiles ]]; then
|
||||||
rm -Rf ${_workdir}/iso-profiles ]]
|
rm -Rf ${_workdir}/iso-profiles
|
||||||
fi
|
fi
|
||||||
git clone -q --depth 1 -b ${branch} https://gitlab.manjaro.org/profiles-and-settings/iso-profiles.git ${_workdir}/iso-profiles/
|
git clone -q --depth 1 -b ${branch} https://gitlab.manjaro.org/profiles-and-settings/iso-profiles.git ${_workdir}/iso-profiles/
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue